diff --git a/.gitignore b/.gitignore
index 53d84ffc74323f35e1256cdc82188e5cc5e7bbd8..0da61abd0a95f4c47f6e2da2ce9a54b6f1bd566d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,13 +29,19 @@ dependency-reduced-pom.xml
/distribution/bin
/distribution/conf
/distribution/lib
+/distribution/logs
/server/*root.*
/server/.root.*
/server/sessionStore/
/server/db_store/
/sessionStore/
+/test/sessionStore/
+/distribution/sessionStore/
# system ignore
.DS_Store
Thumbs.db
*.orig
+
+#h2
+*.db
diff --git a/.travis.yml b/.travis.yml
index 62273ae12631e120f3134378f20a18a0466f48be..1a274c3a06cf3db43b269da5d2a102f07a223b13 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,19 @@ cache:
install: true
-script:
- - travis_wait 30 ./mvnw clean install -DskipTests=false
+before_script:
+ - if [ "$TRAVIS_JDK_VERSION" == "openjdk8" ]; then
+ export IMAGE_NAME="openjdk:8u212-jre-alpine";
+ fi
+ - if [ "$TRAVIS_JDK_VERSION" == "openjdk11" ]; then
+ export IMAGE_NAME="openjdk:11-jre-stretch";
+ fi
+script:
+ - if [ "$TRAVIS_BRANCH" == "develop" ] && [ "$TRAVIS_PULL_REQUEST" == false ]; then
+ travis_wait 30 ./mvnw clean install -DskipTests=false -P image -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ else
+ travis_wait 30 ./mvnw clean install -DskipTests=false -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn;
+ fi
after_success:
- bash <(curl -s https://codecov.io/bash)
diff --git a/README.md b/README.md
index 51e2d1172685eb222b62db4515c6c989cafa6c1f..38c2343a9499a303f68e175ad434ee4fb71b481d 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ For more details about principle and design, please go to [Seata wiki page](http
## Maven dependency
```xml
-<seata.version>0.9.0</seata.version>
+<seata.version>1.0.0</seata.version>
<dependency>
<groupId>io.seata</groupId>
@@ -136,3 +136,54 @@ This project exists thanks to all the people who contribute. [[Contributors](htt
## License
Seata is under the Apache 2.0 license. See the [LICENSE](https://github.com/seata/seata/blob/master/LICENSE) file for details.
+
+## Who is using
+
+These are only part of the companies using Seata, for reference only. If you are using Seata, please [add your company
+here](https://github.com/seata/seata/issues/1246) to tell us your scenario to make Seata better.
+
+<div style='vertical-align: middle'>
+ <img alt='Alibaba Group' height='40' src='https://docs.alibabagroup.com/assets2/images/en/global/logo_header.png' /img>
+ <img alt='蚂蚁金服' height='40' src='https://img.alicdn.com/tfs/TB1wuuCoET1gK0jSZFhXXaAtVXa-496-202.jpg' /img>
+ <img alt='阿里云' height='40' src='https://img.alicdn.com/tfs/TB1Ly5oS3HqK1RjSZFPXXcwapXa-238-54.png' /img>
+ <img alt='中航信' height='40' src='http://www.travelsky.net/publish/main/images/logo.gif' /img>
+ <img alt='中国铁塔' height='40' src='https://www.china-tower.com/static/web/images/tower-logo.png' /img>
+ <img alt='滴滴' height='40' src='https://website.didiglobal.com/dist/media/logo-zh.a7abd90d.svg' /img>
+ <img alt='中国邮政' height='40' src='http://www.chinapost.com.cn/res/chinapostplan/structure/181041269.png' /img>
+ <img alt='太极计算机' height='40' src='https://img.alicdn.com/tfs/TB1.zqEoAL0gK0jSZFAXXcA9pXa-245-38.png' /img>
+ <img alt='政采云' height='40' src='https://img.alicdn.com/tfs/TB1DDiCorY1gK0jSZTEXXXDQVXa-440-114.jpg' /img>
+ <img alt='浙江公安厅' height='40' src='https://img.alicdn.com/tfs/TB1SXGzoxn1gK0jSZKPXXXvUXXa-426-180.jpg' /img>
+ <img alt='特步' height='40' src='https://www.xtep.com/images/logo.png' /img>
+ <img alt='中通快递' height='40' src='https://www.zto.com/imgs/logo.png' /img>
+ <img alt='浙江烟草' height='40' src='https://img.alicdn.com/tfs/TB1e7Wiovb2gK0jSZK9XXaEgFXa-1028-160.jpg' /img>
+ <img alt='波司登' height='40' src='https://img.alicdn.com/tfs/TB12cmCouL2gK0jSZFmXXc7iXXa-310-110.jpg' /img>
+ <img alt='凯京科技' height='40' src='https://img.alicdn.com/tfs/TB1j0dEop67gK0jSZPfXXahhFXa-400-208.jpg' /img>
+ <img alt='点购集团' height='40' src='https://dgmall-1258058953.cos.ap-chengdu.myqcloud.com/img/logo_t.png' /img>
+ <img alt='求是创新健康' height='40' src='http://www.truthai.cn/static/logo800.png' /img>
+ <img alt='科蓝' height='40' src='https://img.alicdn.com/tfs/TB1tuSyouT2gK0jSZFvXXXnFXXa-304-94.jpg' /img>
+ <img alt='康美药业' height='40' src='https://www.kanghehealth.com/images/logo.png' /img>
+ <img alt='雁联' height='40' src='https://img.alicdn.com/tfs/TB1c8iCouL2gK0jSZFmXXc7iXXa-428-102.jpg' /img>
+ <img alt='学两手' height='40' src='https://img.xue2shou.com/g-xue2shou/website/0.8.2/static/logo.png' /img>
+ <img alt='衣二三' height='40' src='https://img.alicdn.com/tfs/TB1OCGioCf2gK0jSZFPXXXsopXa-500-179.jpg' /img>
+ <img alt='悦途出行' height='40' src='http://yuetu365.com/uploads/allimg/20191016/d456dbbee0c54274a70d588af4ce6116.png' /img>
+ <img alt='睿颐软件' height='40' src='https://img.alicdn.com/tfs/TB143R4op67gK0jSZPfXXahhFXa-148-42.png' /img>
+ <img alt='赛维' height='40' src='http://www.savor.com.cn/common/img/logo.png' /img>
+ <img alt='有利网' height='40' src='https://www.yooli.com/v2/local/img/common/logo.png?version=20191126190304' /img>
+ <img alt='安心保险' height='40' src='https://query.95303.com/webins/images/logo.png' /img>
+ <img alt='科达科技' height='40' src='https://img.alicdn.com/tfs/TB1JvOjouT2gK0jSZFvXXXnFXXa-386-146.jpg' /img>
+ <img alt='会分期' height='40' src='https://img.alicdn.com/tfs/TB1ChKFoBr0gK0jSZFnXXbRRXXa-402-166.jpg' /img>
+ <img alt='会找房' height='40' src='https://img.alicdn.com/tfs/TB1bNWFoBr0gK0jSZFnXXbRRXXa-398-336.jpg' /img>
+ <img alt='全房通' height='40' src='https://img.alicdn.com/tfs/TB1iMSAopP7gK0jSZFjXXc5aXXa-398-182.jpg' /img>
+ <img alt='会通教育' height='40' src='https://img.alicdn.com/tfs/TB1_D9Boxn1gK0jSZKPXXXvUXXa-580-218.jpg' /img>
+ <img alt='享住智慧' height='40' src='http://image.xiangzhuzhihui.com/images/logo/logo_02.png' /img>
+ <img alt='兰亮网络' height='40' src='https://img.alicdn.com/tfs/TB1_miroq61gK0jSZFlXXXDKFXa-283-70.png' /img>
+ <img alt='蓝天教育' height='40' src='https://img.alicdn.com/tfs/TB1CaSroAT2gK0jSZPcXXcKkpXa-492-176.jpg' /img>
+ <img alt='烟台欣合' height='40' src='https://shinhoglobal.com/img/logo-shinho.svg' /img>
+ <img alt='阿康健康' height='40' src='https://img.alicdn.com/tfs/TB1JNSqouH2gK0jSZFEXXcqMpXa-450-182.jpg' /img>
+ <img alt='新脉远' height='40' src='https://img.alicdn.com/tfs/TB1NV1uouH2gK0jSZJnXXaT1FXa-462-172.jpg' /img>
+ <img alt='乾动新能源' height='40' src='http://www.cangowin.com/images/logo.png' /img>
+ <img alt='路客精品民宿' height='40' src='https://img.alicdn.com/tfs/TB1CCavoBr0gK0jSZFnXXbRRXXa-240-100.png' /img>
+ <img alt='深圳好尔美' height='40' src='https://img.alicdn.com/tfs/TB1IIivoxD1gK0jSZFyXXciOVXa-200-130.png' /img>
+</div>
+
+
diff --git a/all/pom.xml b/all/pom.xml
index 778843d01dfefce71b06f308e628335e45e78122..5cde8e073077f6192fc59b3f13456868aa3a908b 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -21,7 +21,7 @@
<groupId>io.seata</groupId>
<artifactId>seata-all</artifactId>
- <version>0.9.0</version>
+ <version>1.0.0</version>
<name>Seata All-in-one ${project.version}</name>
<url>http://seata.io</url>
@@ -232,11 +232,26 @@
<artifactId>seata-codec-protobuf</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-grpc</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>io.seata</groupId>
<artifactId>seata-codec-kryo</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-codec-hessian</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-compressor-gzip</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- saga -->
<dependency>
@@ -453,6 +468,21 @@
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@ -468,6 +498,11 @@
<artifactId>kryo</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.caucho</groupId>
+ <artifactId>hessian</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>de.javakaffee</groupId>
<artifactId>kryo-serializers</artifactId>
@@ -570,6 +605,7 @@
<include>io.seata:seata-dubbo</include>
<include>io.seata:seata-dubbo-alibaba</include>
<include>io.seata:seata-motan</include>
+ <include>io.seata:seata-grpc</include>
<include>io.seata:seata-rm</include>
<include>io.seata:seata-rm-datasource</include>
<include>io.seata:seata-sofa-rpc</include>
@@ -578,6 +614,8 @@
<include>io.seata:seata-tm</include>
<include>io.seata:seata-codec-seata</include>
<include>io.seata:seata-codec-protobuf</include>
+ <include>io.seata:seata-codec-kryo</include>
+ <include>io.seata:seata-codec-hessian</include>
<!-- saga -->
<include>io.seata:seata-saga-processctrl</include>
<include>io.seata:seata-saga-statelang</include>
@@ -585,8 +623,7 @@
<include>io.seata:seata-saga-rm</include>
<include>io.seata:seata-saga-tm</include>
<include>io.seata:seata-saga-engine-store</include>
-
- <include>io.seata:seata-codec-kryo</include>
+ <include>io.seata:seata-compressor-gzip</include>
</includes>
</artifactSet>
<transformers>
diff --git a/bom/pom.xml b/bom/pom.xml
index d3396a586da048047970bcdba1c4846f8c74bdc3..daae5af873fb1a6e9e457f73a2b8e9998e12e382 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -20,7 +20,7 @@
<groupId>io.seata</groupId>
<artifactId>seata-bom</artifactId>
- <version>0.9.0</version>
+ <version>1.0.0</version>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
@@ -106,17 +106,18 @@
<motan.version>1.0.0</motan.version>
<jackson.version>2.9.9</jackson.version>
<jcommander.version>1.72</jcommander.version>
+ <annotation.api.version>1.2</annotation.api.version>
<!-- Compiler settings properties -->
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<protobuf.version>3.7.1</protobuf.version>
-
+ <grpc.version>1.17.1</grpc.version>
<junit.version>4.12</junit.version>
-
<kryo.version>4.0.2</kryo.version>
<kryo-serializers.version>0.42</kryo-serializers.version>
+ <hessian.version>4.0.63</hessian.version>
</properties>
<dependencyManagement>
@@ -410,6 +411,28 @@
<artifactId>jcommander</artifactId>
<version>${jcommander.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-testing</artifactId>
+ <scope>test</scope>
+ <version>${grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ <version>${grpc.version}</version>
+ </dependency>
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo</artifactId>
@@ -420,6 +443,11 @@
<artifactId>kryo-serializers</artifactId>
<version>${kryo-serializers.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.caucho</groupId>
+ <artifactId>hessian</artifactId>
+ <version>${hessian.version}</version>
+ </dependency>
<dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
@@ -430,6 +458,12 @@
<artifactId>h2</artifactId>
<version>${h2.version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${annotation.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/codec/pom.xml b/codec/pom.xml
index cd86624b64663cfb98ec1d21f00a593d42920f9b..df1a466be21ce1a9a07082ad1096b354f737a087 100644
--- a/codec/pom.xml
+++ b/codec/pom.xml
@@ -32,6 +32,7 @@
<module>seata-codec-protobuf</module>
<module>seata-codec-seata</module>
<module>seata-codec-kryo</module>
+ <module>seata-codec-hessian</module>
</modules>
</project>
diff --git a/codec/seata-codec-hessian/pom.xml b/codec/seata-codec-hessian/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f5605b80e649b55e1515aa53c0eea3d6368224bc
--- /dev/null
+++ b/codec/seata-codec-hessian/pom.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 1999-2019 Seata.io Group.
+ ~
+ ~ Licensed 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.
+ -->
+<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>seata-codec</artifactId>
+ <groupId>io.seata</groupId>
+ <version>${revision}</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>seata-codec-hessian</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.caucho</groupId>
+ <artifactId>hessian</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-core</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/codec/seata-codec-hessian/src/main/java/io/seata/codec/hessian/HessianCodec.java b/codec/seata-codec-hessian/src/main/java/io/seata/codec/hessian/HessianCodec.java
new file mode 100644
index 0000000000000000000000000000000000000000..7ebf02df32a7af02cd21fa5256f7452fd2752a44
--- /dev/null
+++ b/codec/seata-codec-hessian/src/main/java/io/seata/codec/hessian/HessianCodec.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.codec.hessian;
+
+import com.caucho.hessian.io.Hessian2Input;
+import com.caucho.hessian.io.Hessian2Output;
+import com.caucho.hessian.io.Serializer;
+import com.caucho.hessian.io.SerializerFactory;
+import io.seata.common.loader.LoadLevel;
+import io.seata.core.codec.Codec;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+/**
+ * @Xin Wang
+ */
+@LoadLevel(name = "HESSIAN")
+public class HessianCodec implements Codec {
+ private static final Logger LOGGER = LoggerFactory.getLogger(HessianCodec.class);
+
+ @Override
+ public <T> byte[] encode(T t) {
+ byte[] stream = null;
+ SerializerFactory hessian = HessianSerializerFactory.getInstance();
+ try {
+ Serializer serializer = hessian.getSerializer(t.getClass());
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ Hessian2Output output = new Hessian2Output(baos);
+ serializer.writeObject(t, output);
+ output.close();
+ stream = baos.toByteArray();
+ } catch (IOException e) {
+ LOGGER.error("Hessian encode error:{}", e.getMessage(), e);
+ }
+ return stream;
+ }
+
+ @Override
+ public <T> T decode(byte[] bytes) {
+ T obj = null;
+ try (ByteArrayInputStream is = new ByteArrayInputStream(bytes);) {
+ Hessian2Input input = new Hessian2Input(is);
+ obj = (T) input.readObject();
+ input.close();
+ } catch (IOException e) {
+ LOGGER.error("Hessian decode error:{}", e.getMessage(), e);
+ }
+ return obj;
+ }
+}
diff --git a/codec/seata-codec-hessian/src/main/java/io/seata/codec/hessian/HessianSerializerFactory.java b/codec/seata-codec-hessian/src/main/java/io/seata/codec/hessian/HessianSerializerFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..37109f48adb4ebdad8311ab3d744a009d04f8d93
--- /dev/null
+++ b/codec/seata-codec-hessian/src/main/java/io/seata/codec/hessian/HessianSerializerFactory.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.codec.hessian;
+
+import com.caucho.hessian.io.Deserializer;
+import com.caucho.hessian.io.HessianProtocolException;
+import com.caucho.hessian.io.Serializer;
+import com.caucho.hessian.io.SerializerFactory;
+
+/*
+ * @Xin Wang
+ */
+public class HessianSerializerFactory extends SerializerFactory {
+ public static final SerializerFactory INSTANCE = new HessianSerializerFactory();
+
+ private HessianSerializerFactory() {
+ super();
+ }
+
+ public static SerializerFactory getInstance() {
+ return INSTANCE;
+ }
+
+ @Override
+ protected Serializer loadSerializer(Class<?> cl) throws HessianProtocolException {
+ return super.loadSerializer(cl);
+ }
+
+ @Override
+ protected Deserializer loadDeserializer(Class cl) throws HessianProtocolException {
+ return super.loadDeserializer(cl);
+ }
+}
diff --git a/codec/seata-codec-hessian/src/main/resources/META-INF/services/io.seata.core.codec.Codec b/codec/seata-codec-hessian/src/main/resources/META-INF/services/io.seata.core.codec.Codec
new file mode 100644
index 0000000000000000000000000000000000000000..1d65010876371e44b03fb63131a7fdedcdc2b0d5
--- /dev/null
+++ b/codec/seata-codec-hessian/src/main/resources/META-INF/services/io.seata.core.codec.Codec
@@ -0,0 +1 @@
+io.seata.codec.hessian.HessianCodec
diff --git a/codec/seata-codec-hessian/src/test/java/io/seata/codec/hessian/HessianCodecTest.java b/codec/seata-codec-hessian/src/test/java/io/seata/codec/hessian/HessianCodecTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..9748b46edfdc4f7af39b46bae88bb5e8c5af99c4
--- /dev/null
+++ b/codec/seata-codec-hessian/src/test/java/io/seata/codec/hessian/HessianCodecTest.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.codec.hessian;
+
+import io.seata.core.exception.TransactionExceptionCode;
+import io.seata.core.model.BranchStatus;
+import io.seata.core.model.BranchType;
+import io.seata.core.protocol.ResultCode;
+import io.seata.core.protocol.transaction.BranchCommitRequest;
+import io.seata.core.protocol.transaction.BranchCommitResponse;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * @author Xin Wang
+ */
+public class HessianCodecTest {
+
+ private static HessianCodec hessianCodec;
+
+ @BeforeAll
+ public static void before() {
+ hessianCodec = new HessianCodec();
+ }
+
+ @Test
+ public void testBranchCommitRequest() {
+
+ BranchCommitRequest branchCommitRequest = new BranchCommitRequest();
+ branchCommitRequest.setBranchType(BranchType.AT);
+ branchCommitRequest.setXid("xid");
+ branchCommitRequest.setResourceId("resourceId");
+ branchCommitRequest.setBranchId(20190809);
+ branchCommitRequest.setApplicationData("app");
+
+ byte[] bytes = hessianCodec.encode(branchCommitRequest);
+ BranchCommitRequest t = hessianCodec.decode(bytes);
+
+ assertThat(t.getTypeCode()).isEqualTo(branchCommitRequest.getTypeCode());
+ assertThat(t.getBranchType()).isEqualTo(branchCommitRequest.getBranchType());
+ assertThat(t.getXid()).isEqualTo(branchCommitRequest.getXid());
+ assertThat(t.getResourceId()).isEqualTo(branchCommitRequest.getResourceId());
+ assertThat(t.getBranchId()).isEqualTo(branchCommitRequest.getBranchId());
+ assertThat(t.getApplicationData()).isEqualTo(branchCommitRequest.getApplicationData());
+
+ }
+
+ @Test
+ public void testBranchCommitResponse() {
+
+ BranchCommitResponse branchCommitResponse = new BranchCommitResponse();
+ branchCommitResponse.setTransactionExceptionCode(TransactionExceptionCode.BranchTransactionNotExist);
+ branchCommitResponse.setBranchId(20190809);
+ branchCommitResponse.setBranchStatus(BranchStatus.PhaseOne_Done);
+ branchCommitResponse.setMsg("20190809");
+ branchCommitResponse.setXid("20190809");
+ branchCommitResponse.setResultCode(ResultCode.Failed);
+
+ byte[] bytes = hessianCodec.encode(branchCommitResponse);
+ BranchCommitResponse t = hessianCodec.decode(bytes);
+
+ assertThat(t.getTransactionExceptionCode()).isEqualTo(branchCommitResponse.getTransactionExceptionCode());
+ assertThat(t.getBranchId()).isEqualTo(branchCommitResponse.getBranchId());
+ assertThat(t.getBranchStatus()).isEqualTo(branchCommitResponse.getBranchStatus());
+ assertThat(t.getMsg()).isEqualTo(branchCommitResponse.getMsg());
+ assertThat(t.getResultCode()).isEqualTo(branchCommitResponse.getResultCode());
+
+ }
+
+}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/ProtobufCodec.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/ProtobufCodec.java
index b09b892ad01fa7e394842950099f30ad88465763..4ab8fbe0991cd6558592e06f1d3fcf56fac68a10 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/ProtobufCodec.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/ProtobufCodec.java
@@ -29,7 +29,6 @@ import io.seata.core.codec.Codec;
* The type Protobuf codec.
*
* @author leizhiyuan
- * @date 2019 /5/6
*/
@LoadLevel(name = "PROTOBUF", order = 0)
public class ProtobufCodec implements Codec {
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchCommitRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchCommitRequestConvertor.java
index 64bd572c91ec27020c58dfb0fb591459e1d2e816..d70eac96a47834bc4391e680c7b0112a078933cc 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchCommitRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchCommitRequestConvertor.java
@@ -36,23 +36,18 @@ public class BranchCommitRequestConvertor implements PbConvertor<BranchCommitReq
MessageTypeProto.forNumber(typeCode)).build();
final AbstractTransactionRequestProto abstractTransactionRequestProto = AbstractTransactionRequestProto
- .newBuilder().setAbstractMessage(
- abstractMessage).build();
+ .newBuilder().setAbstractMessage(abstractMessage).build();
final String applicationData = branchCommitRequest.getApplicationData();
- final AbstractBranchEndRequestProto abstractBranchEndRequestProto = AbstractBranchEndRequestProto
- .newBuilder().
- setAbstractTransactionRequest(abstractTransactionRequestProto)
- .setXid(branchCommitRequest.getXid())
- .setBranchId(branchCommitRequest.getBranchId())
- .setBranchType(BranchTypeProto.valueOf(branchCommitRequest.getBranchType().name()))
- .setApplicationData(applicationData==null?"":applicationData)
- .setResourceId(branchCommitRequest.getResourceId())
+ final AbstractBranchEndRequestProto abstractBranchEndRequestProto = AbstractBranchEndRequestProto.newBuilder().
+ setAbstractTransactionRequest(abstractTransactionRequestProto).setXid(branchCommitRequest.getXid())
+ .setBranchId(branchCommitRequest.getBranchId()).setBranchType(
+ BranchTypeProto.valueOf(branchCommitRequest.getBranchType().name())).setApplicationData(
+ applicationData == null ? "" : applicationData).setResourceId(branchCommitRequest.getResourceId())
.build();
- BranchCommitRequestProto result = BranchCommitRequestProto.newBuilder()
- .setAbstractBranchEndRequest(abstractBranchEndRequestProto)
- .build();
+ BranchCommitRequestProto result = BranchCommitRequestProto.newBuilder().setAbstractBranchEndRequest(
+ abstractBranchEndRequestProto).build();
return result;
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchCommitResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchCommitResponseConvertor.java
index 545678244f5141ccdd2b191b34fee80c8c8504fd..3a19c4857e132f3c0f66695e5fb942b797c85271 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchCommitResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchCommitResponseConvertor.java
@@ -42,28 +42,21 @@ public class BranchCommitResponseConvertor implements PbConvertor<BranchCommitRe
final String msg = branchCommitResponse.getMsg();
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(branchCommitResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(ResultCodeProto.valueOf(branchCommitResponse.getResultCode().name()))
+ .setAbstractMessage(abstractMessage).build();
final AbstractTransactionResponseProto abstractTransactionRequestProto = AbstractTransactionResponseProto
- .newBuilder()
- .setAbstractResultMessage(abstractResultMessageProto)
- .setTransactionExceptionCode(
+ .newBuilder().setAbstractResultMessage(abstractResultMessageProto).setTransactionExceptionCode(
TransactionExceptionCodeProto.valueOf(branchCommitResponse.getTransactionExceptionCode().name()))
.build();
- final AbstractBranchEndResponseProto abstractBranchEndResponse = AbstractBranchEndResponseProto
- .newBuilder().
- setAbstractTransactionResponse(abstractTransactionRequestProto)
- .setXid(branchCommitResponse.getXid())
- .setBranchId(branchCommitResponse.getBranchId())
- .setBranchStatus(BranchStatusProto.forNumber(branchCommitResponse.getBranchStatus().getCode()))
- .build();
+ final AbstractBranchEndResponseProto abstractBranchEndResponse = AbstractBranchEndResponseProto.newBuilder().
+ setAbstractTransactionResponse(abstractTransactionRequestProto).setXid(branchCommitResponse.getXid())
+ .setBranchId(branchCommitResponse.getBranchId()).setBranchStatus(
+ BranchStatusProto.forNumber(branchCommitResponse.getBranchStatus().getCode())).build();
- BranchCommitResponseProto result = BranchCommitResponseProto.newBuilder()
- .setAbstractBranchEndResponse(abstractBranchEndResponse)
- .build();
+ BranchCommitResponseProto result = BranchCommitResponseProto.newBuilder().setAbstractBranchEndResponse(
+ abstractBranchEndResponse).build();
return result;
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRegisterRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRegisterRequestConvertor.java
index 3657c56e863739e7146e4116a863a12fc30e0b08..09a48dd9ad2483ceeabe33b06dd214d8094046db 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRegisterRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRegisterRequestConvertor.java
@@ -35,20 +35,16 @@ public class BranchRegisterRequestConvertor implements PbConvertor<BranchRegiste
MessageTypeProto.forNumber(typeCode)).build();
final AbstractTransactionRequestProto abstractTransactionRequestProto = AbstractTransactionRequestProto
- .newBuilder().setAbstractMessage(
- abstractMessage).build();
+ .newBuilder().setAbstractMessage(abstractMessage).build();
final String applicationData = branchRegisterRequest.getApplicationData();
final String resourceId = branchRegisterRequest.getResourceId();
final String lockKey = branchRegisterRequest.getLockKey();
- BranchRegisterRequestProto result = BranchRegisterRequestProto.newBuilder()
- .setAbstractTransactionRequest(abstractTransactionRequestProto)
- .setApplicationData(applicationData == null ? "" : applicationData)
- .setBranchType(BranchTypeProto.valueOf(branchRegisterRequest.getBranchType().name()))
- .setLockKey(lockKey == null ? "" : lockKey)
- .setResourceId(resourceId == null ? "" : resourceId)
- .setXid(branchRegisterRequest.getXid())
- .build();
+ BranchRegisterRequestProto result = BranchRegisterRequestProto.newBuilder().setAbstractTransactionRequest(
+ abstractTransactionRequestProto).setApplicationData(applicationData == null ? "" : applicationData)
+ .setBranchType(BranchTypeProto.valueOf(branchRegisterRequest.getBranchType().name())).setLockKey(
+ lockKey == null ? "" : lockKey).setResourceId(resourceId == null ? "" : resourceId).setXid(
+ branchRegisterRequest.getXid()).build();
return result;
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRegisterResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRegisterResponseConvertor.java
index ca6010ea4f2c8b1ad16b69671d52c8af23fe2137..dac9003bc8372cad6860c42cb52178a367ca8149 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRegisterResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRegisterResponseConvertor.java
@@ -40,19 +40,17 @@ public class BranchRegisterResponseConvertor
final String msg = branchRegisterResponse.getMsg();
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(branchRegisterResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(
+ ResultCodeProto.valueOf(branchRegisterResponse.getResultCode().name())).setAbstractMessage(abstractMessage)
+ .build();
AbstractTransactionResponseProto abstractTransactionResponseProto = AbstractTransactionResponseProto
- .newBuilder().setAbstractResultMessage(abstractResultMessageProto)
- .setTransactionExceptionCode(
+ .newBuilder().setAbstractResultMessage(abstractResultMessageProto).setTransactionExceptionCode(
TransactionExceptionCodeProto.valueOf(branchRegisterResponse.getTransactionExceptionCode().name()))
.build();
BranchRegisterResponseProto result = BranchRegisterResponseProto.newBuilder().setAbstractTransactionResponse(
- abstractTransactionResponseProto)
- .setBranchId(branchRegisterResponse.getBranchId()).build();
+ abstractTransactionResponseProto).setBranchId(branchRegisterResponse.getBranchId()).build();
return result;
}
@@ -63,8 +61,7 @@ public class BranchRegisterResponseConvertor
branchRegisterResponse.setBranchId(branchRegisterResponseProto.getBranchId());
final AbstractResultMessageProto abstractResultMessage = branchRegisterResponseProto
.getAbstractTransactionResponse().getAbstractResultMessage();
- branchRegisterResponse.setMsg(
- abstractResultMessage.getMsg());
+ branchRegisterResponse.setMsg(abstractResultMessage.getMsg());
branchRegisterResponse.setResultCode(ResultCode.valueOf(abstractResultMessage.getResultCode().name()));
branchRegisterResponse.setTransactionExceptionCode(TransactionExceptionCode.valueOf(
branchRegisterResponseProto.getAbstractTransactionResponse().getTransactionExceptionCode().name()));
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchReportRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchReportRequestConvertor.java
index 2db229b111129d8ac38658a953eaf7d3d06ae162..40aa2e5f538b6bcacf7a081b183d39e5e387cd4c 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchReportRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchReportRequestConvertor.java
@@ -37,20 +37,16 @@ public class BranchReportRequestConvertor implements PbConvertor<BranchReportReq
MessageTypeProto.forNumber(typeCode)).build();
final AbstractTransactionRequestProto abstractTransactionRequestProto = AbstractTransactionRequestProto
- .newBuilder().setAbstractMessage(
- abstractMessage).build();
+ .newBuilder().setAbstractMessage(abstractMessage).build();
final String applicationData = branchReportRequest.getApplicationData();
final String resourceId = branchReportRequest.getResourceId();
BranchReportRequestProto result = BranchReportRequestProto.newBuilder().setAbstractTransactionRequest(
- abstractTransactionRequestProto)
- .setXid(branchReportRequest.getXid())
- .setBranchId(branchReportRequest.getBranchId())
- .setBranchType(BranchTypeProto.valueOf(branchReportRequest.getBranchType().name()))
- .setApplicationData(applicationData == null ? "" : applicationData)
- .setResourceId(resourceId == null ? "" : resourceId)
- .setStatus(BranchStatusProto.valueOf(branchReportRequest.getStatus().name()))
- .build();
+ abstractTransactionRequestProto).setXid(branchReportRequest.getXid()).setBranchId(
+ branchReportRequest.getBranchId()).setBranchType(
+ BranchTypeProto.valueOf(branchReportRequest.getBranchType().name())).setApplicationData(
+ applicationData == null ? "" : applicationData).setResourceId(resourceId == null ? "" : resourceId)
+ .setStatus(BranchStatusProto.valueOf(branchReportRequest.getStatus().name())).build();
return result;
}
@@ -58,13 +54,11 @@ public class BranchReportRequestConvertor implements PbConvertor<BranchReportReq
@Override
public BranchReportRequest convert2Model(BranchReportRequestProto branchReportRequestProto) {
BranchReportRequest branchReportRequest = new BranchReportRequest();
- branchReportRequest.setApplicationData(
- branchReportRequestProto.getApplicationData());
+ branchReportRequest.setApplicationData(branchReportRequestProto.getApplicationData());
branchReportRequest.setBranchId(branchReportRequestProto.getBranchId());
branchReportRequest.setResourceId(branchReportRequestProto.getResourceId());
branchReportRequest.setXid(branchReportRequestProto.getXid());
- branchReportRequest.setBranchType(
- BranchType.valueOf(branchReportRequestProto.getBranchType().name()));
+ branchReportRequest.setBranchType(BranchType.valueOf(branchReportRequestProto.getBranchType().name()));
branchReportRequest.setStatus(BranchStatus.valueOf(branchReportRequestProto.getStatus().name()));
return branchReportRequest;
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchReportResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchReportResponseConvertor.java
index 6161526748f8a385b930324ef9876fa07c99aa7d..2dfdd345df6bb252a36e7f2b04af28dd6f9341c5 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchReportResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchReportResponseConvertor.java
@@ -39,18 +39,16 @@ public class BranchReportResponseConvertor implements PbConvertor<BranchReportRe
final String msg = branchReportResponse.getMsg();
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(branchReportResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(ResultCodeProto.valueOf(branchReportResponse.getResultCode().name()))
+ .setAbstractMessage(abstractMessage).build();
AbstractTransactionResponseProto abstractTransactionResponseProto = AbstractTransactionResponseProto
- .newBuilder().setAbstractResultMessage(abstractResultMessageProto)
- .setTransactionExceptionCode(
+ .newBuilder().setAbstractResultMessage(abstractResultMessageProto).setTransactionExceptionCode(
TransactionExceptionCodeProto.valueOf(branchReportResponse.getTransactionExceptionCode().name()))
.build();
- BranchReportResponseProto result = BranchReportResponseProto.newBuilder()
- .setAbstractTransactionResponse(abstractTransactionResponseProto).build();
+ BranchReportResponseProto result = BranchReportResponseProto.newBuilder().setAbstractTransactionResponse(
+ abstractTransactionResponseProto).build();
return result;
}
@@ -60,11 +58,10 @@ public class BranchReportResponseConvertor implements PbConvertor<BranchReportRe
BranchReportResponse branchRegisterResponse = new BranchReportResponse();
final AbstractResultMessageProto abstractResultMessage = branchReportResponseProto
.getAbstractTransactionResponse().getAbstractResultMessage();
- branchRegisterResponse.setMsg(
- abstractResultMessage.getMsg());
+ branchRegisterResponse.setMsg(abstractResultMessage.getMsg());
branchRegisterResponse.setResultCode(ResultCode.valueOf(abstractResultMessage.getResultCode().name()));
- branchRegisterResponse.setTransactionExceptionCode(TransactionExceptionCode.valueOf(
- branchReportResponseProto.getAbstractTransactionResponse().getTransactionExceptionCode().name()));
+ branchRegisterResponse.setTransactionExceptionCode(TransactionExceptionCode
+ .valueOf(branchReportResponseProto.getAbstractTransactionResponse().getTransactionExceptionCode().name()));
return branchRegisterResponse;
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRollbackRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRollbackRequestConvertor.java
index 99150e18ed9dea829d62d57fbc6aa7eae4609c8f..f6420fb5ce496693cc84949f94a8d81ee9cd9b4f 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRollbackRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRollbackRequestConvertor.java
@@ -36,19 +36,15 @@ public class BranchRollbackRequestConvertor implements PbConvertor<BranchRollbac
MessageTypeProto.forNumber(typeCode)).build();
final AbstractTransactionRequestProto abstractTransactionRequestProto = AbstractTransactionRequestProto
- .newBuilder().setAbstractMessage(
- abstractMessage).build();
+ .newBuilder().setAbstractMessage(abstractMessage).build();
final String applicationData = branchRollbackRequest.getApplicationData();
final String resourceId = branchRollbackRequest.getResourceId();
- final AbstractBranchEndRequestProto abstractBranchEndRequestProto = AbstractBranchEndRequestProto
- .newBuilder().
- setAbstractTransactionRequest(abstractTransactionRequestProto)
- .setXid(branchRollbackRequest.getXid())
- .setBranchId(branchRollbackRequest.getBranchId())
- .setBranchType(BranchTypeProto.valueOf(branchRollbackRequest.getBranchType().name()))
- .setApplicationData(applicationData==null?"":applicationData)
- .setResourceId(resourceId == null ? "" : resourceId)
+ final AbstractBranchEndRequestProto abstractBranchEndRequestProto = AbstractBranchEndRequestProto.newBuilder().
+ setAbstractTransactionRequest(abstractTransactionRequestProto).setXid(branchRollbackRequest.getXid())
+ .setBranchId(branchRollbackRequest.getBranchId()).setBranchType(
+ BranchTypeProto.valueOf(branchRollbackRequest.getBranchType().name())).setApplicationData(
+ applicationData == null ? "" : applicationData).setResourceId(resourceId == null ? "" : resourceId)
.build();
BranchRollbackRequestProto result = BranchRollbackRequestProto.newBuilder().setAbstractBranchEndRequest(
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRollbackResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRollbackResponseConvertor.java
index b437e5cc6989aaecd7a6a8153c0c25aa67898a37..49e4621f7e9f3fe66ce10bee4a58604d3565d71f 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRollbackResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/BranchRollbackResponseConvertor.java
@@ -43,24 +43,19 @@ public class BranchRollbackResponseConvertor
final String msg = branchRollbackResponse.getMsg();
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(branchRollbackResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(
+ ResultCodeProto.valueOf(branchRollbackResponse.getResultCode().name())).setAbstractMessage(abstractMessage)
+ .build();
final AbstractTransactionResponseProto abstractTransactionRequestProto = AbstractTransactionResponseProto
- .newBuilder()
- .setAbstractResultMessage(abstractResultMessageProto)
- .setTransactionExceptionCode(
+ .newBuilder().setAbstractResultMessage(abstractResultMessageProto).setTransactionExceptionCode(
TransactionExceptionCodeProto.valueOf(branchRollbackResponse.getTransactionExceptionCode().name()))
.build();
- final AbstractBranchEndResponseProto abstractBranchEndResponse = AbstractBranchEndResponseProto
- .newBuilder().
- setAbstractTransactionResponse(abstractTransactionRequestProto)
- .setXid(branchRollbackResponse.getXid())
- .setBranchId(branchRollbackResponse.getBranchId())
- .setBranchStatus(BranchStatusProto.forNumber(branchRollbackResponse.getBranchStatus().getCode()))
- .build();
+ final AbstractBranchEndResponseProto abstractBranchEndResponse = AbstractBranchEndResponseProto.newBuilder().
+ setAbstractTransactionResponse(abstractTransactionRequestProto).setXid(branchRollbackResponse.getXid())
+ .setBranchId(branchRollbackResponse.getBranchId()).setBranchStatus(
+ BranchStatusProto.forNumber(branchRollbackResponse.getBranchStatus().getCode())).build();
BranchRollbackResponseProto result = BranchRollbackResponseProto.newBuilder().setAbstractBranchEndResponse(
abstractBranchEndResponse).build();
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalBeginRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalBeginRequestConvertor.java
index c4ae1b3306d558fd014051eb8388c3710aec1b93..44fadf745cc31c64c2d8d534fcec0d88f9979f8d 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalBeginRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalBeginRequestConvertor.java
@@ -34,14 +34,11 @@ public class GlobalBeginRequestConvertor implements PbConvertor<GlobalBeginReque
MessageTypeProto.forNumber(typeCode)).build();
final AbstractTransactionRequestProto abstractTransactionRequestProto = AbstractTransactionRequestProto
- .newBuilder().setAbstractMessage(
- abstractMessage).build();
+ .newBuilder().setAbstractMessage(abstractMessage).build();
- GlobalBeginRequestProto result = GlobalBeginRequestProto.newBuilder()
- .setTimeout(globalBeginRequest.getTimeout())
- .setTransactionName(globalBeginRequest.getTransactionName())
- .setAbstractTransactionRequest(abstractTransactionRequestProto)
- .build();
+ GlobalBeginRequestProto result = GlobalBeginRequestProto.newBuilder().setTimeout(
+ globalBeginRequest.getTimeout()).setTransactionName(globalBeginRequest.getTransactionName())
+ .setAbstractTransactionRequest(abstractTransactionRequestProto).build();
return result;
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalBeginResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalBeginResponseConvertor.java
index 82ae72d9fdabe5fe764b0fe61914c8e8aeb3b9eb..73878afd5049232920ff21285ba97af4e30b4239 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalBeginResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalBeginResponseConvertor.java
@@ -39,22 +39,18 @@ public class GlobalBeginResponseConvertor implements PbConvertor<GlobalBeginResp
final String msg = globalBeginResponse.getMsg();
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(globalBeginResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(ResultCodeProto.valueOf(globalBeginResponse.getResultCode().name()))
+ .setAbstractMessage(abstractMessage).build();
final AbstractTransactionResponseProto abstractTransactionRequestProto = AbstractTransactionResponseProto
- .newBuilder()
- .setAbstractResultMessage(abstractResultMessageProto)
- .setTransactionExceptionCode(
+ .newBuilder().setAbstractResultMessage(abstractResultMessageProto).setTransactionExceptionCode(
TransactionExceptionCodeProto.valueOf(globalBeginResponse.getTransactionExceptionCode().name()))
.build();
final String extraData = globalBeginResponse.getExtraData();
GlobalBeginResponseProto result = GlobalBeginResponseProto.newBuilder().setAbstractTransactionResponse(
- abstractTransactionRequestProto)
- .setExtraData(extraData == null ? "" : extraData)
- .setXid(globalBeginResponse.getXid()).build();
+ abstractTransactionRequestProto).setExtraData(extraData == null ? "" : extraData).setXid(
+ globalBeginResponse.getXid()).build();
return result;
}
@@ -62,18 +58,15 @@ public class GlobalBeginResponseConvertor implements PbConvertor<GlobalBeginResp
public GlobalBeginResponse convert2Model(GlobalBeginResponseProto globalBeginResponseProto) {
GlobalBeginResponse branchCommitResponse = new GlobalBeginResponse();
branchCommitResponse.setXid(globalBeginResponseProto.getXid());
- branchCommitResponse.setExtraData(
- globalBeginResponseProto.getExtraData());
+ branchCommitResponse.setExtraData(globalBeginResponseProto.getExtraData());
branchCommitResponse.setMsg(
- globalBeginResponseProto.getAbstractTransactionResponse()
- .getAbstractResultMessage().getMsg());
+ globalBeginResponseProto.getAbstractTransactionResponse().getAbstractResultMessage().getMsg());
branchCommitResponse.setResultCode(ResultCode.valueOf(
- globalBeginResponseProto.getAbstractTransactionResponse()
- .getAbstractResultMessage().getResultCode().name()));
+ globalBeginResponseProto.getAbstractTransactionResponse().getAbstractResultMessage().getResultCode()
+ .name()));
- branchCommitResponse.setTransactionExceptionCode(TransactionExceptionCode.valueOf(
- globalBeginResponseProto.getAbstractTransactionResponse()
- .getTransactionExceptionCode().name()));
+ branchCommitResponse.setTransactionExceptionCode(TransactionExceptionCode
+ .valueOf(globalBeginResponseProto.getAbstractTransactionResponse().getTransactionExceptionCode().name()));
return branchCommitResponse;
}
}
\ No newline at end of file
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalCommitRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalCommitRequestConvertor.java
index 1fd606c2110129c9485224040244eeb59fe1dfc2..6509cec9282c0db8981dbe5c057ddcad1d97be3f 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalCommitRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalCommitRequestConvertor.java
@@ -34,15 +34,12 @@ public class GlobalCommitRequestConvertor implements PbConvertor<GlobalCommitReq
MessageTypeProto.forNumber(typeCode)).build();
final AbstractTransactionRequestProto abstractTransactionRequestProto = AbstractTransactionRequestProto
- .newBuilder().setAbstractMessage(
- abstractMessage).build();
+ .newBuilder().setAbstractMessage(abstractMessage).build();
final String extraData = globalCommitRequest.getExtraData();
AbstractGlobalEndRequestProto abstractGlobalEndRequestProto = AbstractGlobalEndRequestProto.newBuilder()
- .setAbstractTransactionRequest(abstractTransactionRequestProto)
- .setXid(globalCommitRequest.getXid())
- .setExtraData(extraData == null ? "" : extraData)
- .build();
+ .setAbstractTransactionRequest(abstractTransactionRequestProto).setXid(globalCommitRequest.getXid())
+ .setExtraData(extraData == null ? "" : extraData).build();
GlobalCommitRequestProto result = GlobalCommitRequestProto.newBuilder().setAbstractGlobalEndRequest(
abstractGlobalEndRequestProto).build();
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalCommitResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalCommitResponseConvertor.java
index c70db73e94bfc54a511941c0740b422fc02fe9b7..08631393451b81e42f61751398167ccdd124a704 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalCommitResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalCommitResponseConvertor.java
@@ -42,20 +42,17 @@ public class GlobalCommitResponseConvertor implements PbConvertor<GlobalCommitRe
final String msg = globalCommitResponse.getMsg();
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(globalCommitResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(ResultCodeProto.valueOf(globalCommitResponse.getResultCode().name()))
+ .setAbstractMessage(abstractMessage).build();
AbstractTransactionResponseProto abstractTransactionResponseProto = AbstractTransactionResponseProto
- .newBuilder().setAbstractResultMessage(abstractResultMessageProto)
- .setTransactionExceptionCode(
+ .newBuilder().setAbstractResultMessage(abstractResultMessageProto).setTransactionExceptionCode(
TransactionExceptionCodeProto.valueOf(globalCommitResponse.getTransactionExceptionCode().name()))
.build();
AbstractGlobalEndResponseProto abstractGlobalEndResponseProto = AbstractGlobalEndResponseProto.newBuilder()
- .setAbstractTransactionResponse(abstractTransactionResponseProto)
- .setGlobalStatus(GlobalStatusProto.valueOf(globalCommitResponse.getGlobalStatus().name()))
- .build();
+ .setAbstractTransactionResponse(abstractTransactionResponseProto).setGlobalStatus(
+ GlobalStatusProto.valueOf(globalCommitResponse.getGlobalStatus().name())).build();
GlobalCommitResponseProto result = GlobalCommitResponseProto.newBuilder().setAbstractGlobalEndResponse(
abstractGlobalEndResponseProto).build();
@@ -70,12 +67,11 @@ public class GlobalCommitResponseConvertor implements PbConvertor<GlobalCommitRe
.getAbstractGlobalEndResponse();
AbstractTransactionResponseProto abstractResultMessage = abstractGlobalEndResponse
.getAbstractTransactionResponse();
- branchRegisterResponse.setMsg(
- abstractResultMessage.getAbstractResultMessage().getMsg());
+ branchRegisterResponse.setMsg(abstractResultMessage.getAbstractResultMessage().getMsg());
branchRegisterResponse.setResultCode(
ResultCode.valueOf(abstractResultMessage.getAbstractResultMessage().getResultCode().name()));
- branchRegisterResponse.setTransactionExceptionCode(TransactionExceptionCode.valueOf(
- abstractResultMessage.getTransactionExceptionCode().name()));
+ branchRegisterResponse.setTransactionExceptionCode(
+ TransactionExceptionCode.valueOf(abstractResultMessage.getTransactionExceptionCode().name()));
branchRegisterResponse.setGlobalStatus(
GlobalStatus.valueOf(abstractGlobalEndResponse.getGlobalStatus().name()));
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalLockQueryRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalLockQueryRequestConvertor.java
index c20ff546acefdbe8f578664699a75d05a48115cb..391c0b37a29808bf32a3b6b56afb366590b54d58 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalLockQueryRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalLockQueryRequestConvertor.java
@@ -37,19 +37,16 @@ public class GlobalLockQueryRequestConvertor
MessageTypeProto.forNumber(typeCode)).build();
final AbstractTransactionRequestProto abstractTransactionRequestProto = AbstractTransactionRequestProto
- .newBuilder().setAbstractMessage(
- abstractMessage).build();
+ .newBuilder().setAbstractMessage(abstractMessage).build();
final String applicationData = globalLockQueryRequest.getApplicationData();
final String lockKey = globalLockQueryRequest.getLockKey();
BranchRegisterRequestProto branchRegisterRequestProto = BranchRegisterRequestProto.newBuilder()
- .setAbstractTransactionRequest(abstractTransactionRequestProto)
- .setApplicationData(applicationData == null ? "" : applicationData)
- .setBranchType(BranchTypeProto.valueOf(globalLockQueryRequest.getBranchType().name()))
- .setLockKey(lockKey == null ? "" : lockKey)
- .setResourceId(globalLockQueryRequest.getResourceId())
- .setXid(globalLockQueryRequest.getXid())
- .build();
+ .setAbstractTransactionRequest(abstractTransactionRequestProto).setApplicationData(
+ applicationData == null ? "" : applicationData).setBranchType(
+ BranchTypeProto.valueOf(globalLockQueryRequest.getBranchType().name())).setLockKey(
+ lockKey == null ? "" : lockKey).setResourceId(globalLockQueryRequest.getResourceId()).setXid(
+ globalLockQueryRequest.getXid()).build();
GlobalLockQueryRequestProto result = GlobalLockQueryRequestProto.newBuilder().setBranchRegisterRequest(
branchRegisterRequestProto).build();
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalLockQueryResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalLockQueryResponseConvertor.java
index 7b7967135880cb13c62003c0a504b730b2f0ed1b..8c3f763e5e71fa8aaa7d04220691c295031b73ac 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalLockQueryResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalLockQueryResponseConvertor.java
@@ -40,19 +40,18 @@ public class GlobalLockQueryResponseConvertor
final String msg = globalLockQueryResponse.getMsg();
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(globalLockQueryResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(
+ ResultCodeProto.valueOf(globalLockQueryResponse.getResultCode().name())).setAbstractMessage(abstractMessage)
+ .build();
AbstractTransactionResponseProto abstractTransactionResponseProto = AbstractTransactionResponseProto
- .newBuilder().setAbstractResultMessage(abstractResultMessageProto)
- .setTransactionExceptionCode(
+ .newBuilder().setAbstractResultMessage(abstractResultMessageProto).setTransactionExceptionCode(
TransactionExceptionCodeProto.valueOf(globalLockQueryResponse.getTransactionExceptionCode().name()))
.build();
GlobalLockQueryResponseProto result = GlobalLockQueryResponseProto.newBuilder().setLockable(
- globalLockQueryResponse.isLockable())
- .setAbstractTransactionResponse(abstractTransactionResponseProto).build();
+ globalLockQueryResponse.isLockable()).setAbstractTransactionResponse(abstractTransactionResponseProto)
+ .build();
return result;
}
@@ -64,11 +63,10 @@ public class GlobalLockQueryResponseConvertor
AbstractTransactionResponseProto branchRegisterResponseProto = globalLockQueryResponseProto
.getAbstractTransactionResponse();
final AbstractResultMessageProto abstractResultMessage = branchRegisterResponseProto.getAbstractResultMessage();
- branchRegisterResponse.setMsg(
- abstractResultMessage.getMsg());
+ branchRegisterResponse.setMsg(abstractResultMessage.getMsg());
branchRegisterResponse.setResultCode(ResultCode.valueOf(abstractResultMessage.getResultCode().name()));
- branchRegisterResponse.setTransactionExceptionCode(TransactionExceptionCode.valueOf(
- branchRegisterResponseProto.getTransactionExceptionCode().name()));
+ branchRegisterResponse.setTransactionExceptionCode(
+ TransactionExceptionCode.valueOf(branchRegisterResponseProto.getTransactionExceptionCode().name()));
branchRegisterResponse.setLockable(globalLockQueryResponseProto.getLockable());
return branchRegisterResponse;
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalReportRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalReportRequestConvertor.java
index c81e189740273f75e22ca2f45685816cba1b475c..e88ae2aeb70b5fd724e6bb0150e695403da3f578 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalReportRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalReportRequestConvertor.java
@@ -36,20 +36,16 @@ public class GlobalReportRequestConvertor implements PbConvertor<GlobalReportReq
MessageTypeProto.forNumber(typeCode)).build();
final AbstractTransactionRequestProto abstractTransactionRequestProto = AbstractTransactionRequestProto
- .newBuilder().setAbstractMessage(
- abstractMessage).build();
+ .newBuilder().setAbstractMessage(abstractMessage).build();
final String extraData = globalReportRequest.getExtraData();
AbstractGlobalEndRequestProto abstractGlobalEndRequestProto = AbstractGlobalEndRequestProto.newBuilder()
- .setAbstractTransactionRequest(abstractTransactionRequestProto)
- .setXid(globalReportRequest.getXid())
- .setExtraData(extraData == null ? "" : extraData)
- .build();
+ .setAbstractTransactionRequest(abstractTransactionRequestProto).setXid(globalReportRequest.getXid())
+ .setExtraData(extraData == null ? "" : extraData).build();
GlobalReportRequestProto result = GlobalReportRequestProto.newBuilder().setAbstractGlobalEndRequest(
- abstractGlobalEndRequestProto)
- .setGlobalStatus(GlobalStatusProto.valueOf(globalReportRequest.getGlobalStatus().name()))
- .build();
+ abstractGlobalEndRequestProto).setGlobalStatus(
+ GlobalStatusProto.valueOf(globalReportRequest.getGlobalStatus().name())).build();
return result;
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalReportResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalReportResponseConvertor.java
index 6dce456c24e968fd57ce6bf11be06b2e6983f223..143d74383a3e4bf1e818eb3ce05fad02b626d59d 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalReportResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalReportResponseConvertor.java
@@ -42,20 +42,17 @@ public class GlobalReportResponseConvertor implements PbConvertor<GlobalReportRe
final String msg = globalStatusResponse.getMsg();
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(globalStatusResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(ResultCodeProto.valueOf(globalStatusResponse.getResultCode().name()))
+ .setAbstractMessage(abstractMessage).build();
AbstractTransactionResponseProto abstractTransactionResponseProto = AbstractTransactionResponseProto
- .newBuilder().setAbstractResultMessage(abstractResultMessageProto)
- .setTransactionExceptionCode(
+ .newBuilder().setAbstractResultMessage(abstractResultMessageProto).setTransactionExceptionCode(
TransactionExceptionCodeProto.valueOf(globalStatusResponse.getTransactionExceptionCode().name()))
.build();
AbstractGlobalEndResponseProto abstractGlobalEndResponseProto = AbstractGlobalEndResponseProto.newBuilder()
- .setAbstractTransactionResponse(abstractTransactionResponseProto)
- .setGlobalStatus(GlobalStatusProto.valueOf(globalStatusResponse.getGlobalStatus().name()))
- .build();
+ .setAbstractTransactionResponse(abstractTransactionResponseProto).setGlobalStatus(
+ GlobalStatusProto.valueOf(globalStatusResponse.getGlobalStatus().name())).build();
GlobalReportResponseProto result = GlobalReportResponseProto.newBuilder().setAbstractGlobalEndResponse(
abstractGlobalEndResponseProto).build();
@@ -69,12 +66,11 @@ public class GlobalReportResponseConvertor implements PbConvertor<GlobalReportRe
.getAbstractGlobalEndResponse();
AbstractTransactionResponseProto abstractResultMessage = abstractGlobalEndResponse
.getAbstractTransactionResponse();
- branchRegisterResponse.setMsg(
- abstractResultMessage.getAbstractResultMessage().getMsg());
+ branchRegisterResponse.setMsg(abstractResultMessage.getAbstractResultMessage().getMsg());
branchRegisterResponse.setResultCode(
ResultCode.valueOf(abstractResultMessage.getAbstractResultMessage().getResultCode().name()));
- branchRegisterResponse.setTransactionExceptionCode(TransactionExceptionCode.valueOf(
- abstractResultMessage.getTransactionExceptionCode().name()));
+ branchRegisterResponse.setTransactionExceptionCode(
+ TransactionExceptionCode.valueOf(abstractResultMessage.getTransactionExceptionCode().name()));
branchRegisterResponse.setGlobalStatus(
GlobalStatus.valueOf(abstractGlobalEndResponse.getGlobalStatus().name()));
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalRollbackRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalRollbackRequestConvertor.java
index a804422e05b0404ee8942206cd8af01b3046de9d..098d1aec827f396db16b8be437258808771a83b9 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalRollbackRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalRollbackRequestConvertor.java
@@ -34,15 +34,12 @@ public class GlobalRollbackRequestConvertor implements PbConvertor<GlobalRollbac
MessageTypeProto.forNumber(typeCode)).build();
final AbstractTransactionRequestProto abstractTransactionRequestProto = AbstractTransactionRequestProto
- .newBuilder().setAbstractMessage(
- abstractMessage).build();
+ .newBuilder().setAbstractMessage(abstractMessage).build();
final String extraData = globalRollbackRequest.getExtraData();
AbstractGlobalEndRequestProto abstractGlobalEndRequestProto = AbstractGlobalEndRequestProto.newBuilder()
- .setAbstractTransactionRequest(abstractTransactionRequestProto)
- .setXid(globalRollbackRequest.getXid())
- .setExtraData(extraData==null?"":extraData)
- .build();
+ .setAbstractTransactionRequest(abstractTransactionRequestProto).setXid(globalRollbackRequest.getXid())
+ .setExtraData(extraData == null ? "" : extraData).build();
GlobalRollbackRequestProto result = GlobalRollbackRequestProto.newBuilder().setAbstractGlobalEndRequest(
abstractGlobalEndRequestProto).build();
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalRollbackResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalRollbackResponseConvertor.java
index 516e8e08423ff6d19a31c343d73453d9e0c9cb68..4532bdcf8fc1dd635f19fca5c6f20a20861467fc 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalRollbackResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalRollbackResponseConvertor.java
@@ -43,20 +43,18 @@ public class GlobalRollbackResponseConvertor
final String msg = globalRollbackResponse.getMsg();
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(globalRollbackResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(
+ ResultCodeProto.valueOf(globalRollbackResponse.getResultCode().name())).setAbstractMessage(abstractMessage)
+ .build();
AbstractTransactionResponseProto abstractTransactionResponseProto = AbstractTransactionResponseProto
- .newBuilder().setAbstractResultMessage(abstractResultMessageProto)
- .setTransactionExceptionCode(
+ .newBuilder().setAbstractResultMessage(abstractResultMessageProto).setTransactionExceptionCode(
TransactionExceptionCodeProto.valueOf(globalRollbackResponse.getTransactionExceptionCode().name()))
.build();
AbstractGlobalEndResponseProto abstractGlobalEndResponseProto = AbstractGlobalEndResponseProto.newBuilder()
- .setAbstractTransactionResponse(abstractTransactionResponseProto)
- .setGlobalStatus(GlobalStatusProto.valueOf(globalRollbackResponse.getGlobalStatus().name()))
- .build();
+ .setAbstractTransactionResponse(abstractTransactionResponseProto).setGlobalStatus(
+ GlobalStatusProto.valueOf(globalRollbackResponse.getGlobalStatus().name())).build();
GlobalRollbackResponseProto result = GlobalRollbackResponseProto.newBuilder().setAbstractGlobalEndResponse(
abstractGlobalEndResponseProto).build();
@@ -72,12 +70,11 @@ public class GlobalRollbackResponseConvertor
.getAbstractGlobalEndResponse();
AbstractTransactionResponseProto abstractResultMessage = abstractGlobalEndResponse
.getAbstractTransactionResponse();
- branchRegisterResponse.setMsg(
- abstractResultMessage.getAbstractResultMessage().getMsg());
+ branchRegisterResponse.setMsg(abstractResultMessage.getAbstractResultMessage().getMsg());
branchRegisterResponse.setResultCode(
ResultCode.valueOf(abstractResultMessage.getAbstractResultMessage().getResultCode().name()));
- branchRegisterResponse.setTransactionExceptionCode(TransactionExceptionCode.valueOf(
- abstractResultMessage.getTransactionExceptionCode().name()));
+ branchRegisterResponse.setTransactionExceptionCode(
+ TransactionExceptionCode.valueOf(abstractResultMessage.getTransactionExceptionCode().name()));
branchRegisterResponse.setGlobalStatus(
GlobalStatus.valueOf(abstractGlobalEndResponse.getGlobalStatus().name()));
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalStatusRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalStatusRequestConvertor.java
index 68a17e2d9e6123d74355a0e58c8aa3d278c6976a..e0ccf21b9f8e365ad2bb0b549cc576bebc657567 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalStatusRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalStatusRequestConvertor.java
@@ -34,15 +34,12 @@ public class GlobalStatusRequestConvertor implements PbConvertor<GlobalStatusReq
MessageTypeProto.forNumber(typeCode)).build();
final AbstractTransactionRequestProto abstractTransactionRequestProto = AbstractTransactionRequestProto
- .newBuilder().setAbstractMessage(
- abstractMessage).build();
+ .newBuilder().setAbstractMessage(abstractMessage).build();
final String extraData = globalStatusRequest.getExtraData();
AbstractGlobalEndRequestProto abstractGlobalEndRequestProto = AbstractGlobalEndRequestProto.newBuilder()
- .setAbstractTransactionRequest(abstractTransactionRequestProto)
- .setXid(globalStatusRequest.getXid())
- .setExtraData(extraData==null?"":extraData)
- .build();
+ .setAbstractTransactionRequest(abstractTransactionRequestProto).setXid(globalStatusRequest.getXid())
+ .setExtraData(extraData == null ? "" : extraData).build();
GlobalStatusRequestProto result = GlobalStatusRequestProto.newBuilder().setAbstractGlobalEndRequest(
abstractGlobalEndRequestProto).build();
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalStatusResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalStatusResponseConvertor.java
index 3fb4f2e81a1e1c284c0c0464cc8b9f62211c47cf..04c6628d09722673c2e414c3f361e257a71c7d1e 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalStatusResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/GlobalStatusResponseConvertor.java
@@ -42,20 +42,17 @@ public class GlobalStatusResponseConvertor implements PbConvertor<GlobalStatusRe
final String msg = globalStatusResponse.getMsg();
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(globalStatusResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(ResultCodeProto.valueOf(globalStatusResponse.getResultCode().name()))
+ .setAbstractMessage(abstractMessage).build();
AbstractTransactionResponseProto abstractTransactionResponseProto = AbstractTransactionResponseProto
- .newBuilder().setAbstractResultMessage(abstractResultMessageProto)
- .setTransactionExceptionCode(
+ .newBuilder().setAbstractResultMessage(abstractResultMessageProto).setTransactionExceptionCode(
TransactionExceptionCodeProto.valueOf(globalStatusResponse.getTransactionExceptionCode().name()))
.build();
AbstractGlobalEndResponseProto abstractGlobalEndResponseProto = AbstractGlobalEndResponseProto.newBuilder()
- .setAbstractTransactionResponse(abstractTransactionResponseProto)
- .setGlobalStatus(GlobalStatusProto.valueOf(globalStatusResponse.getGlobalStatus().name()))
- .build();
+ .setAbstractTransactionResponse(abstractTransactionResponseProto).setGlobalStatus(
+ GlobalStatusProto.valueOf(globalStatusResponse.getGlobalStatus().name())).build();
GlobalStatusResponseProto result = GlobalStatusResponseProto.newBuilder().setAbstractGlobalEndResponse(
abstractGlobalEndResponseProto).build();
@@ -69,12 +66,11 @@ public class GlobalStatusResponseConvertor implements PbConvertor<GlobalStatusRe
.getAbstractGlobalEndResponse();
AbstractTransactionResponseProto abstractResultMessage = abstractGlobalEndResponse
.getAbstractTransactionResponse();
- branchRegisterResponse.setMsg(
- abstractResultMessage.getAbstractResultMessage().getMsg());
+ branchRegisterResponse.setMsg(abstractResultMessage.getAbstractResultMessage().getMsg());
branchRegisterResponse.setResultCode(
ResultCode.valueOf(abstractResultMessage.getAbstractResultMessage().getResultCode().name()));
- branchRegisterResponse.setTransactionExceptionCode(TransactionExceptionCode.valueOf(
- abstractResultMessage.getTransactionExceptionCode().name()));
+ branchRegisterResponse.setTransactionExceptionCode(
+ TransactionExceptionCode.valueOf(abstractResultMessage.getTransactionExceptionCode().name()));
branchRegisterResponse.setGlobalStatus(
GlobalStatus.valueOf(abstractGlobalEndResponse.getGlobalStatus().name()));
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/HeartbeatMessageConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/HeartbeatMessageConvertor.java
index 33e5c1d62c0e8aa450b4c0c916f64cdca3e09fe6..8fde77ddfeadf9f48ea60237347ed613f942a638 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/HeartbeatMessageConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/HeartbeatMessageConvertor.java
@@ -24,8 +24,7 @@ import io.seata.core.protocol.HeartbeatMessage;
public class HeartbeatMessageConvertor implements PbConvertor<HeartbeatMessage, HeartbeatMessageProto> {
@Override
public HeartbeatMessageProto convert2Proto(HeartbeatMessage heartbeatMessage) {
- HeartbeatMessageProto result = HeartbeatMessageProto.newBuilder().setPing(heartbeatMessage.isPing())
- .build();
+ HeartbeatMessageProto result = HeartbeatMessageProto.newBuilder().setPing(heartbeatMessage.isPing()).build();
return result;
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/MergeResultMessageConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/MergeResultMessageConvertor.java
index 9e59b5933ebf5e254e1689f9113800ea061eaf3e..f5302bfd004fca3cac3b68312cb92a83623da43c 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/MergeResultMessageConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/MergeResultMessageConvertor.java
@@ -49,9 +49,7 @@ public class MergeResultMessageConvertor implements PbConvertor<MergeResultMessa
}
MergedResultMessageProto mergedWarpMessageProto = MergedResultMessageProto.newBuilder().setAbstractMessage(
- abstractMessage)
- .addAllMsgs(lists)
- .build();
+ abstractMessage).addAllMsgs(lists).build();
return mergedWarpMessageProto;
}
@@ -82,8 +80,7 @@ public class MergeResultMessageConvertor implements PbConvertor<MergeResultMessa
return result;
}
- private static String getTypeNameFromTypeUrl(
- java.lang.String typeUrl) {
+ private static String getTypeNameFromTypeUrl(java.lang.String typeUrl) {
int pos = typeUrl.lastIndexOf('/');
return pos == -1 ? "" : typeUrl.substring(pos + 1);
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/MergedWarpMessageConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/MergedWarpMessageConvertor.java
index 92b68e906aa1999727cb0198eb8cef3f3bb1ed37..f49d21767e30df72a1ee300842e6d22109b3d3e3 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/MergedWarpMessageConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/MergedWarpMessageConvertor.java
@@ -50,10 +50,7 @@ public class MergedWarpMessageConvertor implements PbConvertor<MergedWarpMessage
}
MergedWarpMessageProto mergedWarpMessageProto = MergedWarpMessageProto.newBuilder().setAbstractMessage(
- abstractMessage)
- .addAllMsgs(lists)
- .addAllMsgIds(mergedWarpMessage.msgIds)
- .build();
+ abstractMessage).addAllMsgs(lists).addAllMsgIds(mergedWarpMessage.msgIds).build();
return mergedWarpMessageProto;
@@ -83,8 +80,7 @@ public class MergedWarpMessageConvertor implements PbConvertor<MergedWarpMessage
return result;
}
- private static String getTypeNameFromTypeUrl(
- java.lang.String typeUrl) {
+ private static String getTypeNameFromTypeUrl(java.lang.String typeUrl) {
int pos = typeUrl.lastIndexOf('/');
return pos == -1 ? "" : typeUrl.substring(pos + 1);
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterRMRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterRMRequestConvertor.java
index 6ca246c24cef763b81b740be1a2826de71baa7e5..2613cd2a924630343f672118dcfa5a69b253fce8 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterRMRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterRMRequestConvertor.java
@@ -34,16 +34,12 @@ public class RegisterRMRequestConvertor implements PbConvertor<RegisterRMRequest
final String extraData = registerRMRequest.getExtraData();
AbstractIdentifyRequestProto abstractIdentifyRequestProto = AbstractIdentifyRequestProto.newBuilder()
- .setAbstractMessage(abstractMessage)
- .setApplicationId(registerRMRequest.getApplicationId())
- .setExtraData(extraData == null ? "" : extraData)
- .setTransactionServiceGroup(registerRMRequest.getTransactionServiceGroup())
- .setVersion(registerRMRequest.getVersion())
- .build();
+ .setAbstractMessage(abstractMessage).setApplicationId(registerRMRequest.getApplicationId()).setExtraData(
+ extraData == null ? "" : extraData).setTransactionServiceGroup(
+ registerRMRequest.getTransactionServiceGroup()).setVersion(registerRMRequest.getVersion()).build();
RegisterRMRequestProto result = RegisterRMRequestProto.newBuilder().setAbstractIdentifyRequest(
- abstractIdentifyRequestProto)
- .setResourceIds(registerRMRequest.getResourceIds() == null ? "" : registerRMRequest.getResourceIds())
- .build();
+ abstractIdentifyRequestProto).setResourceIds(
+ registerRMRequest.getResourceIds() == null ? "" : registerRMRequest.getResourceIds()).build();
return result;
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterRMResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterRMResponseConvertor.java
index d470713e6c62bf311408261e461d91ce770a61bd..9e700996d666d59e30d57e6d471fe097c0bd3280 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterRMResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterRMResponseConvertor.java
@@ -48,20 +48,16 @@ public class RegisterRMResponseConvertor implements PbConvertor<RegisterRMRespon
}
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(registerRMResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(ResultCodeProto.valueOf(registerRMResponse.getResultCode().name()))
+ .setAbstractMessage(abstractMessage).build();
final String extraData = registerRMResponse.getExtraData();
AbstractIdentifyResponseProto abstractIdentifyResponseProto = AbstractIdentifyResponseProto.newBuilder()
- .setAbstractResultMessage(abstractResultMessageProto)
- .setExtraData(extraData==null?"":extraData)
- .setVersion(registerRMResponse.getVersion())
- .setIdentified(registerRMResponse.isIdentified())
- .build();
+ .setAbstractResultMessage(abstractResultMessageProto).setExtraData(extraData == null ? "" : extraData)
+ .setVersion(registerRMResponse.getVersion()).setIdentified(registerRMResponse.isIdentified()).build();
- RegisterRMResponseProto result = RegisterRMResponseProto.newBuilder()
- .setAbstractIdentifyResponse(abstractIdentifyResponseProto).build();
+ RegisterRMResponseProto result = RegisterRMResponseProto.newBuilder().setAbstractIdentifyResponse(
+ abstractIdentifyResponseProto).build();
return result;
}
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterTMRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterTMRequestConvertor.java
index 6fd1507abfb308b9ce2243f5ef9e5251654a167c..fe15582489b2be3d18f0dbf0f80fdcd2b55afab0 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterTMRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterTMRequestConvertor.java
@@ -34,12 +34,9 @@ public class RegisterTMRequestConvertor implements PbConvertor<RegisterTMRequest
final String extraData = registerTMRequest.getExtraData();
AbstractIdentifyRequestProto abstractIdentifyRequestProto = AbstractIdentifyRequestProto.newBuilder()
- .setAbstractMessage(abstractMessage)
- .setApplicationId(registerTMRequest.getApplicationId())
- .setExtraData(extraData==null?"":extraData)
- .setTransactionServiceGroup(registerTMRequest.getTransactionServiceGroup())
- .setVersion(registerTMRequest.getVersion())
- .build();
+ .setAbstractMessage(abstractMessage).setApplicationId(registerTMRequest.getApplicationId()).setExtraData(
+ extraData == null ? "" : extraData).setTransactionServiceGroup(
+ registerTMRequest.getTransactionServiceGroup()).setVersion(registerTMRequest.getVersion()).build();
RegisterTMRequestProto result = RegisterTMRequestProto.newBuilder().setAbstractIdentifyRequest(
abstractIdentifyRequestProto).build();
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterTMResponseConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterTMResponseConvertor.java
index a065c9b9da12425fb9ca4881e3c559793aa780c9..5629e4823e36b2edb63887f205439c12904e9fa7 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterTMResponseConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/RegisterTMResponseConvertor.java
@@ -47,17 +47,13 @@ public class RegisterTMResponseConvertor implements PbConvertor<RegisterTMRespon
}
final AbstractResultMessageProto abstractResultMessageProto = AbstractResultMessageProto.newBuilder().setMsg(
- msg == null ? "" : msg)
- .setResultCode(ResultCodeProto.valueOf(registerTMResponse.getResultCode().name())).setAbstractMessage(
- abstractMessage).build();
+ msg == null ? "" : msg).setResultCode(ResultCodeProto.valueOf(registerTMResponse.getResultCode().name()))
+ .setAbstractMessage(abstractMessage).build();
final String extraData = registerTMResponse.getExtraData();
AbstractIdentifyResponseProto abstractIdentifyResponseProto = AbstractIdentifyResponseProto.newBuilder()
- .setAbstractResultMessage(abstractResultMessageProto)
- .setExtraData(extraData == null ? "" : extraData)
- .setVersion(registerTMResponse.getVersion())
- .setIdentified(registerTMResponse.isIdentified())
- .build();
+ .setAbstractResultMessage(abstractResultMessageProto).setExtraData(extraData == null ? "" : extraData)
+ .setVersion(registerTMResponse.getVersion()).setIdentified(registerTMResponse.isIdentified()).build();
RegisterTMResponseProto result = RegisterTMResponseProto.newBuilder().setAbstractIdentifyResponse(
abstractIdentifyResponseProto).build();
diff --git a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/UndoLogDeleteRequestConvertor.java b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/UndoLogDeleteRequestConvertor.java
index d4ce1106b299b82a5eb79564f7c767cd6d08ea99..aab0addd47284c8ab4a4831d62eb90497e79f5dc 100644
--- a/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/UndoLogDeleteRequestConvertor.java
+++ b/codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/convertor/UndoLogDeleteRequestConvertor.java
@@ -35,16 +35,13 @@ public class UndoLogDeleteRequestConvertor implements PbConvertor<UndoLogDeleteR
MessageTypeProto.forNumber(typeCode)).build();
final AbstractTransactionRequestProto abstractTransactionRequestProto = AbstractTransactionRequestProto
- .newBuilder().setAbstractMessage(
- abstractMessage).build();
-
- final UndoLogDeleteRequestProto undoLogDeleteRequestProto = UndoLogDeleteRequestProto
- .newBuilder()
- .setAbstractTransactionRequest(abstractTransactionRequestProto)
- .setSaveDays(undoLogDeleteRequest.getSaveDays())
- .setBranchType(BranchTypeProto.valueOf(undoLogDeleteRequest.getBranchType().name()))
- .setResourceId(undoLogDeleteRequest.getResourceId())
- .build();
+ .newBuilder().setAbstractMessage(abstractMessage).build();
+
+ final UndoLogDeleteRequestProto undoLogDeleteRequestProto = UndoLogDeleteRequestProto.newBuilder()
+ .setAbstractTransactionRequest(abstractTransactionRequestProto).setSaveDays(
+ undoLogDeleteRequest.getSaveDays()).setBranchType(
+ BranchTypeProto.valueOf(undoLogDeleteRequest.getBranchType().name())).setResourceId(
+ undoLogDeleteRequest.getResourceId()).build();
return undoLogDeleteRequestProto;
}
diff --git a/codec/seata-codec-protobuf/src/main/resources/protobuf/io/seata/protocol/transcation/transactionExceptionCode.proto b/codec/seata-codec-protobuf/src/main/resources/protobuf/io/seata/protocol/transcation/transactionExceptionCode.proto
index ddc9429640eabfb8f6d4fc603aed3a916735fae5..6a460f3b960d4a989aeed255e92951be2142bd65 100644
--- a/codec/seata-codec-protobuf/src/main/resources/protobuf/io/seata/protocol/transcation/transactionExceptionCode.proto
+++ b/codec/seata-codec-protobuf/src/main/resources/protobuf/io/seata/protocol/transcation/transactionExceptionCode.proto
@@ -109,5 +109,9 @@ enum TransactionExceptionCodeProto {
*/
FailedWriteSession = 16;
+ /**
+ * FailedStore
+ */
+ FailedStore = 17;
}
\ No newline at end of file
diff --git a/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/MessageCodecFactory.java b/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/MessageCodecFactory.java
index 318f2c8780e8377e8b369c959b4bf1053e7128ba..bd5beaa1b66b53e0b2b2e1922f61f583bd03ff0a 100644
--- a/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/MessageCodecFactory.java
+++ b/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/MessageCodecFactory.java
@@ -15,7 +15,6 @@
*/
package io.seata.codec.seata;
-import java.nio.ByteBuffer;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;
@@ -46,9 +45,7 @@ import io.seata.codec.seata.protocol.transaction.GlobalRollbackResponseCodec;
import io.seata.codec.seata.protocol.transaction.GlobalStatusRequestCodec;
import io.seata.codec.seata.protocol.transaction.GlobalStatusResponseCodec;
import io.seata.codec.seata.protocol.transaction.UndoLogDeleteRequestCodec;
-import io.seata.core.protocol.AbstractIdentifyRequest;
import io.seata.core.protocol.AbstractMessage;
-import io.seata.core.protocol.AbstractResultMessage;
import io.seata.core.protocol.MergeResultMessage;
import io.seata.core.protocol.MergedWarpMessage;
import io.seata.core.protocol.MessageType;
@@ -56,8 +53,6 @@ import io.seata.core.protocol.RegisterRMRequest;
import io.seata.core.protocol.RegisterRMResponse;
import io.seata.core.protocol.RegisterTMRequest;
import io.seata.core.protocol.RegisterTMResponse;
-import io.seata.core.protocol.transaction.AbstractBranchEndRequest;
-import io.seata.core.protocol.transaction.AbstractGlobalEndRequest;
import io.seata.core.protocol.transaction.BranchCommitRequest;
import io.seata.core.protocol.transaction.BranchCommitResponse;
import io.seata.core.protocol.transaction.BranchRegisterRequest;
@@ -148,7 +143,8 @@ public class MessageCodecFactory {
try {
msgCodec = getMergeRequestMessageSeataCodec(typeCode);
- } catch (Exception exx) {}
+ } catch (Exception exx) {
+ }
if (null != msgCodec) {
return msgCodec;
@@ -275,7 +271,8 @@ public class MessageCodecFactory {
try {
abstractMessage = getMergeRequestInstanceByCode(typeCode);
- } catch (Exception exx) {}
+ } catch (Exception exx) {
+ }
if (null != abstractMessage) {
return abstractMessage;
@@ -346,72 +343,4 @@ public class MessageCodecFactory {
}
}
- /**
- * Get byte buffer byte buffer.
- *
- * @param abstractMessage the abstract message
- * @return the byte buffer
- */
- public static ByteBuffer getByteBuffer(AbstractMessage abstractMessage) {
- int bufferSize = 1024;
- if (abstractMessage instanceof MergedWarpMessage) {
- bufferSize = ((MergedWarpMessage)abstractMessage).msgs.size() * 1024 + 4;
- } else if (abstractMessage instanceof MergeResultMessage) {
- bufferSize = ((MergeResultMessage)abstractMessage).msgs.length * 1024 + 4;
- } else if (abstractMessage instanceof AbstractIdentifyRequest) {
- bufferSize = 10 * 1024;
- } else if (abstractMessage instanceof AbstractResultMessage) {
- bufferSize = 512;
- } else if (abstractMessage instanceof AbstractBranchEndRequest) {
- AbstractBranchEndRequest abstractBranchEndRequest = (AbstractBranchEndRequest)abstractMessage;
- byte[] applicationDataBytes = null;
- if (abstractBranchEndRequest.getApplicationData() != null) {
- applicationDataBytes = abstractBranchEndRequest.getApplicationData().getBytes(UTF8);
- if (applicationDataBytes.length > 512) {
- bufferSize = applicationDataBytes.length + 1024;
- } else {
- bufferSize = 1024;
- }
- } else {
- bufferSize = 1024;
- }
- } else if (abstractMessage instanceof GlobalBeginRequest) {
- bufferSize = 256;
- } else if (abstractMessage instanceof AbstractGlobalEndRequest) {
- bufferSize = 256;
- } else if (abstractMessage instanceof BranchRegisterRequest) {
- BranchRegisterRequest branchRegisterRequest = (BranchRegisterRequest)abstractMessage;
- int byteLenth = 0;
- byte[] lockKeyBytes = null;
- if (branchRegisterRequest.getLockKey() != null) {
- lockKeyBytes = branchRegisterRequest.getLockKey().getBytes(UTF8);
- if (lockKeyBytes.length > 512) {
- byteLenth += lockKeyBytes.length;
- }
- }
- byte[] applicationDataBytes = null;
- if (branchRegisterRequest.getApplicationData() != null) {
- applicationDataBytes = branchRegisterRequest.getApplicationData().getBytes(UTF8);
- if (applicationDataBytes.length > 512) {
- byteLenth += applicationDataBytes.length;
- }
- }
- bufferSize = byteLenth + 1024;
- } else if (abstractMessage instanceof BranchReportRequest) {
- BranchReportRequest branchReportRequest = (BranchReportRequest)abstractMessage;
- int byteLenth = 0;
- byte[] applicationDataBytes = null;
- if (branchReportRequest.getApplicationData() != null) {
- applicationDataBytes = branchReportRequest.getApplicationData().getBytes(UTF8);
- if (applicationDataBytes.length > 512) {
- byteLenth += (applicationDataBytes.length);
- }
- }
- bufferSize = byteLenth + 1024;
- } else {
- bufferSize = 512;
- }
- return ByteBuffer.allocate(bufferSize);
- }
-
}
diff --git a/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/SeataCodec.java b/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/SeataCodec.java
index 1f4c088eb424d454bec49b32cc801454b7fb4d24..bd79172f0af59f783f4204eac1ebc4e01c41c6b8 100644
--- a/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/SeataCodec.java
+++ b/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/SeataCodec.java
@@ -27,7 +27,6 @@ import io.seata.core.protocol.AbstractMessage;
* The Seata codec.
*
* @author zhangsen
- * @data 2019 /5/6
*/
@LoadLevel(name = "SEATA")
public class SeataCodec implements Codec {
diff --git a/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryResponseCodec.java b/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryResponseCodec.java
index 81576bd2db9c9749f5a5531fa3f0649b2ff836d7..6029a45cd5dde323f2cef4822d075716344cf2c4 100644
--- a/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryResponseCodec.java
+++ b/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryResponseCodec.java
@@ -46,6 +46,6 @@ public class GlobalLockQueryResponseCodec extends AbstractTransactionResponseCod
super.decode(t, in);
GlobalLockQueryResponse globalLockQueryResponse = (GlobalLockQueryResponse)t;
- globalLockQueryResponse.setLockable((in.getShort() == 1));
+ globalLockQueryResponse.setLockable(in.getShort() == 1);
}
}
diff --git a/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/protocol/transaction/GlobalReportRequestCodec.java b/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/protocol/transaction/GlobalReportRequestCodec.java
index c7cc11a1d068957f601ceb637ae674eebc59ea5f..d7e35f1c3cb1ad0c013d3454ad6cdbeb3fca8f8f 100644
--- a/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/protocol/transaction/GlobalReportRequestCodec.java
+++ b/codec/seata-codec-seata/src/main/java/io/seata/codec/seata/protocol/transaction/GlobalReportRequestCodec.java
@@ -39,11 +39,10 @@ public class GlobalReportRequestCodec extends AbstractGlobalEndRequestCodec {
GlobalReportRequest reportRequest = (GlobalReportRequest)t;
GlobalStatus globalStatus = reportRequest.getGlobalStatus();
- if(globalStatus != null){
+ if (globalStatus != null) {
out.writeByte((byte)globalStatus.getCode());
- }
- else{
- out.writeByte((byte) -1);
+ } else {
+ out.writeByte((byte)-1);
}
}
@@ -53,7 +52,7 @@ public class GlobalReportRequestCodec extends AbstractGlobalEndRequestCodec {
GlobalReportRequest reportRequest = (GlobalReportRequest)t;
byte b = in.get();
- if(b > -1){
+ if (b > -1) {
reportRequest.setGlobalStatus(GlobalStatus.get(b));
}
}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/MergeResultMessageCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/MergeResultMessageCodecTest.java
index 5b76b5b4291316466e28eab3c8c36fed5b01d635..8c5db4a954b9718d40e17b4765e340fd9ed66c5b 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/MergeResultMessageCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/MergeResultMessageCodecTest.java
@@ -29,7 +29,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Merge result message codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class MergeResultMessageCodecTest {
@@ -82,4 +81,4 @@ public class MergeResultMessageCodecTest {
globalBeginResponse.setTransactionExceptionCode(TransactionExceptionCode.BranchTransactionNotExist);
return globalBeginResponse;
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/MergedWarpMessageCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/MergedWarpMessageCodecTest.java
index 5c240663c1a0358dc094c7c754e77df93b0f50a8..36fe7b49b4bda16e4fc5b49714c4295e243e2f77 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/MergedWarpMessageCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/MergedWarpMessageCodecTest.java
@@ -30,7 +30,6 @@ import java.util.ArrayList;
* The type Merged warp message codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class MergedWarpMessageCodecTest {
@@ -74,4 +73,4 @@ public class MergedWarpMessageCodecTest {
globalBeginRequest.setTimeout(3000);
return globalBeginRequest;
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterRMRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterRMRequestCodecTest.java
index ca19b2edd57bf16de434ccc8d45791219e7d9241..d52ed9a815cea3aff9c66bb48887ac563652464d 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterRMRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterRMRequestCodecTest.java
@@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Register rm request codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class RegisterRMRequestCodecTest {
@@ -57,4 +56,4 @@ public class RegisterRMRequestCodecTest {
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterRMResponseCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterRMResponseCodecTest.java
index 484564b5bb8819153d6ed0f4dfe8ed52e64eea3d..909a5cb1d6a95cb856375edd740db408b1ce2987 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterRMResponseCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterRMResponseCodecTest.java
@@ -27,7 +27,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Register rm response codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class RegisterRMResponseCodecTest {
@@ -59,4 +58,4 @@ public class RegisterRMResponseCodecTest {
// Assert.assertEquals(registerRMRespons2.getMsg(), registerRMResponse.getMsg());
// Assert.assertEquals(registerRMRespons2.getByCode(), registerRMResponse.getByCode());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterTMRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterTMRequestCodecTest.java
index 60004798ca16e5124e258859cda80db5c86e6e7a..0a499a93189b5e046e055c7671000101e1a1386f 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterTMRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterTMRequestCodecTest.java
@@ -31,7 +31,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Register tm request codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class RegisterTMRequestCodecTest {
@@ -247,4 +246,4 @@ public class RegisterTMRequestCodecTest {
Assertions.assertTrue(e.getMessage().contains("not support "), "error data");
}
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterTMResponseCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterTMResponseCodecTest.java
index 3adafabb919d271864832f8a1c6910f9d2a07de3..40fe983e15824a746365e04ed5fc3f0be47430c3 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterTMResponseCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/RegisterTMResponseCodecTest.java
@@ -26,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Register tm response codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class RegisterTMResponseCodecTest {
@@ -58,4 +57,4 @@ public class RegisterTMResponseCodecTest {
// Assert.assertEquals(registerTMResponse2.getMsg(), registerTMResponse.getMsg());
// Assert.assertEquals(registerTMResponse2.getByCode(), registerTMResponse.getByCode());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchCommitRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchCommitRequestCodecTest.java
index fb2aedb7d05ee19ad03537978c7dfa2c9d8fa41f..8deec814a8617bdede82062b4595aee53f066c0f 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchCommitRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchCommitRequestCodecTest.java
@@ -26,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Branch commit request codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class BranchCommitRequestCodecTest {
@@ -58,4 +57,4 @@ public class BranchCommitRequestCodecTest {
assertThat(branchCommitReques2.getXid()).isEqualTo(branchCommitRequest.getXid());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchCommitResponseCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchCommitResponseCodecTest.java
index 0c3007a43780dcb9df712ae110921b801178029d..1479f7ae4054f52651084325b9309f501bae9c03 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchCommitResponseCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchCommitResponseCodecTest.java
@@ -28,7 +28,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Branch commit response codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class BranchCommitResponseCodecTest {
@@ -61,4 +60,4 @@ public class BranchCommitResponseCodecTest {
assertThat(branchCommitResponse2.getResultCode()).isEqualTo(branchCommitResponse.getResultCode());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRegisterRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRegisterRequestCodecTest.java
index a8a9800bcc82f01c7df32ecb8e1b4b66409c50f8..8d655dcba38892c1391ed1fd9aceb741612187df 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRegisterRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRegisterRequestCodecTest.java
@@ -26,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Branch register request codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class BranchRegisterRequestCodecTest {
@@ -59,4 +58,4 @@ public class BranchRegisterRequestCodecTest {
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRegisterResponseCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRegisterResponseCodecTest.java
index b66b47fbf6da4b02208e7a413cec7575c4703702..3f568b652fe558d2cde54a7a3700c16c9694a07e 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRegisterResponseCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRegisterResponseCodecTest.java
@@ -27,7 +27,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Branch register response codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class BranchRegisterResponseCodecTest {
@@ -57,4 +56,4 @@ public class BranchRegisterResponseCodecTest {
assertThat(branchRegisterResponse2.getTransactionExceptionCode()).isEqualTo(branchRegisterResponse.getTransactionExceptionCode());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchReportRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchReportRequestCodecTest.java
index 301252f399e70602c5301bafe101646c6547f7de..394e8b44514188452ea4537560ac339ce622c3f3 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchReportRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchReportRequestCodecTest.java
@@ -27,7 +27,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Branch report request codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class BranchReportRequestCodecTest {
@@ -60,4 +59,4 @@ public class BranchReportRequestCodecTest {
assertThat(branchReportRequest2.getXid()).isEqualTo(branchReportRequest.getXid());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchReportResponseCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchReportResponseCodecTest.java
index 61308ba13f238db77c80083f00b29010693350f5..f9fcd672c1ec8c8c241538e0b368670931e4648d 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchReportResponseCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchReportResponseCodecTest.java
@@ -27,7 +27,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Branch report response codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class BranchReportResponseCodecTest {
@@ -55,4 +54,4 @@ public class BranchReportResponseCodecTest {
assertThat(branchReportResponse2.getTransactionExceptionCode()).isEqualTo(branchReportResponse.getTransactionExceptionCode());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRollbackRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRollbackRequestCodecTest.java
index 2077d2031be8068bd8a2e213b629587820dabc68..af91822526a4dc8c4c2d6d2a3d0b035b5c338e42 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRollbackRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRollbackRequestCodecTest.java
@@ -26,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Branch rollback request codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class BranchRollbackRequestCodecTest {
@@ -59,4 +58,4 @@ public class BranchRollbackRequestCodecTest {
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRollbackResponseCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRollbackResponseCodecTest.java
index ada6592591837d85bf211fca4868bb127cd5331c..4b3fe42be53d00c766240a475983f33a423f7c3e 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRollbackResponseCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/BranchRollbackResponseCodecTest.java
@@ -28,7 +28,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Branch rollback response codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class BranchRollbackResponseCodecTest {
@@ -62,4 +61,4 @@ public class BranchRollbackResponseCodecTest {
assertThat(branchRollbackResponse2.getTransactionExceptionCode()).isEqualTo(branchRollbackResponse.getTransactionExceptionCode());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalBeginRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalBeginRequestCodecTest.java
index 62fbdc19d542994c0c1be48555834971e7345fe4..e21207ad29cf7f718d46e31cee0598e647525fd1 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalBeginRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalBeginRequestCodecTest.java
@@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Global begin request codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class GlobalBeginRequestCodecTest {
@@ -50,4 +49,4 @@ public class GlobalBeginRequestCodecTest {
assertThat(globalBeginRequest2.getTimeout()).isEqualTo(globalBeginRequest.getTimeout());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalBeginResponseCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalBeginResponseCodecTest.java
index 23bae1e61eb1999dea04fed2bdaddc3659217975..b871c34e89765262e771d3898e1364a2210cb84a 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalBeginResponseCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalBeginResponseCodecTest.java
@@ -26,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Global begin response codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class GlobalBeginResponseCodecTest {
@@ -58,4 +57,4 @@ public class GlobalBeginResponseCodecTest {
assertThat(globalBeginResponse2.getMsg()).isEqualTo(globalBeginResponse.getMsg());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalCommitRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalCommitRequestCodecTest.java
index 8f65cd787d071972cfb22288081fb06f6c8819a7..ae962a810e7e41b165d8c0b26950ff810a84133d 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalCommitRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalCommitRequestCodecTest.java
@@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Global commit request codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class GlobalCommitRequestCodecTest {
@@ -53,4 +52,4 @@ public class GlobalCommitRequestCodecTest {
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalCommitResponseCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalCommitResponseCodecTest.java
index 8b6ba625c6a3058a17647bc5b6d4da8d1e7f06e5..5fe2f2aa31c2a8bf22aecd8e6da82b0498eaf45d 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalCommitResponseCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalCommitResponseCodecTest.java
@@ -27,7 +27,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Global commit response codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class GlobalCommitResponseCodecTest {
@@ -58,4 +57,4 @@ public class GlobalCommitResponseCodecTest {
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryRequestCodecTest.java
index e7c8e16f9d0a641834d2c3d66de14f458b6f7e36..100bddc0cfa9eb241bcfc8b5d0cd7ecfe5e7ee7e 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryRequestCodecTest.java
@@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Global lock query request codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class GlobalLockQueryRequestCodecTest {
@@ -57,4 +56,4 @@ public class GlobalLockQueryRequestCodecTest {
assertThat(globalLockQueryRequest2.getXid()).isEqualTo(globalLockQueryRequest.getXid());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryResponseCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryResponseCodecTest.java
index 3199f5d24cbd7a04f1592168ad4f06cae5cfc2c2..137a526b83166b9d10e12440cda383cba24c3ec8 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryResponseCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalLockQueryResponseCodecTest.java
@@ -27,7 +27,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Global lock query response codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class GlobalLockQueryResponseCodecTest {
@@ -57,4 +56,4 @@ public class GlobalLockQueryResponseCodecTest {
assertThat(globalLockQueryResponse2.getMsg()).isEqualTo(globalLockQueryResponse.getMsg());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalRollbackRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalRollbackRequestCodecTest.java
index 29fd14650da1c3fde971258b622844bf806b62c8..3f2aac3edf9caaef0a595f292c27a595a59ef2e8 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalRollbackRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalRollbackRequestCodecTest.java
@@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Global rollback request codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class GlobalRollbackRequestCodecTest {
@@ -50,4 +49,4 @@ public class GlobalRollbackRequestCodecTest {
assertThat(globalRollbackRequest2.getExtraData()).isEqualTo(globalRollbackRequest.getExtraData());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalRollbackResponseCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalRollbackResponseCodecTest.java
index dcbe4006aaa08d2d8ffbd1c050ad9ee44748ed05..969078118e0369e9bbc2dcf1186d204da6bb1d10 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalRollbackResponseCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalRollbackResponseCodecTest.java
@@ -28,7 +28,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Global rollback response codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class GlobalRollbackResponseCodecTest {
@@ -57,4 +56,4 @@ public class GlobalRollbackResponseCodecTest {
assertThat(globalRollbackResponse2.getTransactionExceptionCode()).isEqualTo(globalRollbackResponse.getTransactionExceptionCode());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalStatusRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalStatusRequestCodecTest.java
index bafd72f260458132488e39f7a5df0babd887b3d5..f82042b11357af75d76bb9102ee7c45635ad5d83 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalStatusRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalStatusRequestCodecTest.java
@@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Global status request codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class GlobalStatusRequestCodecTest {
@@ -49,4 +48,4 @@ public class GlobalStatusRequestCodecTest {
assertThat(globalStatusRequest2.getExtraData()).isEqualTo(globalStatusRequest.getExtraData());
assertThat(globalStatusRequest2.getXid()).isEqualTo(globalStatusRequest.getXid());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalStatusResponseCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalStatusResponseCodecTest.java
index 37c8ed0c587ff1e7d128841df2bb947f1fba39e2..70d3b380ff45a2649b068fd412c15a3517b417ba 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalStatusResponseCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/GlobalStatusResponseCodecTest.java
@@ -28,7 +28,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Global status response codec test.
*
* @author zhangsen
- * @data 2019 /5/8
*/
public class GlobalStatusResponseCodecTest {
/**
@@ -55,4 +54,4 @@ public class GlobalStatusResponseCodecTest {
assertThat(globalStatusResponse2.getTransactionExceptionCode()).isEqualTo(globalStatusResponse.getTransactionExceptionCode());
assertThat(globalStatusResponse2.getResultCode()).isEqualTo(globalStatusResponse.getResultCode());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/UndoLogDeleteRequestCodecTest.java b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/UndoLogDeleteRequestCodecTest.java
index 261bf88e8222819b570359eed3578876a4fa87fb..84eeccc8f635f07fafd0c520c1241daefaf8b57c 100644
--- a/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/UndoLogDeleteRequestCodecTest.java
+++ b/codec/seata-codec-seata/src/test/java/io/seata/codec/seata/protocol/transaction/UndoLogDeleteRequestCodecTest.java
@@ -26,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Undo Log Delete request codec test.
*
* @author guoyao
- * @data 2019 0704
*/
public class UndoLogDeleteRequestCodecTest {
@@ -54,4 +53,4 @@ public class UndoLogDeleteRequestCodecTest {
assertThat(logDeleteRequest2.getSaveDays()).isEqualTo(logDeleteRequest1.getSaveDays());
}
-}
\ No newline at end of file
+}
diff --git a/codec/seata-codec-seata/src/test/resources/file.conf b/codec/seata-codec-seata/src/test/resources/file.conf
index 2a62dd98f98d176cddd2e6e8ebb3111e0a00ed27..65fe8554e354f86c63f57fc6cabaa9aeba731ee4 100644
--- a/codec/seata-codec-seata/src/test/resources/file.conf
+++ b/codec/seata-codec-seata/src/test/resources/file.conf
@@ -1,66 +1,8 @@
-transport {
- # tcp udt unix-domain-socket
- type = "TCP"
- #NIO NATIVE
- server = "NIO"
- #enable heartbeat
- heartbeat = true
- #thread factory for netty
- thread-factory {
- boss-thread-prefix = "NettyBoss"
- worker-thread-prefix = "NettyServerNIOWorker"
- server-executor-thread-prefix = "NettyServerBizHandler"
- share-boss-worker = false
- client-selector-thread-prefix = "NettyClientSelector"
- client-selector-thread-size = 1
- client-worker-thread-prefix = "NettyClientWorkerThread"
- # netty boss thread size,will not be used for UDT
- boss-thread-size = 1
- #auto default pin or 8
- worker-thread-size = 8
- }
- shutdown {
- # when destroy server, wait seconds
- wait = 3
- }
- serialization = "seata"
- compressor = "none"
-}
service {
- #vgroup->rgroup
+ #transaction service group mapping
vgroup_mapping.my_test_tx_group = "default"
- #only support single node
+ #only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8091"
- #degrade current not support
- enableDegrade = false
- #disable
- disable = false
-}
-
-client {
- async.commit.buffer.limit = 10000
- lock {
- retry.internal = 10
- retry.times = 30
- }
- report.retry.count = 5
- tm.commit.retry.count = 1
- tm.rollback.retry.count = 1
-}
-
-transaction {
- undo.data.validation = true
- undo.log.serialization = "jackson"
- undo.log.save.days = 7
- #schedule delete expired undo_log in milliseconds
- undo.log.delete.period = 86400000
- undo.log.table = "undo_log"
-}
-
-support {
- ## spring
- spring {
- # auto proxy the DataSource bean
- datasource.autoproxy = false
- }
+ #disable seata
+ disableGlobalTransaction = false
}
\ No newline at end of file
diff --git a/codec/seata-codec-seata/src/test/resources/registry.conf b/codec/seata-codec-seata/src/test/resources/registry.conf
index e14f0d88e9d7c1f79b552beae60aea9b310fd4ec..7070aa6133abb63565e0a2cf772bec51bee9dc91 100644
--- a/codec/seata-codec-seata/src/test/resources/registry.conf
+++ b/codec/seata-codec-seata/src/test/resources/registry.conf
@@ -8,7 +8,7 @@ registry {
cluster = "default"
}
eureka {
- serviceUrl = "http://localhost:1001/eureka"
+ serviceUrl = "http://localhost:8761/eureka"
application = "default"
weight = "1"
}
diff --git a/codecov.yml b/codecov.yml
index a89d7705466000b5463925e2f9dcf44788db3e85..b98aa43721c93cffad59b4852704f9ba41a12f3c 100644
--- a/codecov.yml
+++ b/codecov.yml
@@ -1,12 +1,23 @@
+codecov:
+ require_ci_to_pass: yes
coverage:
status:
- patch:
+ patch: no
+ project:
default:
threshold: 1%
+ if_not_found: success
+ changes: no
+ precision: 2
+ range: "50...100"
ignore:
- - "codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/generated"
- - "test/.*"
- - ".github/.*"
- - ".mvn/.*"
- - ".style/.*"
- - "*.md"
\ No newline at end of file
+ - "codec/seata-codec-protobuf/src/main/java/io/seata/codec/protobuf/generated"
+ - "test/.*"
+ - ".github/.*"
+ - ".mvn/.*"
+ - ".style/.*"
+ - "*.md"
+comment:
+ layout: "reach,diff,flags,tree"
+ behavior: default
+ require_changes: no
\ No newline at end of file
diff --git a/common/src/main/java/io/seata/common/Constants.java b/common/src/main/java/io/seata/common/Constants.java
index e39d856f5b9584fa0bb18826a4248dde8fac7acd..91c0b4bcbb1c614eeddf73d1cf7547ce0c3e216f 100644
--- a/common/src/main/java/io/seata/common/Constants.java
+++ b/common/src/main/java/io/seata/common/Constants.java
@@ -20,8 +20,7 @@ import java.nio.charset.Charset;
/**
* The type Constants.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/9 17:14
+ * @author slievrly
*/
public class Constants {
/**
diff --git a/common/src/main/java/io/seata/common/XID.java b/common/src/main/java/io/seata/common/XID.java
index 7cb6ac8dd0cadf99920c53d7312dd663bf58e8cd..511de1468710a878237f79098810441eeafc014f 100644
--- a/common/src/main/java/io/seata/common/XID.java
+++ b/common/src/main/java/io/seata/common/XID.java
@@ -18,8 +18,7 @@ package io.seata.common;
/**
* The type Xid.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/10
+ * @author slievrly
*/
public class XID {
diff --git a/common/src/main/java/io/seata/common/exception/EurekaRegistryException.java b/common/src/main/java/io/seata/common/exception/EurekaRegistryException.java
index 12c037708d51ad3ac7741bc6e23522b1d7203e9b..dd65ff7f7f804cc404565d45a54b2335fdf1da4f 100644
--- a/common/src/main/java/io/seata/common/exception/EurekaRegistryException.java
+++ b/common/src/main/java/io/seata/common/exception/EurekaRegistryException.java
@@ -19,7 +19,6 @@ package io.seata.common.exception;
* eureka registry exception
*
* @author: rui_849217@163.com
- * @date: 2018/2/18
*/
public class EurekaRegistryException extends RuntimeException {
/**
diff --git a/common/src/main/java/io/seata/common/exception/FrameworkErrorCode.java b/common/src/main/java/io/seata/common/exception/FrameworkErrorCode.java
index 3d8df30e8867fb4c20b040ecc933bd7cac7d62fe..8d3ee7bd5b76fff5cbaba19641735fc4376becc3 100644
--- a/common/src/main/java/io/seata/common/exception/FrameworkErrorCode.java
+++ b/common/src/main/java/io/seata/common/exception/FrameworkErrorCode.java
@@ -18,8 +18,7 @@ package io.seata.common.exception;
/**
* The enum Framework error code.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/9
+ * @author slievrly
*/
public enum FrameworkErrorCode {
/**
@@ -100,7 +99,7 @@ public enum FrameworkErrorCode {
*/
RegisterRM("0304", "Register RM failed", "Register RM failed"),
- /** 0400~0499 Saga相关错误 **/
+ /** 0400~0499 Saga related error **/
/**
* Process type not found
diff --git a/common/src/main/java/io/seata/common/exception/FrameworkException.java b/common/src/main/java/io/seata/common/exception/FrameworkException.java
index cd867fd88aa4ed2f2fcd9135939e1da9f32ae543..0866614cb78e5d24d649c8d797f566bbb70fe221 100644
--- a/common/src/main/java/io/seata/common/exception/FrameworkException.java
+++ b/common/src/main/java/io/seata/common/exception/FrameworkException.java
@@ -23,8 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* The type Framework exception.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/9
+ * @author slievrly
*/
public class FrameworkException extends RuntimeException {
private static final Logger LOGGER = LoggerFactory.getLogger(FrameworkException.class);
diff --git a/common/src/main/java/io/seata/common/exception/NotSupportYetException.java b/common/src/main/java/io/seata/common/exception/NotSupportYetException.java
index b32faa44c55645c38b8c25b48f8597f584104897..d3f56118d55735ca323c48601dae09428fc1ad23 100644
--- a/common/src/main/java/io/seata/common/exception/NotSupportYetException.java
+++ b/common/src/main/java/io/seata/common/exception/NotSupportYetException.java
@@ -18,7 +18,7 @@ package io.seata.common.exception;
/**
* The type Not support yet exception.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class NotSupportYetException extends RuntimeException {
diff --git a/common/src/main/java/io/seata/common/exception/ShouldNeverHappenException.java b/common/src/main/java/io/seata/common/exception/ShouldNeverHappenException.java
index baefd3f5f23c5ff61d652189b4cd8f3e155912af..f624f38b2d1af58755e112e69789382402cd0193 100644
--- a/common/src/main/java/io/seata/common/exception/ShouldNeverHappenException.java
+++ b/common/src/main/java/io/seata/common/exception/ShouldNeverHappenException.java
@@ -18,7 +18,7 @@ package io.seata.common.exception;
/**
* The type Should never happen exception.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class ShouldNeverHappenException extends RuntimeException {
diff --git a/common/src/main/java/io/seata/common/exception/StoreException.java b/common/src/main/java/io/seata/common/exception/StoreException.java
index 70622471ad5b757aa62ff2c3c0b9a7e43832f49c..efcd8a048c5d5749b9de04183cb906f883fb9b86 100644
--- a/common/src/main/java/io/seata/common/exception/StoreException.java
+++ b/common/src/main/java/io/seata/common/exception/StoreException.java
@@ -19,7 +19,6 @@ package io.seata.common.exception;
* the store exception
*
* @author zhangsen
- * @data 2019 /4/2
*/
public class StoreException extends FrameworkException {
diff --git a/common/src/main/java/io/seata/common/loader/EnhancedServiceLoader.java b/common/src/main/java/io/seata/common/loader/EnhancedServiceLoader.java
index 7940fd790bd675fa5d43822311e276296f2dd84b..ba70977a0c75861e5648465c0b99b6e59e10535e 100644
--- a/common/src/main/java/io/seata/common/loader/EnhancedServiceLoader.java
+++ b/common/src/main/java/io/seata/common/loader/EnhancedServiceLoader.java
@@ -32,6 +32,7 @@ import java.util.concurrent.ConcurrentHashMap;
import io.seata.common.Constants;
import io.seata.common.executor.Initialize;
import io.seata.common.util.CollectionUtils;
+import io.seata.common.util.IOUtil;
import org.apache.commons.lang.ObjectUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.exception.ExceptionUtils;
@@ -41,8 +42,7 @@ import org.slf4j.LoggerFactory;
/**
* The type Enhanced service loader.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/10
+ * @author slievrly
*/
public class EnhancedServiceLoader {
private static final Logger LOGGER = LoggerFactory.getLogger(EnhancedServiceLoader.class);
@@ -322,12 +322,7 @@ public class EnhancedServiceLoader {
} catch (Throwable e) {
LOGGER.warn(e.getMessage());
} finally {
- try {
- if (reader != null) {
- reader.close();
- }
- } catch (IOException ioe) {
- }
+ IOUtil.close(reader);
}
}
}
@@ -353,7 +348,6 @@ public class EnhancedServiceLoader {
if (argTypes != null && args != null) {
// Constructor with arguments
Constructor<S> constructor = implClazz.getDeclaredConstructor(argTypes);
- constructor.setAccessible(true);
s = service.cast(constructor.newInstance(args));
} else {
// default Constructor
diff --git a/common/src/main/java/io/seata/common/loader/EnhancedServiceNotFoundException.java b/common/src/main/java/io/seata/common/loader/EnhancedServiceNotFoundException.java
index 9fbf355919add7cd38b38b96dd3a18951401f8f5..379a1dedb4a5b8a1ca8fa991f25b76241bd25ea4 100644
--- a/common/src/main/java/io/seata/common/loader/EnhancedServiceNotFoundException.java
+++ b/common/src/main/java/io/seata/common/loader/EnhancedServiceNotFoundException.java
@@ -20,8 +20,7 @@ import org.apache.commons.lang.exception.NestableRuntimeException;
/**
* The type Enhanced service not found exception.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/10
+ * @author slievrly
*/
public class EnhancedServiceNotFoundException extends NestableRuntimeException {
private static final long serialVersionUID = 7748438218914409019L;
diff --git a/common/src/main/java/io/seata/common/loader/LoadLevel.java b/common/src/main/java/io/seata/common/loader/LoadLevel.java
index b887ed509b0736b68735babcc4fc74ed4c0e63ed..e47c4a10f172d42cba17502af8d0d64e56156fef 100644
--- a/common/src/main/java/io/seata/common/loader/LoadLevel.java
+++ b/common/src/main/java/io/seata/common/loader/LoadLevel.java
@@ -24,8 +24,7 @@ import java.lang.annotation.Target;
/**
* The interface Load level.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/10
+ * @author slievrly
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
diff --git a/common/src/main/java/io/seata/common/thread/NamedThreadFactory.java b/common/src/main/java/io/seata/common/thread/NamedThreadFactory.java
index fad15dfe1c84ea0175a1614e28e9cc104d7a95ca..74420404105c8421aa766e4ebdb13d48cc160238 100644
--- a/common/src/main/java/io/seata/common/thread/NamedThreadFactory.java
+++ b/common/src/main/java/io/seata/common/thread/NamedThreadFactory.java
@@ -15,6 +15,8 @@
*/
package io.seata.common.thread;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger;
@@ -23,11 +25,11 @@ import io.netty.util.concurrent.FastThreadLocalThread;
/**
* The type Named thread factory.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/12
+ * @author slievrly
+ * @author ggndnn
*/
public class NamedThreadFactory implements ThreadFactory {
- private final AtomicInteger counter = new AtomicInteger(0);
+ private final static Map<String, AtomicInteger> PREFIX_COUNTER = new ConcurrentHashMap<>();
private final String prefix;
private final int totalSize;
private final boolean makeDaemons;
@@ -40,7 +42,9 @@ public class NamedThreadFactory implements ThreadFactory {
* @param makeDaemons the make daemons
*/
public NamedThreadFactory(String prefix, int totalSize, boolean makeDaemons) {
- this.prefix = prefix;
+ PREFIX_COUNTER.putIfAbsent(prefix, new AtomicInteger(0));
+ int prefixCounter = PREFIX_COUNTER.get(prefix).incrementAndGet();
+ this.prefix = prefix + "_" + prefixCounter;
this.makeDaemons = makeDaemons;
this.totalSize = totalSize;
}
@@ -67,7 +71,7 @@ public class NamedThreadFactory implements ThreadFactory {
@Override
public Thread newThread(Runnable r) {
- String name = prefix + "_" + counter.incrementAndGet();
+ String name = prefix;
if (totalSize > 1) {
name += "_" + totalSize;
}
diff --git a/common/src/main/java/io/seata/common/thread/PositiveAtomicCounter.java b/common/src/main/java/io/seata/common/thread/PositiveAtomicCounter.java
index b4c49c2290a4729734cc97b8bf8ac67bda358086..2db4ed9d1683fa64d719c31e126a3d1bb8f2438f 100644
--- a/common/src/main/java/io/seata/common/thread/PositiveAtomicCounter.java
+++ b/common/src/main/java/io/seata/common/thread/PositiveAtomicCounter.java
@@ -18,12 +18,12 @@ package io.seata.common.thread;
import java.util.concurrent.atomic.AtomicInteger;
/**
- * 计数器，从0开始，保证正数。
+ * positive atomic counter, begin with 0, ensure the number is positive.
*
* @author Geng Zhang
*/
public class PositiveAtomicCounter {
- private static final int MASK = 0x7FFFFFFF;
+ private static final int MASK = 0x7FFFFFFF;
private final AtomicInteger atom;
public PositiveAtomicCounter() {
diff --git a/common/src/main/java/io/seata/common/util/BlobUtils.java b/common/src/main/java/io/seata/common/util/BlobUtils.java
index 60ddc7eaabc774d6be132cca358500edce9893e1..1c598d2ca5df475b2d2fe64717d027e59f60e6cb 100644
--- a/common/src/main/java/io/seata/common/util/BlobUtils.java
+++ b/common/src/main/java/io/seata/common/util/BlobUtils.java
@@ -25,7 +25,7 @@ import io.seata.common.exception.ShouldNeverHappenException;
/**
* The type Blob utils.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
* @author Geng Zhang
*/
public class BlobUtils {
diff --git a/common/src/main/java/io/seata/common/util/CollectionUtils.java b/common/src/main/java/io/seata/common/util/CollectionUtils.java
index df7259c9a45e676539dde4b6ad4c6958c3b6405b..e13a0f0d7ebf49f406c191bdbfbfee849a4552ce 100644
--- a/common/src/main/java/io/seata/common/util/CollectionUtils.java
+++ b/common/src/main/java/io/seata/common/util/CollectionUtils.java
@@ -17,7 +17,6 @@ package io.seata.common.util;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
diff --git a/common/src/main/java/io/seata/common/util/CompressUtil.java b/common/src/main/java/io/seata/common/util/CompressUtil.java
index 5236b1846e79c7e695d9b33f4ee9dd34f19a6901..b42c7adee7837f8f6153c7400959e70eb43f8b97 100644
--- a/common/src/main/java/io/seata/common/util/CompressUtil.java
+++ b/common/src/main/java/io/seata/common/util/CompressUtil.java
@@ -42,8 +42,7 @@ public class CompressUtil {
gos.finish();
result = bos.toByteArray();
} finally {
- bos.close();
- gos.close();
+ IOUtil.close(bos, gos);
}
return result;
}
@@ -72,9 +71,7 @@ public class CompressUtil {
bos.flush();
result = bos.toByteArray();
} finally {
- bis.close();
- iis.close();
- bos.close();
+ IOUtil.close(bis, iis, bos);
}
return result;
}
diff --git a/common/src/main/java/io/seata/common/util/IOUtil.java b/common/src/main/java/io/seata/common/util/IOUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..043552909657f376122cd3450403d724fbf9dffb
--- /dev/null
+++ b/common/src/main/java/io/seata/common/util/IOUtil.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.common.util;
+
+/**
+ * @author jsbxyyx
+ */
+public class IOUtil {
+
+ /**
+ * close Closeable
+ * @param closeables the closeables
+ */
+ public static void close(AutoCloseable... closeables) {
+ if (CollectionUtils.isNotEmpty(closeables)) {
+ for (AutoCloseable closeable : closeables) {
+ close(closeable);
+ }
+ }
+ }
+
+ /**
+ * close Closeable
+ * @param closeable the closeable
+ */
+ public static void close(AutoCloseable closeable) {
+ if (closeable != null) {
+ try {
+ closeable.close();
+ } catch (Exception ignore) {
+ }
+ }
+ }
+
+}
diff --git a/common/src/main/java/io/seata/common/util/LambdaUtils.java b/common/src/main/java/io/seata/common/util/LambdaUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..134840e3bc7e00ce19639bafecab1c73d272d6ad
--- /dev/null
+++ b/common/src/main/java/io/seata/common/util/LambdaUtils.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.common.util;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+/**
+ * The type Lambda util.
+ *
+ * @author zjinlei
+ */
+public class LambdaUtils {
+
+ public static <T> Predicate<T> distinctByKey(Function<? super T, Object> keyExtractor) {
+ Map<Object, Boolean> seen = new ConcurrentHashMap<>();
+ return object -> seen.putIfAbsent(keyExtractor.apply(object), Boolean.TRUE) == null;
+ }
+
+}
diff --git a/common/src/main/java/io/seata/common/util/NetUtil.java b/common/src/main/java/io/seata/common/util/NetUtil.java
index 57b0e8cb0fa3cb4b93faa4739794c6700b4e74ec..133f38d7d8cbb93c86134fa3946d6b3ab36269f5 100644
--- a/common/src/main/java/io/seata/common/util/NetUtil.java
+++ b/common/src/main/java/io/seata/common/util/NetUtil.java
@@ -28,8 +28,7 @@ import java.util.regex.Pattern;
/**
* The type Net util.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/10
+ * @author slievrly
*/
public class NetUtil {
private static final Logger LOGGER = LoggerFactory.getLogger(NetUtil.class);
@@ -48,6 +47,9 @@ public class NetUtil {
* @return the string
*/
public static String toStringAddress(SocketAddress address) {
+ if (null == address) {
+ return StringUtils.EMPTY;
+ }
return toStringAddress((InetSocketAddress) address);
}
@@ -220,7 +222,7 @@ public class NetUtil {
if (validLocalAndAny) {
return ip != null && IP_PATTERN.matcher(ip).matches();
} else {
- return (ip != null && !ANY_HOST.equals(ip) && !LOCALHOST.equals(ip) && IP_PATTERN.matcher(ip).matches());
+ return ip != null && !ANY_HOST.equals(ip) && !LOCALHOST.equals(ip) && IP_PATTERN.matcher(ip).matches();
}
}
diff --git a/common/src/main/java/io/seata/common/util/NumberUtils.java b/common/src/main/java/io/seata/common/util/NumberUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..5fb202fdfa3d17b3d6651a536fa6c2492e1f0adb
--- /dev/null
+++ b/common/src/main/java/io/seata/common/util/NumberUtils.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.common.util;
+
+/**
+ * Number utility
+ *
+ * @author helloworlde
+ */
+public class NumberUtils {
+
+ /**
+ * <p>Convert a <code>String</code> to an <code>int</code>, returning a
+ * default value if the conversion fails.</p>
+ *
+ * <p>If the string is <code>null</code>, the default value is returned.</p>
+ *
+ * @param str the string to convert, may be null
+ * @param defaultValue the default value
+ * @return the int represented by the string, or the default if conversion fails
+ */
+ public static int toInt(final String str, final int defaultValue) {
+ if (str == null) {
+ return defaultValue;
+ }
+ try {
+ return Integer.parseInt(str);
+ } catch (final NumberFormatException nfe) {
+ return defaultValue;
+ }
+ }
+}
diff --git a/common/src/main/java/io/seata/common/util/StringUtils.java b/common/src/main/java/io/seata/common/util/StringUtils.java
index ecaf6bacc4cbf0f0b3fc35b4874a0c74da9015a1..eee9adc0cf45bceb8af4e204b6454180b2d19312 100644
--- a/common/src/main/java/io/seata/common/util/StringUtils.java
+++ b/common/src/main/java/io/seata/common/util/StringUtils.java
@@ -15,6 +15,9 @@
*/
package io.seata.common.util;
+import io.seata.common.Constants;
+import io.seata.common.exception.ShouldNeverHappenException;
+
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
import java.lang.reflect.Field;
@@ -23,13 +26,10 @@ import java.util.Collection;
import java.util.Date;
import java.util.Map;
-import io.seata.common.Constants;
-import io.seata.common.exception.ShouldNeverHappenException;
-
/**
* The type String utils.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
* @author Geng Zhang
*/
public class StringUtils {
@@ -41,7 +41,7 @@ public class StringUtils {
* empty string
*/
public static final String EMPTY = "";
-
+
/**
* Is empty boolean.
*
@@ -227,4 +227,35 @@ public class StringUtils {
}
return sb.toString();
}
+
+ /**
+ * Trim string to null if empty("").
+ *
+ * @param str the String to be trimmed, may be null
+ * @return the trimmed String
+ */
+ public static String trimToNull(final String str) {
+ final String ts = trim(str);
+ return isEmpty(ts) ? null : ts;
+ }
+
+ /**
+ * Trim string, or null if string is null.
+ *
+ * @param str the String to be trimmed, may be null
+ * @return the trimmed string, {@code null} if null String input
+ */
+ public static String trim(final String str) {
+ return str == null ? null : str.trim();
+ }
+
+ /**
+ * Checks if a CharSequence is empty ("") or null.
+ *
+ * @param cs the CharSequence to check, may be null
+ * @return {@code true} if the CharSequence is empty or null
+ */
+ public static boolean isEmpty(final CharSequence cs) {
+ return cs == null || cs.length() == 0;
+ }
}
diff --git a/common/src/test/java/io/seata/common/XIDTest.java b/common/src/test/java/io/seata/common/XIDTest.java
index 9d35fdecd791a0d03c65c6a82b287aaee7649769..9faa53b94448d81ab17cc62197f0250433325781 100644
--- a/common/src/test/java/io/seata/common/XIDTest.java
+++ b/common/src/test/java/io/seata/common/XIDTest.java
@@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Xid test.
*
* @author Otis.z
- * @date 2019 /2/22
*/
public class XIDTest {
diff --git a/common/src/test/java/io/seata/common/exception/DataAccessExceptionTest.java b/common/src/test/java/io/seata/common/exception/DataAccessExceptionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..92ef41f27ca1e404524a8988ab8112f36f10c220
--- /dev/null
+++ b/common/src/test/java/io/seata/common/exception/DataAccessExceptionTest.java
@@ -0,0 +1,63 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.common.exception;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * The dataAccess exception.
+ *
+ * @author lzf971107
+ */
+public class DataAccessExceptionTest {
+
+ @Test
+ public void testConstructorWithNoParameters() {
+ exceptionAsserts(new DataAccessException());
+ }
+
+ @Test
+ public void testConstructorWithFrameworkErrorCode() {
+ exceptionAsserts(new DataAccessException(FrameworkErrorCode.UnknownAppError));
+ }
+
+ @Test
+ public void testConstructorWithMessage() {
+ exceptionAsserts(new DataAccessException(FrameworkErrorCode.UnknownAppError.getErrMessage()));
+ }
+
+ @Test
+ public void testConstructorWithMessageAndFrameworkErrorCode() {
+ exceptionAsserts(new DataAccessException(FrameworkErrorCode.UnknownAppError.getErrMessage(), FrameworkErrorCode.UnknownAppError));
+ }
+
+ @Test
+ public void testConstructorWithCauseExceptionMessageAndFrameworkErrorCode() {
+ exceptionAsserts(new DataAccessException(new Throwable(), FrameworkErrorCode.UnknownAppError.getErrMessage(), FrameworkErrorCode.UnknownAppError));
+ }
+
+ @Test
+ public void testConstructorWithThrowable() {
+ exceptionAsserts(new DataAccessException(new Throwable(FrameworkErrorCode.UnknownAppError.getErrMessage())));
+ }
+
+ private static void exceptionAsserts(DataAccessException exception) {
+ assertThat(exception).isInstanceOf(DataAccessException.class).hasMessage(FrameworkErrorCode.UnknownAppError.getErrMessage());
+ assertThat(exception.getErrcode()).isEqualTo(FrameworkErrorCode.UnknownAppError);
+ }
+}
\ No newline at end of file
diff --git a/common/src/test/java/io/seata/common/exception/EurekaRegistryExceptionTest.java b/common/src/test/java/io/seata/common/exception/EurekaRegistryExceptionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ace71bb35fc72333318fd6d229c0d5f5e6e21831
--- /dev/null
+++ b/common/src/test/java/io/seata/common/exception/EurekaRegistryExceptionTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.common.exception;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * The eurekaRegistry exception.
+ *
+ * @author lzf971107
+ */
+public class EurekaRegistryExceptionTest {
+
+ @Test
+ public void testConstructorWithNoParameters() {
+ assertThat(new EurekaRegistryException()).isInstanceOf(EurekaRegistryException.class);
+ }
+
+ @Test
+ public void testConstructorWithMessage() {
+ exceptionAsserts(new EurekaRegistryException(FrameworkErrorCode.UnknownAppError.getErrMessage()));
+ }
+
+ @Test
+ public void testConstructorWithMessageAndThrowable() {
+ exceptionAsserts(new EurekaRegistryException(FrameworkErrorCode.UnknownAppError.getErrMessage(), new Throwable()));
+ }
+
+ @Test
+ public void testConstructorWithThrowable() {
+ assertThat(new EurekaRegistryException(new Throwable(FrameworkErrorCode.UnknownAppError.getErrMessage()))).isInstanceOf(EurekaRegistryException.class).hasMessage("java.lang.Throwable: " + FrameworkErrorCode.UnknownAppError.getErrMessage());
+ }
+
+ private static void exceptionAsserts(EurekaRegistryException exception) {
+ assertThat(exception).isInstanceOf(EurekaRegistryException.class).hasMessage(FrameworkErrorCode.UnknownAppError.getErrMessage());
+ }
+}
\ No newline at end of file
diff --git a/common/src/test/java/io/seata/common/exception/FrameworkExceptionTest.java b/common/src/test/java/io/seata/common/exception/FrameworkExceptionTest.java
index 0e1f8ba7f04ebbc24c03be9a3b46c4f3939b4c8e..3fd7e9e9401f851cc86abbccdf4570a0d2af21c7 100644
--- a/common/src/test/java/io/seata/common/exception/FrameworkExceptionTest.java
+++ b/common/src/test/java/io/seata/common/exception/FrameworkExceptionTest.java
@@ -17,6 +17,7 @@ package io.seata.common.exception;
import java.sql.SQLException;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.assertj.core.api.Assertions.assertThat;
@@ -25,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Framework exception test.
*
* @author Otis.z
- * @date 2019 /3/1
*/
public class FrameworkExceptionTest {
@@ -36,13 +36,11 @@ public class FrameworkExceptionTest {
*/
@Test
public void testGetErrcode() {
- try {
+ Throwable throwable = Assertions.assertThrows(FrameworkException.class, () -> {
message.print4();
- } catch (FrameworkException e) {
- assertThat(e).isInstanceOf(FrameworkException.class).hasMessage(
- FrameworkErrorCode.UnknownAppError.getErrMessage());
- assertThat(e.getErrcode()).isEqualTo(FrameworkErrorCode.UnknownAppError);
- }
+ });
+ assertThat(throwable).hasMessage(FrameworkErrorCode.UnknownAppError.getErrMessage());
+ assertThat(((FrameworkException)throwable).getErrcode()).isEqualTo(FrameworkErrorCode.UnknownAppError);
}
/**
@@ -50,11 +48,10 @@ public class FrameworkExceptionTest {
*/
@Test
public void testNestedException() {
- try {
+ Throwable throwable = Assertions.assertThrows(FrameworkException.class, () -> {
message.print();
- } catch (Exception e) {
- assertThat(e).isInstanceOf(FrameworkException.class).hasMessage("");
- }
+ });
+ assertThat(throwable).hasMessage("");
}
/**
@@ -62,11 +59,10 @@ public class FrameworkExceptionTest {
*/
@Test
public void testNestedException1() {
- try {
+ Throwable throwable = Assertions.assertThrows(FrameworkException.class, () -> {
message.print1();
- } catch (Exception e) {
- assertThat(e).isInstanceOf(FrameworkException.class).hasMessage("nestedException");
- }
+ });
+ assertThat(throwable).hasMessage("nestedException");
}
/**
@@ -74,11 +70,10 @@ public class FrameworkExceptionTest {
*/
@Test
public void testNestedException2() {
- try {
+ Throwable throwable = Assertions.assertThrows(SQLException.class, () -> {
message.print2();
- } catch (Exception e) {
- assertThat(e).isInstanceOf(SQLException.class).hasMessageContaining("Message");
- }
+ });
+ assertThat(throwable).hasMessageContaining("Message");
}
/**
@@ -86,11 +81,10 @@ public class FrameworkExceptionTest {
*/
@Test
public void testNestedException3() {
- try {
+ Throwable throwable = Assertions.assertThrows(SQLException.class, () -> {
message.print3();
- } catch (Exception e) {
- assertThat(e).isInstanceOf(SQLException.class).hasMessageContaining("Message");
- }
+ });
+ assertThat(throwable).hasMessageContaining("Message");
}
/**
@@ -98,12 +92,10 @@ public class FrameworkExceptionTest {
*/
@Test
public void testNestedException5() {
- try {
+ Throwable throwable = Assertions.assertThrows(FrameworkException.class, () -> {
message.print5();
- } catch (Exception e) {
- assertThat(e).isInstanceOf(FrameworkException.class).hasMessage(
- FrameworkErrorCode.ExceptionCaught.getErrMessage());
- }
+ });
+ assertThat(throwable).hasMessage(FrameworkErrorCode.ExceptionCaught.getErrMessage());
}
/**
@@ -111,11 +103,10 @@ public class FrameworkExceptionTest {
*/
@Test
public void testNestedException6() {
- try {
+ Throwable throwable = Assertions.assertThrows(FrameworkException.class, () -> {
message.print6();
- } catch (Exception e) {
- assertThat(e).isInstanceOf(FrameworkException.class).hasMessage("frameworkException");
- }
+ });
+ assertThat(throwable).hasMessage("frameworkException");
}
/**
@@ -123,11 +114,10 @@ public class FrameworkExceptionTest {
*/
@Test
public void testNestedException7() {
- try {
+ Throwable throwable = Assertions.assertThrows(FrameworkException.class, () -> {
message.print7();
- } catch (Exception e) {
- assertThat(e).isInstanceOf(FrameworkException.class).hasMessage("frameworkException");
- }
+ });
+ assertThat(throwable).hasMessage("frameworkException");
}
/**
@@ -135,11 +125,10 @@ public class FrameworkExceptionTest {
*/
@Test
public void testNestedException8() {
- try {
+ Throwable throwable = Assertions.assertThrows(FrameworkException.class, () -> {
message.print8();
- } catch (Exception e) {
- assertThat(e).isInstanceOf(FrameworkException.class).hasMessage("throw");
- }
+ });
+ assertThat(throwable).hasMessage("throw");
}
/**
@@ -147,11 +136,18 @@ public class FrameworkExceptionTest {
*/
@Test
public void testNestedException9() {
- try {
+ Throwable throwable = Assertions.assertThrows(FrameworkException.class, () -> {
message.print9();
- } catch (Exception e) {
- assertThat(e).isInstanceOf(FrameworkException.class).hasMessage("frameworkExceptionMsg");
+ });
+ assertThat(throwable).hasMessage("frameworkExceptionMsg");
+ }
+
+ private static void exceptionAsserts(FrameworkException exception, String expectMessage) {
+ if (null == expectMessage) {
+ expectMessage = FrameworkErrorCode.UnknownAppError.getErrMessage();
}
+ assertThat(exception).isInstanceOf(FrameworkException.class).hasMessage(expectMessage);
+ assertThat(exception.getErrcode()).isEqualTo(FrameworkErrorCode.UnknownAppError);
}
}
diff --git a/common/src/test/java/io/seata/common/exception/NotSupportYetExceptionTest.java b/common/src/test/java/io/seata/common/exception/NotSupportYetExceptionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..bcb8ec04557ee5e687953abfc739b5738684e499
--- /dev/null
+++ b/common/src/test/java/io/seata/common/exception/NotSupportYetExceptionTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.common.exception;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * The notSupportYet exception.
+ *
+ * @author lzf971107
+ */
+public class NotSupportYetExceptionTest {
+
+ @Test
+ public void testConstructorWithNoParameters() {
+ assertThat(new NotSupportYetException()).isInstanceOf(NotSupportYetException.class);
+ }
+
+ @Test
+ public void testConstructorWithMessage() {
+ exceptionAsserts(new NotSupportYetException(FrameworkErrorCode.UnknownAppError.getErrMessage()));
+ }
+
+ @Test
+ public void testConstructorWithMessageAndThrowable() {
+ exceptionAsserts(new NotSupportYetException(FrameworkErrorCode.UnknownAppError.getErrMessage(), new Throwable()));
+ }
+
+ @Test
+ public void testConstructorWithThrowable() {
+ assertThat(new NotSupportYetException(new Throwable(FrameworkErrorCode.UnknownAppError.getErrMessage()))).isInstanceOf(NotSupportYetException.class).hasMessage("java.lang.Throwable: " + FrameworkErrorCode.UnknownAppError.getErrMessage());
+ }
+
+ private static void exceptionAsserts(NotSupportYetException exception) {
+ assertThat(exception).isInstanceOf(NotSupportYetException.class).hasMessage(FrameworkErrorCode.UnknownAppError.getErrMessage());
+ }
+}
\ No newline at end of file
diff --git a/common/src/test/java/io/seata/common/exception/ShouldNeverHappenExceptionTest.java b/common/src/test/java/io/seata/common/exception/ShouldNeverHappenExceptionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..34270bab83fd6d316627e48e99725e96d06e3699
--- /dev/null
+++ b/common/src/test/java/io/seata/common/exception/ShouldNeverHappenExceptionTest.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.common.exception;
+
+import org.junit.jupiter.api.Test;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * The shouldNeverHappen exception.
+ *
+ * @author lzf971107
+ */
+public class ShouldNeverHappenExceptionTest {
+
+ @Test
+ public void testConstructorWithNoParameters() {
+ assertThat(new ShouldNeverHappenException()).isInstanceOf(ShouldNeverHappenException.class);
+ }
+
+ @Test
+ public void testConstructorWithMessage() {
+ exceptionAsserts(new ShouldNeverHappenException(FrameworkErrorCode.UnknownAppError.getErrMessage()));
+ }
+
+ @Test
+ public void testConstructorWithMessageAndThrowable() {
+ exceptionAsserts(new ShouldNeverHappenException(FrameworkErrorCode.UnknownAppError.getErrMessage(), new Throwable()));
+ }
+
+ @Test
+ public void testConstructorWithThrowable() {
+ assertThat(new ShouldNeverHappenException(new Throwable(FrameworkErrorCode.UnknownAppError.getErrMessage()))).isInstanceOf(ShouldNeverHappenException.class).hasMessage("java.lang.Throwable: " + FrameworkErrorCode.UnknownAppError.getErrMessage());
+ }
+
+ private static void exceptionAsserts(ShouldNeverHappenException exception) {
+ assertThat(exception).isInstanceOf(ShouldNeverHappenException.class).hasMessage(FrameworkErrorCode.UnknownAppError.getErrMessage());
+ }
+}
\ No newline at end of file
diff --git a/common/src/test/java/io/seata/common/exception/StoreExceptionTest.java b/common/src/test/java/io/seata/common/exception/StoreExceptionTest.java
index e309a416bbe3e72b167d77c43b977147d57ee0d8..68aa46c4460ee168e9266421499512e1d2597177 100644
--- a/common/src/test/java/io/seata/common/exception/StoreExceptionTest.java
+++ b/common/src/test/java/io/seata/common/exception/StoreExceptionTest.java
@@ -23,77 +23,44 @@ public class StoreExceptionTest {
@Test
public void testConstructorWithNoParameters() {
- try {
- throw new StoreException();
- } catch (StoreException exception) {
- exceptionAsserts(exception);
- }
+ exceptionAsserts(new StoreException());
}
@Test
public void testConstructorWithFrameworkErrorCode() {
- try {
- throw new StoreException(FrameworkErrorCode.UnknownAppError);
- } catch (StoreException exception) {
- exceptionAsserts(exception);
- }
+ exceptionAsserts(new StoreException(FrameworkErrorCode.UnknownAppError));
}
@Test
public void testConstructorWithMessage() {
- try {
- throw new StoreException(FrameworkErrorCode.UnknownAppError.getErrMessage());
- } catch (StoreException exception) {
- exceptionAsserts(exception);
- }
+ exceptionAsserts(new StoreException(FrameworkErrorCode.UnknownAppError.getErrMessage()));
}
@Test
public void testConstructorWithMessageAndFrameworkErrorCode() {
- try {
- throw new StoreException(
- FrameworkErrorCode.UnknownAppError.getErrMessage(),
- FrameworkErrorCode.UnknownAppError);
- } catch (StoreException exception) {
- exceptionAsserts(exception);
- }
+ exceptionAsserts(
+ new StoreException(FrameworkErrorCode.UnknownAppError.getErrMessage(), FrameworkErrorCode.UnknownAppError));
}
@Test
public void testConstructorWithCauseExceptionMessageAndFrameworkErrorCode() {
- try {
- throw new StoreException(
- new Throwable(),
- FrameworkErrorCode.UnknownAppError.getErrMessage(),
- FrameworkErrorCode.UnknownAppError);
- } catch (StoreException exception) {
- exceptionAsserts(exception);
- }
+ exceptionAsserts(new StoreException(new Throwable(), FrameworkErrorCode.UnknownAppError.getErrMessage(),
+ FrameworkErrorCode.UnknownAppError));
}
@Test
public void testConstructorWithThrowable() {
- try {
- throw new StoreException(new Throwable(FrameworkErrorCode.UnknownAppError.getErrMessage()));
- } catch (StoreException exception) {
- exceptionAsserts(exception);
- }
+ exceptionAsserts(new StoreException(new Throwable(FrameworkErrorCode.UnknownAppError.getErrMessage())));
}
@Test
public void testConstructorWithThrowableAndMessage() {
- try {
- throw new StoreException(new Throwable(), FrameworkErrorCode.UnknownAppError.getErrMessage());
- } catch (StoreException exception) {
- exceptionAsserts(exception);
- }
+ exceptionAsserts(new StoreException(new Throwable(), FrameworkErrorCode.UnknownAppError.getErrMessage()));
}
private static void exceptionAsserts(StoreException exception) {
- assertThat(exception)
- .isInstanceOf(StoreException.class)
- .hasMessage(FrameworkErrorCode.UnknownAppError.getErrMessage());
- assertThat(exception.getErrcode())
- .isEqualTo(FrameworkErrorCode.UnknownAppError);
+ assertThat(exception).isInstanceOf(StoreException.class).hasMessage(
+ FrameworkErrorCode.UnknownAppError.getErrMessage());
+ assertThat(exception.getErrcode()).isEqualTo(FrameworkErrorCode.UnknownAppError);
}
}
diff --git a/common/src/test/java/io/seata/common/loader/ChineseHello.java b/common/src/test/java/io/seata/common/loader/ChineseHello.java
index 57d696ea061f018386bef2e31331b5fb6c0977af..f2949a1f88f8b4b4254a2e849960f86295185665 100644
--- a/common/src/test/java/io/seata/common/loader/ChineseHello.java
+++ b/common/src/test/java/io/seata/common/loader/ChineseHello.java
@@ -19,7 +19,6 @@ package io.seata.common.loader;
* The type Chinese hello.
*
* @author Otis.z
- * @date 2019 /2/26
*/
@LoadLevel(name = "ChineseHello", order = Integer.MIN_VALUE)
public class ChineseHello implements Hello {
diff --git a/common/src/test/java/io/seata/common/loader/EnglishHello.java b/common/src/test/java/io/seata/common/loader/EnglishHello.java
index 6e3f1b64fdc831c4280a0da5bf67c7bd3328e77b..028b2da042d064fba752397aade38d2fa4b456ca 100644
--- a/common/src/test/java/io/seata/common/loader/EnglishHello.java
+++ b/common/src/test/java/io/seata/common/loader/EnglishHello.java
@@ -19,7 +19,6 @@ package io.seata.common.loader;
* The type English hello.
*
* @author Otis.z
- * @date 2019 /2/26
*/
@LoadLevel(name = "EnglishHello", order = 1)
public class EnglishHello implements Hello {
diff --git a/common/src/test/java/io/seata/common/loader/EnhancedServiceLoaderTest.java b/common/src/test/java/io/seata/common/loader/EnhancedServiceLoaderTest.java
index 23b4e3fa2341dd09d13edb44f1655c5e387e9f4e..9a7a0c8f794efcf9f73f536b856dae1ed517ec93 100644
--- a/common/src/test/java/io/seata/common/loader/EnhancedServiceLoaderTest.java
+++ b/common/src/test/java/io/seata/common/loader/EnhancedServiceLoaderTest.java
@@ -26,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Enhanced service loader test.
*
* @author Otis.z
- * @date 2019 /2/26
*/
public class EnhancedServiceLoaderTest {
diff --git a/common/src/test/java/io/seata/common/loader/FrenchHello.java b/common/src/test/java/io/seata/common/loader/FrenchHello.java
index 144c7860da6df2757cee5d686e70cfc67cf6cf39..a7c38320fe5f759aeb357ca1c13a8965d0b4c368 100644
--- a/common/src/test/java/io/seata/common/loader/FrenchHello.java
+++ b/common/src/test/java/io/seata/common/loader/FrenchHello.java
@@ -19,7 +19,6 @@ package io.seata.common.loader;
* The type French hello.
*
* @author Otis.z
- * @date 2019 /2/26
*/
@LoadLevel(name = "FrenchHello", order = 2)
public class FrenchHello implements Hello {
diff --git a/common/src/test/java/io/seata/common/loader/Hello.java b/common/src/test/java/io/seata/common/loader/Hello.java
index dee66c05c717b5c653c5163c7c4265f7a28ba6ef..cb1bb9e60471505daffdd20d458ed2ba8fd7e9b2 100644
--- a/common/src/test/java/io/seata/common/loader/Hello.java
+++ b/common/src/test/java/io/seata/common/loader/Hello.java
@@ -19,7 +19,6 @@ package io.seata.common.loader;
* The interface Hello.
*
* @author Otis.z
- * @date 2019 /2/26
*/
public interface Hello {
/**
diff --git a/common/src/test/java/io/seata/common/thread/NamedThreadFactoryTest.java b/common/src/test/java/io/seata/common/thread/NamedThreadFactoryTest.java
index c862f03cdda4387e415d40ad9015722db40b46a5..d245319f784054a67545194d22b7db7250c74950 100644
--- a/common/src/test/java/io/seata/common/thread/NamedThreadFactoryTest.java
+++ b/common/src/test/java/io/seata/common/thread/NamedThreadFactoryTest.java
@@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test;
/**
* @author Otis.z
- * @date 2019/2/26
*/
public class NamedThreadFactoryTest {
diff --git a/common/src/test/java/io/seata/common/thread/PositiveAtomicCounterTest.java b/common/src/test/java/io/seata/common/thread/PositiveAtomicCounterTest.java
index 638c196f3058a946bca32be98a1f7b4ff6492f02..6c5a4563f5bf0de2fe0b1da5bd625ca858ec1620 100644
--- a/common/src/test/java/io/seata/common/thread/PositiveAtomicCounterTest.java
+++ b/common/src/test/java/io/seata/common/thread/PositiveAtomicCounterTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.common.thread;
import org.junit.jupiter.api.Test;
diff --git a/common/src/test/java/io/seata/common/util/BlobUtilsTest.java b/common/src/test/java/io/seata/common/util/BlobUtilsTest.java
index 59d1f14f94f1afebdf0257deefb971468d95d762..51eafc4bee90cf32057a44c96e579666d309aa17 100644
--- a/common/src/test/java/io/seata/common/util/BlobUtilsTest.java
+++ b/common/src/test/java/io/seata/common/util/BlobUtilsTest.java
@@ -31,7 +31,6 @@ import static org.junit.jupiter.api.Assertions.assertNull;
*
* @author Otis.z
* @author Geng Zhang
- * @date 2019 /2/26
*/
public class BlobUtilsTest {
diff --git a/common/src/test/java/io/seata/common/util/CollectionUtilsTest.java b/common/src/test/java/io/seata/common/util/CollectionUtilsTest.java
index a32155a731b5eb06a76ef2ef234dcd5e9155ed2b..a1f7de5f3a7bc7cb8f2259dd0dfe0be354f554d4 100644
--- a/common/src/test/java/io/seata/common/util/CollectionUtilsTest.java
+++ b/common/src/test/java/io/seata/common/util/CollectionUtilsTest.java
@@ -17,7 +17,7 @@ package io.seata.common.util;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@@ -57,7 +57,7 @@ public class CollectionUtilsTest {
Map<String, String> map = null;
Assertions.assertNull(CollectionUtils.encodeMap(map));
- map = new HashMap<>();
+ map = new LinkedHashMap<>();
Assertions.assertEquals("", CollectionUtils.encodeMap(map));
map.put("x", "1");
Assertions.assertEquals("x=1", CollectionUtils.encodeMap(map));
diff --git a/common/src/test/java/io/seata/common/util/NetUtilTest.java b/common/src/test/java/io/seata/common/util/NetUtilTest.java
index 6e06ef690ed692c29a94eb698dc95c1b85c51a66..28c9e15b209f75eb7fe6c9d95db63687776686fb 100644
--- a/common/src/test/java/io/seata/common/util/NetUtilTest.java
+++ b/common/src/test/java/io/seata/common/util/NetUtilTest.java
@@ -29,7 +29,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Net util test.
*
* @author Otis.z
- * @date 2019 /2/26
*/
public class NetUtilTest {
diff --git a/common/src/test/java/io/seata/common/util/StringUtilsTest.java b/common/src/test/java/io/seata/common/util/StringUtilsTest.java
index c816c0358cb28d6585e64155debf1431d57d9732..b775b1bab519919e13ed81027d6959cc0f82edb6 100644
--- a/common/src/test/java/io/seata/common/util/StringUtilsTest.java
+++ b/common/src/test/java/io/seata/common/util/StringUtilsTest.java
@@ -30,7 +30,6 @@ import static org.junit.jupiter.api.Assertions.assertNull;
*
* @author Otis.z
* @author Geng Zhang
- * @date 2019 /2/20
*/
public class StringUtilsTest {
diff --git a/compressor/pom.xml b/compressor/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5304c25eaf5d7bc0dd0ead9cbebe113f10530a39
--- /dev/null
+++ b/compressor/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-parent</artifactId>
+ <version>${revision}</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>seata-compressor</artifactId>
+ <packaging>pom</packaging>
+ <name>seata-compressor ${project.version}</name>
+
+ <modules>
+ <module>seata-compressor-all</module>
+ <module>seata-compressor-gzip</module>
+ </modules>
+
+
+</project>
\ No newline at end of file
diff --git a/compressor/seata-compressor-all/pom.xml b/compressor/seata-compressor-all/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c8de08a41ba9c2d722e72827e922fa5c19369cc8
--- /dev/null
+++ b/compressor/seata-compressor-all/pom.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-compressor</artifactId>
+ <version>${revision}</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>seata-compressor-all</artifactId>
+ <name>seata-compressor-all ${project.version}</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>seata-compressor-gzip</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/compressor/seata-compressor-gzip/pom.xml b/compressor/seata-compressor-gzip/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8aa34de556b26fdddd1921bfe1e0ac7e66271112
--- /dev/null
+++ b/compressor/seata-compressor-gzip/pom.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-compressor</artifactId>
+ <version>${revision}</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>seata-compressor-gzip</artifactId>
+ <packaging>jar</packaging>
+ <name>seata-compressor-gzip ${project.version}</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>seata-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ </dependencies>
+
+
+</project>
\ No newline at end of file
diff --git a/compressor/seata-compressor-gzip/src/main/java/io/seata/compressor/gzip/GzipCompressor.java b/compressor/seata-compressor-gzip/src/main/java/io/seata/compressor/gzip/GzipCompressor.java
new file mode 100644
index 0000000000000000000000000000000000000000..952a50a1d708e093a1d77ebaef881f96eb4ff91a
--- /dev/null
+++ b/compressor/seata-compressor-gzip/src/main/java/io/seata/compressor/gzip/GzipCompressor.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.compressor.gzip;
+
+import io.seata.common.loader.LoadLevel;
+import io.seata.core.compressor.Compressor;
+
+/**
+ * @author jsbxyyx
+ */
+@LoadLevel(name = "GZIP")
+public class GzipCompressor implements Compressor {
+
+ @Override
+ public byte[] compress(byte[] bytes) {
+ return GzipUtil.compress(bytes);
+ }
+
+ @Override
+ public byte[] decompress(byte[] bytes) {
+ return GzipUtil.decompress(bytes);
+ }
+
+}
diff --git a/compressor/seata-compressor-gzip/src/main/java/io/seata/compressor/gzip/GzipUtil.java b/compressor/seata-compressor-gzip/src/main/java/io/seata/compressor/gzip/GzipUtil.java
new file mode 100644
index 0000000000000000000000000000000000000000..1d8c748003c269017f81dc4e4285be7116a514b3
--- /dev/null
+++ b/compressor/seata-compressor-gzip/src/main/java/io/seata/compressor/gzip/GzipUtil.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.compressor.gzip;
+
+import io.seata.common.util.IOUtil;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.util.zip.GZIPInputStream;
+import java.util.zip.GZIPOutputStream;
+
+/**
+ * @author jsbxyyx
+ */
+public class GzipUtil {
+
+ private static final int BUFFER_SIZE = 8192;
+
+ public static byte[] compress(byte[] bytes) {
+ if (bytes == null) {
+ throw new NullPointerException("bytes is null");
+ }
+ ByteArrayOutputStream out = null;
+ GZIPOutputStream gzip = null;
+ try {
+ out = new ByteArrayOutputStream();
+ gzip = new GZIPOutputStream(out);
+ gzip.write(bytes);
+ gzip.close();
+ return out.toByteArray();
+ } catch (IOException e) {
+ throw new RuntimeException("gzip compress error", e);
+ } finally {
+ IOUtil.close(out);
+ }
+
+ }
+
+ public static byte[] decompress(byte[] bytes) {
+ if (bytes == null) {
+ throw new NullPointerException("bytes is null");
+ }
+ ByteArrayOutputStream out = null;
+ GZIPInputStream gunzip = null;
+ try {
+ out = new ByteArrayOutputStream();
+ gunzip = new GZIPInputStream(new ByteArrayInputStream(bytes));
+ byte[] buffer = new byte[BUFFER_SIZE];
+ int n;
+ while ((n = gunzip.read(buffer)) > -1) {
+ out.write(buffer, 0, n);
+ }
+ gunzip.close();
+ return out.toByteArray();
+ } catch (IOException e) {
+ throw new RuntimeException("gzip decompress error", e);
+ } finally {
+ IOUtil.close(out);
+ }
+ }
+
+}
diff --git a/compressor/seata-compressor-gzip/src/main/resources/META-INF/services/io.seata.core.compressor.Compressor b/compressor/seata-compressor-gzip/src/main/resources/META-INF/services/io.seata.core.compressor.Compressor
new file mode 100644
index 0000000000000000000000000000000000000000..fa77cad93f2e902ce2077e34b08eccad52224a57
--- /dev/null
+++ b/compressor/seata-compressor-gzip/src/main/resources/META-INF/services/io.seata.core.compressor.Compressor
@@ -0,0 +1 @@
+io.seata.compressor.gzip.GzipCompressor
\ No newline at end of file
diff --git a/compressor/seata-compressor-gzip/src/test/java/io/seata/compressor/gzip/GzipCompressorTest.java b/compressor/seata-compressor-gzip/src/test/java/io/seata/compressor/gzip/GzipCompressorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a9c5a2154d6e914147d63ef4adc322f24846bd3d
--- /dev/null
+++ b/compressor/seata-compressor-gzip/src/test/java/io/seata/compressor/gzip/GzipCompressorTest.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.compressor.gzip;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author jsbxyyx
+ */
+public class GzipCompressorTest {
+
+ @Test
+ public void testCompressAndDecompress() {
+ GzipCompressor compressor = new GzipCompressor();
+ byte[] bytes = "aa".getBytes();
+ bytes = compressor.compress(bytes);
+ bytes = compressor.decompress(bytes);
+ Assertions.assertEquals(new String(bytes), "aa");
+ }
+}
diff --git a/compressor/seata-compressor-gzip/src/test/java/io/seata/compressor/gzip/GzipUtilTest.java b/compressor/seata-compressor-gzip/src/test/java/io/seata/compressor/gzip/GzipUtilTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..692a5ed6fe2c67c169405a13fa21b23f8537303d
--- /dev/null
+++ b/compressor/seata-compressor-gzip/src/test/java/io/seata/compressor/gzip/GzipUtilTest.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.compressor.gzip;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.zip.GZIPInputStream;
+
+/**
+ * @author jsbxyyx
+ */
+public class GzipUtilTest {
+
+ @Test
+ public void test_compress() {
+ Assertions.assertThrows(NullPointerException.class, () -> {
+ GzipUtil.compress(null);
+ });
+
+ byte[] compress = GzipUtil.compress("aa".getBytes());
+ int head = ((int) compress[0] & 0xff) | ((compress[1] << 8 ) & 0xff00);
+ Assertions.assertEquals(GZIPInputStream.GZIP_MAGIC, head);
+ }
+
+ @Test
+ public void test_decompress() {
+
+ Assertions.assertThrows(NullPointerException.class, () -> {
+ GzipUtil.decompress(null);
+ });
+
+ Assertions.assertThrows(RuntimeException.class, () -> {
+ GzipUtil.decompress(new byte[0]);
+ });
+
+ Assertions.assertThrows(RuntimeException.class, () -> {
+ byte[] bytes = {0x1, 0x2};
+ GzipUtil.decompress(bytes);
+ });
+
+ }
+
+}
diff --git a/config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfiguration.java b/config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfiguration.java
index a1672792e34fbbfce8d693b89c221be22d686b7e..0610b1d48daddeb74701bd492ff8dfd72bb0128d 100644
--- a/config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfiguration.java
+++ b/config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfiguration.java
@@ -15,9 +15,8 @@
*/
package io.seata.config.apollo;
-import java.util.List;
-import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
@@ -26,15 +25,18 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import com.ctrip.framework.apollo.Config;
-import com.ctrip.framework.apollo.ConfigChangeListener;
import com.ctrip.framework.apollo.ConfigService;
-import com.ctrip.framework.apollo.model.ConfigChangeEvent;
-import com.google.common.collect.Lists;
+import com.ctrip.framework.apollo.enums.PropertyChangeType;
+import com.ctrip.framework.apollo.model.ConfigChange;
+import io.netty.util.internal.ConcurrentSet;
import io.seata.common.exception.NotSupportYetException;
import io.seata.common.thread.NamedThreadFactory;
import io.seata.config.AbstractConfiguration;
import io.seata.config.ConfigFuture;
import io.seata.config.Configuration;
+import io.seata.config.ConfigurationChangeEvent;
+import io.seata.config.ConfigurationChangeListener;
+import io.seata.config.ConfigurationChangeType;
import io.seata.config.ConfigurationFactory;
import static io.seata.config.ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR;
@@ -44,9 +46,8 @@ import static io.seata.config.ConfigurationKeys.FILE_ROOT_CONFIG;
* The type Apollo configuration.
*
* @author: kl @kailing.pub
- * @date: 2019 /2/27
*/
-public class ApolloConfiguration extends AbstractConfiguration<ConfigChangeListener> {
+public class ApolloConfiguration extends AbstractConfiguration {
private static final String REGISTRY_TYPE = "apollo";
private static final String APP_ID = "app.id";
@@ -55,7 +56,8 @@ public class ApolloConfiguration extends AbstractConfiguration<ConfigChangeListe
private static volatile Config config;
private ExecutorService configOperateExecutor;
private static final int CORE_CONFIG_OPERATE_THREAD = 1;
- private static final ConcurrentMap<String, ConfigChangeListener> LISTENER_SERVICE_MAP = new ConcurrentHashMap<>();
+ private static final ConcurrentMap<String, Set<ConfigurationChangeListener>> LISTENER_SERVICE_MAP
+ = new ConcurrentHashMap<>();
private static final int MAX_CONFIG_OPERATE_THREAD = 2;
private static volatile ApolloConfiguration instance;
@@ -66,17 +68,18 @@ public class ApolloConfiguration extends AbstractConfiguration<ConfigChangeListe
if (null == config) {
config = ConfigService.getAppConfig();
configOperateExecutor = new ThreadPoolExecutor(CORE_CONFIG_OPERATE_THREAD,
- MAX_CONFIG_OPERATE_THREAD,
- Integer.MAX_VALUE, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(),
+ MAX_CONFIG_OPERATE_THREAD, Integer.MAX_VALUE, TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue<>(),
new NamedThreadFactory("apolloConfigOperate", MAX_CONFIG_OPERATE_THREAD));
- config.addChangeListener(new ConfigChangeListener() {
- @Override
- public void onChange(ConfigChangeEvent changeEvent) {
- for (Map.Entry<String, ConfigChangeListener> entry : LISTENER_SERVICE_MAP.entrySet()) {
- if (changeEvent.isChanged(entry.getKey())) {
- entry.getValue().onChange(changeEvent);
- }
+ config.addChangeListener((changeEvent) -> {
+ for (String key : changeEvent.changedKeys()) {
+ if (!LISTENER_SERVICE_MAP.containsKey(key)) {
+ continue;
}
+ ConfigChange change = changeEvent.getChange(key);
+ ConfigurationChangeEvent event = new ConfigurationChangeEvent(key, change.getNamespace(),
+ change.getOldValue(), change.getNewValue(), getChangeType(change.getChangeType()));
+ LISTENER_SERVICE_MAP.get(key).forEach(listener -> listener.onProcessEvent(event));
}
});
}
@@ -134,18 +137,25 @@ public class ApolloConfiguration extends AbstractConfiguration<ConfigChangeListe
}
@Override
- public void addConfigListener(String dataId, ConfigChangeListener listener) {
- LISTENER_SERVICE_MAP.put(dataId, listener);
+ public void addConfigListener(String dataId, ConfigurationChangeListener listener) {
+ if (null == dataId || null == listener) {
+ return;
+ }
+ LISTENER_SERVICE_MAP.putIfAbsent(dataId, new ConcurrentSet<>());
+ LISTENER_SERVICE_MAP.get(dataId).add(listener);
}
@Override
- public void removeConfigListener(String dataId, ConfigChangeListener listener) {
- LISTENER_SERVICE_MAP.remove(dataId, listener);
+ public void removeConfigListener(String dataId, ConfigurationChangeListener listener) {
+ if (!LISTENER_SERVICE_MAP.containsKey(dataId) || listener == null) {
+ return;
+ }
+ LISTENER_SERVICE_MAP.get(dataId).remove(listener);
}
@Override
- public List<ConfigChangeListener> getConfigListeners(String dataId) {
- return Lists.newArrayList(LISTENER_SERVICE_MAP.values());
+ public Set<ConfigurationChangeListener> getConfigListeners(String dataId) {
+ return LISTENER_SERVICE_MAP.get(dataId);
}
private void readyApolloConfig() {
@@ -164,12 +174,21 @@ public class ApolloConfiguration extends AbstractConfiguration<ConfigChangeListe
}
private static String getApolloMetaFileKey() {
- return FILE_ROOT_CONFIG + FILE_CONFIG_SPLIT_CHAR + REGISTRY_TYPE + FILE_CONFIG_SPLIT_CHAR
- + APOLLO_META;
+ return FILE_ROOT_CONFIG + FILE_CONFIG_SPLIT_CHAR + REGISTRY_TYPE + FILE_CONFIG_SPLIT_CHAR + APOLLO_META;
}
private static String getApolloAppIdFileKey() {
- return FILE_ROOT_CONFIG + FILE_CONFIG_SPLIT_CHAR + REGISTRY_TYPE + FILE_CONFIG_SPLIT_CHAR
- + APP_ID;
+ return FILE_ROOT_CONFIG + FILE_CONFIG_SPLIT_CHAR + REGISTRY_TYPE + FILE_CONFIG_SPLIT_CHAR + APP_ID;
+ }
+
+ private ConfigurationChangeType getChangeType(PropertyChangeType changeType) {
+ switch (changeType) {
+ case ADDED:
+ return ConfigurationChangeType.ADD;
+ case DELETED:
+ return ConfigurationChangeType.DELETE;
+ default:
+ return ConfigurationChangeType.MODIFY;
+ }
}
-}
\ No newline at end of file
+}
diff --git a/config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfigurationProvider.java b/config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfigurationProvider.java
index f3756e06e3715ca61f7f9dab0f62322aaab51b3b..70205b1764e48799f7e36de3961242edc7e99463 100644
--- a/config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfigurationProvider.java
+++ b/config/seata-config-apollo/src/main/java/io/seata/config/apollo/ApolloConfigurationProvider.java
@@ -21,7 +21,6 @@ import io.seata.config.ConfigurationProvider;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/12
*/
@LoadLevel(name = "Apollo", order = 1)
public class ApolloConfigurationProvider implements ConfigurationProvider {
diff --git a/config/seata-config-consul/src/main/java/io/seata/config/consul/ConsulConfiguration.java b/config/seata-config-consul/src/main/java/io/seata/config/consul/ConsulConfiguration.java
index fc7f77cb3b9d89853b9496753d98fbd294fb4fc9..5837c70e7e9fc9b2478f9054551098baea5b2db5 100644
--- a/config/seata-config-consul/src/main/java/io/seata/config/consul/ConsulConfiguration.java
+++ b/config/seata-config-consul/src/main/java/io/seata/config/consul/ConsulConfiguration.java
@@ -15,47 +15,50 @@
*/
package io.seata.config.consul;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
import com.ecwid.consul.v1.ConsulClient;
import com.ecwid.consul.v1.QueryParams;
import com.ecwid.consul.v1.Response;
import com.ecwid.consul.v1.kv.model.GetValue;
import com.ecwid.consul.v1.kv.model.PutParams;
+import io.netty.util.internal.ConcurrentSet;
import io.seata.common.thread.NamedThreadFactory;
import io.seata.config.AbstractConfiguration;
-import io.seata.config.ConfigChangeListener;
import io.seata.config.ConfigFuture;
import io.seata.config.Configuration;
+import io.seata.config.ConfigurationChangeEvent;
+import io.seata.config.ConfigurationChangeListener;
import io.seata.config.ConfigurationFactory;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
import static io.seata.config.ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR;
import static io.seata.config.ConfigurationKeys.FILE_ROOT_CONFIG;
/**
- * @author xingfudeshi@gmail.com
- * @date 2019/05/05
+ * The type Consul configuration.
+ *
+ * @author xingfudeshi @gmail.com
*/
-public class ConsulConfiguration extends AbstractConfiguration<ConfigChangeListener> {
+public class ConsulConfiguration extends AbstractConfiguration {
private volatile static ConsulConfiguration instance;
private volatile static ConsulClient client;
private static final Configuration FILE_CONFIG = ConfigurationFactory.CURRENT_FILE_INSTANCE;
private static final String SERVER_ADDR_KEY = "serverAddr";
private static final String CONFIG_TYPE = "consul";
- private static final String FILE_CONFIG_KEY_PREFIX = FILE_ROOT_CONFIG + FILE_CONFIG_SPLIT_CHAR + CONFIG_TYPE + FILE_CONFIG_SPLIT_CHAR;
+ private static final String FILE_CONFIG_KEY_PREFIX = FILE_ROOT_CONFIG + FILE_CONFIG_SPLIT_CHAR + CONFIG_TYPE
+ + FILE_CONFIG_SPLIT_CHAR;
private static final int THREAD_POOL_NUM = 1;
private static final int MAP_INITIAL_CAPACITY = 8;
private ExecutorService consulNotifierExecutor;
- private ConcurrentMap<String, List<ConfigChangeListener>> configListenersMap;
- private ConcurrentMap<String, List<ConfigChangeNotifier>> configChangeNotifiersMap;
+ private ConcurrentMap<String, Set<ConfigurationChangeListener>> configListenersMap = new ConcurrentHashMap<>(
+ MAP_INITIAL_CAPACITY);
/**
* default watch timeout in second
@@ -63,18 +66,16 @@ public class ConsulConfiguration extends AbstractConfiguration<ConfigChangeListe
private static final int DEFAULT_WATCH_TIMEOUT = 60;
private static final long CAS = 0L;
-
private ConsulConfiguration() {
- consulNotifierExecutor = new ThreadPoolExecutor(THREAD_POOL_NUM, THREAD_POOL_NUM,
- Integer.MAX_VALUE, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), new NamedThreadFactory("consul-config-executor", THREAD_POOL_NUM));
- configListenersMap = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
- configChangeNotifiersMap = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
+ consulNotifierExecutor = new ThreadPoolExecutor(THREAD_POOL_NUM, THREAD_POOL_NUM, Integer.MAX_VALUE,
+ TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(),
+ new NamedThreadFactory("consul-config-executor", THREAD_POOL_NUM));
}
/**
* get instance
*
- * @return
+ * @return instance
*/
public static ConsulConfiguration getInstance() {
if (null == instance) {
@@ -87,18 +88,18 @@ public class ConsulConfiguration extends AbstractConfiguration<ConfigChangeListe
return instance;
}
-
@Override
public String getConfig(String dataId, String defaultValue, long timeoutMills) {
String value;
if ((value = getConfigFromSysPro(dataId)) != null) {
return value;
}
- ConfigFuture configFuture = new ConfigFuture(dataId, defaultValue, ConfigFuture.ConfigOperation.GET, timeoutMills);
+ ConfigFuture configFuture = new ConfigFuture(dataId, defaultValue, ConfigFuture.ConfigOperation.GET,
+ timeoutMills);
consulNotifierExecutor.execute(() -> {
complete(getConsulClient().getKVValue(dataId), configFuture);
});
- return (String) configFuture.get();
+ return (String)configFuture.get();
}
@Override
@@ -107,19 +108,20 @@ public class ConsulConfiguration extends AbstractConfiguration<ConfigChangeListe
consulNotifierExecutor.execute(() -> {
complete(getConsulClient().setKVValue(dataId, content), configFuture);
});
- return (Boolean) configFuture.get();
+ return (Boolean)configFuture.get();
}
@Override
public boolean putConfigIfAbsent(String dataId, String content, long timeoutMills) {
- ConfigFuture configFuture = new ConfigFuture(dataId, content, ConfigFuture.ConfigOperation.PUTIFABSENT, timeoutMills);
+ ConfigFuture configFuture = new ConfigFuture(dataId, content, ConfigFuture.ConfigOperation.PUTIFABSENT,
+ timeoutMills);
consulNotifierExecutor.execute(() -> {
PutParams putParams = new PutParams();
//Setting CAS to 0 means that this is an atomic operation, created when key does not exist.
putParams.setCas(CAS);
complete(getConsulClient().setKVValue(dataId, content, putParams), configFuture);
});
- return (Boolean) configFuture.get();
+ return (Boolean)configFuture.get();
}
@Override
@@ -128,53 +130,39 @@ public class ConsulConfiguration extends AbstractConfiguration<ConfigChangeListe
consulNotifierExecutor.execute(() -> {
complete(getConsulClient().deleteKVValue(dataId), configFuture);
});
- return (Boolean) configFuture.get();
+ return (Boolean)configFuture.get();
}
@Override
- public void addConfigListener(String dataId, ConfigChangeListener listener) {
- configListenersMap.putIfAbsent(dataId, new ArrayList<>());
- configChangeNotifiersMap.putIfAbsent(dataId, new ArrayList<>());
- ConfigChangeNotifier configChangeNotifier = new ConfigChangeNotifier(dataId, listener);
- configChangeNotifiersMap.get(dataId).add(configChangeNotifier);
- if (null != listener.getExecutor()) {
- listener.getExecutor().submit(configChangeNotifier);
- } else {
- consulNotifierExecutor.submit(configChangeNotifier);
+ public void addConfigListener(String dataId, ConfigurationChangeListener listener) {
+ if (null == dataId || null == listener) {
+ return;
}
+ configListenersMap.putIfAbsent(dataId, new ConcurrentSet<>());
+ ConsulListener consulListener = new ConsulListener(dataId, listener);
+ configListenersMap.get(dataId).add(consulListener);
+ consulListener.onProcessEvent(new ConfigurationChangeEvent());
+
}
@Override
- public void removeConfigListener(String dataId, ConfigChangeListener listener) {
- List<ConfigChangeListener> configChangeListeners = getConfigListeners(dataId);
- if (configChangeListeners == null) {
+ public void removeConfigListener(String dataId, ConfigurationChangeListener listener) {
+ Set<ConfigurationChangeListener> configChangeListeners = getConfigListeners(dataId);
+ if (configChangeListeners == null || listener == null) {
return;
}
- List<ConfigChangeListener> newChangeListenerList = new ArrayList<>();
- for (ConfigChangeListener changeListener : configChangeListeners) {
- if (!changeListener.equals(listener)) {
- newChangeListenerList.add(changeListener);
+ for (ConfigurationChangeListener entry : configChangeListeners) {
+ ConfigurationChangeListener target = ((ConsulListener)entry).getTargetListener();
+ if (listener.equals(target)) {
+ entry.onShutDown();
+ configChangeListeners.remove(entry);
+ break;
}
}
- configListenersMap.put(dataId, newChangeListenerList);
- if (null != listener.getExecutor()) {
- listener.getExecutor().shutdownNow();
- }
- //remove and stop the configChangeNotifier
- List<ConfigChangeNotifier> configChangeNotifiers = configChangeNotifiersMap.get(dataId);
- List<ConfigChangeNotifier> newConfigChangeNotifiers = new ArrayList<>();
- for (ConfigChangeNotifier configChangeNotifier : configChangeNotifiers) {
- if (!listener.equals(configChangeNotifier.getListener())) {
- newConfigChangeNotifiers.add(configChangeNotifier);
- } else {
- configChangeNotifier.stop();
- }
- }
- configChangeNotifiersMap.put(dataId, newConfigChangeNotifiers);
}
@Override
- public List<ConfigChangeListener> getConfigListeners(String dataId) {
+ public Set<ConfigurationChangeListener> getConfigListeners(String dataId) {
return configListenersMap.get(dataId);
}
@@ -183,7 +171,6 @@ public class ConsulConfiguration extends AbstractConfiguration<ConfigChangeListe
return CONFIG_TYPE;
}
-
/**
* get consul client
*
@@ -210,7 +197,7 @@ public class ConsulConfiguration extends AbstractConfiguration<ConfigChangeListe
if (null != response && null != response.getValue()) {
Object value = response.getValue();
if (value instanceof GetValue) {
- configFuture.setResult(((GetValue) value).getDecodedValue());
+ configFuture.setResult(((GetValue)value).getDecodedValue());
} else {
configFuture.setResult(value);
}
@@ -218,59 +205,58 @@ public class ConsulConfiguration extends AbstractConfiguration<ConfigChangeListe
}
/**
- * the type config change notifier
+ * The type Consul listener.
*/
- private class ConfigChangeNotifier implements Runnable {
+ public class ConsulListener implements ConfigurationChangeListener {
+
+ private final ConfigurationChangeListener listener;
private final String dataId;
- private final ConfigChangeListener listener;
private long consulIndex;
- private boolean running;
-
- public ConfigChangeNotifier(String dataId, ConfigChangeListener listener) {
- this.dataId = dataId;
- this.listener = listener;
- this.consulIndex = getConsulClient().getKVValue(this.dataId).getConsulIndex();
- this.running = true;
- }
+ private final ExecutorService executor = new ThreadPoolExecutor(CORE_LISTENER_THREAD, MAX_LISTENER_THREAD, 0L,
+ TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(),
+ new NamedThreadFactory("consulListener", MAX_LISTENER_THREAD));
/**
- * get the listener
+ * Instantiates a new Consul listener.
*
- * @return
+ * @param dataId the data id
+ * @param listener the listener
*/
- public ConfigChangeListener getListener() {
- return this.listener;
+ public ConsulListener(String dataId, ConfigurationChangeListener listener) {
+ this.dataId = dataId;
+ this.listener = listener;
+ this.consulIndex = getConsulClient().getKVValue(dataId).getConsulIndex();
}
@Override
- public void run() {
- while (running) {
- process();
- }
- }
-
- /**
- * process
- */
- private void process() {
- QueryParams queryParams = new QueryParams(DEFAULT_WATCH_TIMEOUT, consulIndex);
- Response<GetValue> response = getConsulClient().getKVValue(this.dataId, queryParams);
- Long currentIndex = response.getConsulIndex();
- if (currentIndex != null && currentIndex > consulIndex) {
- GetValue getValue = response.getValue();
- consulIndex = currentIndex;
- for (ConfigChangeListener listener : configListenersMap.get(this.dataId)) {
- listener.receiveConfigInfo(getValue.getDecodedValue());
+ public void onChangeEvent(ConfigurationChangeEvent event) {
+ if (null != listener) {
+ while (true) {
+ QueryParams queryParams = new QueryParams(DEFAULT_WATCH_TIMEOUT, consulIndex);
+ Response<GetValue> response = getConsulClient().getKVValue(this.dataId, queryParams);
+ Long currentIndex = response.getConsulIndex();
+ if (currentIndex != null && currentIndex > consulIndex) {
+ GetValue getValue = response.getValue();
+ consulIndex = currentIndex;
+ event.setDataId(dataId).setNewValue(getValue.getDecodedValue());
+ listener.onChangeEvent(event);
+ }
}
}
+ }
+ @Override
+ public ExecutorService getExecutorService() {
+ return executor;
}
/**
- * stop the notifier
+ * Gets target listener.
+ *
+ * @return the target listener
*/
- public void stop() {
- this.running = false;
+ public ConfigurationChangeListener getTargetListener() {
+ return this.listener;
}
}
-}
\ No newline at end of file
+}
diff --git a/config/seata-config-consul/src/main/java/io/seata/config/consul/ConsulConfigurationProvider.java b/config/seata-config-consul/src/main/java/io/seata/config/consul/ConsulConfigurationProvider.java
index 6fb48f8f03836d44bd8078c92d0912f65f4b45f7..7113b8953a8c48da616f6318d9fed9bc33084d77 100644
--- a/config/seata-config-consul/src/main/java/io/seata/config/consul/ConsulConfigurationProvider.java
+++ b/config/seata-config-consul/src/main/java/io/seata/config/consul/ConsulConfigurationProvider.java
@@ -21,7 +21,6 @@ import io.seata.config.ConfigurationProvider;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/05/05
*/
@LoadLevel(name = "Consul", order = 1)
public class ConsulConfigurationProvider implements ConfigurationProvider {
@@ -29,4 +28,4 @@ public class ConsulConfigurationProvider implements ConfigurationProvider {
public Configuration provide() {
return ConsulConfiguration.getInstance();
}
-}
\ No newline at end of file
+}
diff --git a/config/seata-config-core/src/main/java/io/seata/config/AbstractConfiguration.java b/config/seata-config-core/src/main/java/io/seata/config/AbstractConfiguration.java
index 4402cfcc3054cb4e98f0e0ff53f9965293430c3d..71a5ce4bf7826efa2fe50c237e9c38558ca57cb6 100644
--- a/config/seata-config-core/src/main/java/io/seata/config/AbstractConfiguration.java
+++ b/config/seata-config-core/src/main/java/io/seata/config/AbstractConfiguration.java
@@ -23,11 +23,9 @@ import java.time.Duration;
/**
* The type Abstract configuration.
*
- * @param <T> the type parameter
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /2/1
+ * @author slievrly
*/
-public abstract class AbstractConfiguration<T> implements Configuration<T> {
+public abstract class AbstractConfiguration implements Configuration {
/**
* The constant DEFAULT_CONFIG_TIMEOUT.
diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigChangeListener.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigChangeListener.java
index 8cca750f4d4a516302ca471837d5bec183734a2a..d67f2e4b8f1d45184410492be1a59d019f1873ee 100644
--- a/config/seata-config-core/src/main/java/io/seata/config/ConfigChangeListener.java
+++ b/config/seata-config-core/src/main/java/io/seata/config/ConfigChangeListener.java
@@ -20,8 +20,7 @@ import java.util.concurrent.ExecutorService;
/**
* The interface Config change listener.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/20
+ * @author slievrly
*/
public interface ConfigChangeListener {
diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigFuture.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigFuture.java
index fb8ac11b0bd02ede69f692967b608827e83d1905..24dad52b7e1ec75780f52ccf492b797dac89bf22 100644
--- a/config/seata-config-core/src/main/java/io/seata/config/ConfigFuture.java
+++ b/config/seata-config-core/src/main/java/io/seata/config/ConfigFuture.java
@@ -15,28 +15,30 @@
*/
package io.seata.config;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
+import io.seata.common.exception.ShouldNeverHappenException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
/**
* The type Config future.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/20
+ * @author slievrly
*/
public class ConfigFuture {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigFuture.class);
private static final long DEFAULT_CONFIG_TIMEOUT = 5 * 1000;
private long timeoutMills;
private long start = System.currentTimeMillis();
- private volatile Object result;
private String dataId;
private String content;
private ConfigOperation operation;
- private final CountDownLatch latch = new CountDownLatch(1);
+ private transient CompletableFuture<Object> origin = new CompletableFuture<>();
/**
* Instantiates a new Config future.
@@ -91,15 +93,17 @@ public class ConfigFuture {
*/
public Object get(long timeout, TimeUnit unit) {
this.timeoutMills = unit.toMillis(timeout);
+ Object result;
try {
- boolean success = latch.await(timeout, unit);
- if (!success) {
- LOGGER.error(
+ result = origin.get(timeout, unit);
+ } catch (ExecutionException e) {
+ throw new ShouldNeverHappenException("Should not get results in a multi-threaded environment", e);
+ } catch (TimeoutException e) {
+ LOGGER.error(
"config operation timeout,cost:" + (System.currentTimeMillis() - start) + " ms,op:" + operation
- .name()
- + ",dataId:" + dataId);
- return getFailResult();
- }
+ .name()
+ + ",dataId:" + dataId);
+ return getFailResult();
} catch (InterruptedException exx) {
LOGGER.error("config operate interrupted,error:" + exx.getMessage());
return getFailResult();
@@ -125,8 +129,7 @@ public class ConfigFuture {
* @param result the result
*/
public void setResult(Object result) {
- this.result = result;
- latch.countDown();
+ origin.complete(result);
}
/**
diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigType.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigType.java
index 935321e506586081ad4e18b22a04b6e6873f856f..27fbd702d40331eae8d916d798835b5f2764a17e 100644
--- a/config/seata-config-core/src/main/java/io/seata/config/ConfigType.java
+++ b/config/seata-config-core/src/main/java/io/seata/config/ConfigType.java
@@ -18,8 +18,7 @@ package io.seata.config;
/**
* The enum Config type.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /2/1
+ * @author slievrly
*/
public enum ConfigType {
/**
diff --git a/config/seata-config-core/src/main/java/io/seata/config/Configuration.java b/config/seata-config-core/src/main/java/io/seata/config/Configuration.java
index a7c4cea4003abf71e66269e07c90b787724299d0..b0210f11bfd2b4c127c15a91edf79e012258698a 100644
--- a/config/seata-config-core/src/main/java/io/seata/config/Configuration.java
+++ b/config/seata-config-core/src/main/java/io/seata/config/Configuration.java
@@ -16,16 +16,14 @@
package io.seata.config;
import java.time.Duration;
-import java.util.List;
+import java.util.Set;
/**
* The interface Configuration.
*
- * @param <T> the type parameter
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/20
+ * @author slievrly
*/
-public interface Configuration<T> {
+public interface Configuration {
/**
* Gets short.
@@ -259,7 +257,7 @@ public interface Configuration<T> {
* @param dataId the data id
* @param listener the listener
*/
- void addConfigListener(String dataId, T listener);
+ void addConfigListener(String dataId, ConfigurationChangeListener listener);
/**
* Remove config listener.
@@ -267,7 +265,7 @@ public interface Configuration<T> {
* @param dataId the data id
* @param listener the listener
*/
- void removeConfigListener(String dataId, T listener);
+ void removeConfigListener(String dataId, ConfigurationChangeListener listener);
/**
* Gets config listeners.
@@ -275,7 +273,7 @@ public interface Configuration<T> {
* @param dataId the data id
* @return the config listeners
*/
- List<T> getConfigListeners(String dataId);
+ Set<ConfigurationChangeListener> getConfigListeners(String dataId);
/**
* Gets config from sys pro.
diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeEvent.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeEvent.java
new file mode 100644
index 0000000000000000000000000000000000000000..45bc2e4ec092cf5c3a9297e0982cfd2bb90244ca
--- /dev/null
+++ b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeEvent.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.config;
+
+/**
+ * The type Configuration change event.
+ *
+ * @author slievrly
+ */
+public class ConfigurationChangeEvent {
+
+ private String dataId;
+ private String oldValue;
+ private String newValue;
+ private String namespace;
+ private ConfigurationChangeType changeType;
+ private static final String DEFAULT_NAMESPACE = "DEFAULT";
+
+
+ public ConfigurationChangeEvent(){
+
+ }
+
+ public ConfigurationChangeEvent(String dataId, String newValue) {
+ this(dataId, DEFAULT_NAMESPACE, null, newValue, ConfigurationChangeType.MODIFY);
+ }
+
+ public ConfigurationChangeEvent(String dataId, String namespace, String oldValue, String newValue,
+ ConfigurationChangeType type) {
+ this.dataId = dataId;
+ this.namespace = namespace;
+ this.oldValue = oldValue;
+ this.newValue = newValue;
+ this.changeType = type;
+ }
+
+ /**
+ * Gets data id.
+ *
+ * @return the data id
+ */
+ public String getDataId() {
+ return dataId;
+ }
+
+ /**
+ * Sets data id.
+ *
+ * @param dataId the data id
+ */
+ public ConfigurationChangeEvent setDataId(String dataId) {
+ this.dataId = dataId;
+ return this;
+ }
+
+ /**
+ * Gets old value.
+ *
+ * @return the old value
+ */
+ public String getOldValue() {
+ return oldValue;
+ }
+
+ /**
+ * Sets old value.
+ *
+ * @param oldValue the old value
+ */
+ public ConfigurationChangeEvent setOldValue(String oldValue) {
+ this.oldValue = oldValue;
+ return this;
+ }
+
+ /**
+ * Gets new value.
+ *
+ * @return the new value
+ */
+ public String getNewValue() {
+ return newValue;
+ }
+
+ /**
+ * Sets new value.
+ *
+ * @param newValue the new value
+ */
+ public ConfigurationChangeEvent setNewValue(String newValue) {
+ this.newValue = newValue;
+ return this;
+ }
+
+ /**
+ * Gets change type.
+ *
+ * @return the change type
+ */
+ public ConfigurationChangeType getChangeType() {
+ return changeType;
+ }
+
+ /**
+ * Sets change type.
+ *
+ * @param changeType the change type
+ */
+ public ConfigurationChangeEvent setChangeType(ConfigurationChangeType changeType) {
+ this.changeType = changeType;
+ return this;
+ }
+
+ /**
+ * Gets namespace.
+ *
+ * @return the namespace
+ */
+ public String getNamespace() {
+ return namespace;
+ }
+
+ /**
+ * Sets namespace.
+ *
+ * @param namespace the namespace
+ */
+ public ConfigurationChangeEvent setNamespace(String namespace) {
+ this.namespace = namespace;
+ return this;
+ }
+}
diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeListener.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeListener.java
new file mode 100644
index 0000000000000000000000000000000000000000..fd74d45193dd98be4b25a7d4890d665a9164e7a6
--- /dev/null
+++ b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeListener.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.config;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import io.seata.common.thread.NamedThreadFactory;
+
+/**
+ * The interface Configuration change listener.
+ *
+ * @author slievrly
+ */
+public interface ConfigurationChangeListener {
+
+ /**
+ * The constant CORE_LISTENER_THREAD.
+ */
+ int CORE_LISTENER_THREAD = 1;
+ /**
+ * The constant MAX_LISTENER_THREAD.
+ */
+ int MAX_LISTENER_THREAD = 1;
+ /**
+ * The constant EXECUTOR_SERVICE.
+ */
+ ExecutorService EXECUTOR_SERVICE = new ThreadPoolExecutor(CORE_LISTENER_THREAD, MAX_LISTENER_THREAD,
+ Integer.MAX_VALUE, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(),
+ new NamedThreadFactory("configListenerOperate", MAX_LISTENER_THREAD));
+
+ /**
+ * Process.
+ *
+ * @param event the event
+ */
+ void onChangeEvent(ConfigurationChangeEvent event);
+
+ /**
+ * On process event.
+ *
+ * @param event the event
+ */
+ default void onProcessEvent(ConfigurationChangeEvent event) {
+ getExecutorService().submit(() -> {
+ beforeEvent();
+ onChangeEvent(event);
+ afterEvent();
+ });
+ }
+
+ /**
+ * On shut down.
+ */
+ default void onShutDown() {
+ getExecutorService().shutdownNow();
+ }
+
+ /**
+ * Gets executor service.
+ *
+ * @return the executor service
+ */
+ default ExecutorService getExecutorService() {
+ return EXECUTOR_SERVICE;
+ }
+
+ /**
+ * Before event.
+ */
+ default void beforeEvent() {
+
+ }
+
+ /**
+ * After event.
+ */
+ default void afterEvent() {
+
+ }
+}
diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeType.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeType.java
new file mode 100644
index 0000000000000000000000000000000000000000..d0ca07f508db77c68dff817b7a66c54bca334e7f
--- /dev/null
+++ b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationChangeType.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.config;
+
+/**
+ * The enum Configuration change type.
+ *
+ * @author slievrly
+ */
+public enum ConfigurationChangeType {
+ /**
+ * Add configuration change type.
+ */
+ ADD,
+ /**
+ * Modify configuration change type.
+ */
+ MODIFY,
+ /**
+ * Delete configuration change type.
+ */
+ DELETE
+}
diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationFactory.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationFactory.java
index e0c574315edefa00ef1eb01d5362d8ccd32ecfab..b8e69dfe2f79a0f9cceab100cc141add392ffebb 100644
--- a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationFactory.java
+++ b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationFactory.java
@@ -19,14 +19,19 @@ import java.util.Objects;
import io.seata.common.exception.NotSupportYetException;
import io.seata.common.loader.EnhancedServiceLoader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The type Configuration factory.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
* @author Geng Zhang
*/
public final class ConfigurationFactory {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationFactory.class);
+
private static final String REGISTRY_CONF_PREFIX = "registry";
private static final String REGISTRY_CONF_SUFFIX = ".conf";
private static final String ENV_SYSTEM_KEY = "SEATA_ENV";
@@ -50,8 +55,19 @@ public final class ConfigurationFactory {
if (null == envValue) {
envValue = System.getenv(ENV_SYSTEM_KEY);
}
- CURRENT_FILE_INSTANCE = (null == envValue) ? new FileConfiguration(seataConfigName + REGISTRY_CONF_SUFFIX)
- : new FileConfiguration(seataConfigName + "-" + envValue + REGISTRY_CONF_SUFFIX);
+ Configuration configuration = (null == envValue) ? new FileConfiguration(seataConfigName + REGISTRY_CONF_SUFFIX,
+ false) : new FileConfiguration(seataConfigName + "-" + envValue + REGISTRY_CONF_SUFFIX, false);
+ Configuration extConfiguration = null;
+ try {
+ extConfiguration = EnhancedServiceLoader.load(ExtConfigurationProvider.class).provide(configuration);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("load extConfiguration:{}",
+ extConfiguration == null ? null : extConfiguration.getClass().getSimpleName());
+ }
+ } catch (Exception e) {
+ LOGGER.warn("failed to load extConfiguration:{}", e.getMessage(), e);
+ }
+ CURRENT_FILE_INSTANCE = null == extConfiguration ? configuration : extConfiguration;
}
private static final String NAME_KEY = "name";
@@ -88,10 +104,21 @@ public final class ConfigurationFactory {
}
if (ConfigType.File == configType) {
String pathDataId = ConfigurationKeys.FILE_ROOT_CONFIG + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR
- + FILE_TYPE + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR
- + NAME_KEY;
+ + FILE_TYPE + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + NAME_KEY;
String name = CURRENT_FILE_INSTANCE.getConfig(pathDataId);
- return new FileConfiguration(name);
+ Configuration configuration = new FileConfiguration(name);
+ Configuration extConfiguration = null;
+ try {
+ extConfiguration = EnhancedServiceLoader.load(ExtConfigurationProvider.class).provide(configuration);
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("load extConfiguration:{}",
+ extConfiguration == null ? null : extConfiguration.getClass().getSimpleName());
+ }
+ } catch (Exception e) {
+ LOGGER.warn("failed to load extConfiguration:{}", e.getMessage(), e);
+ }
+
+ return null == extConfiguration ? configuration : extConfiguration;
} else {
return EnhancedServiceLoader.load(ConfigurationProvider.class, Objects.requireNonNull(configType).name())
.provide();
diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationKeys.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationKeys.java
index 2a520d9047f73f4dca57a338eabef62148997731..077a8cdc43c29d8137fdf5938275101632754c47 100644
--- a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationKeys.java
+++ b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationKeys.java
@@ -18,8 +18,7 @@ package io.seata.config;
/**
* The type Configuration keys.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /02/26
+ * @author slievrly
*/
public final class ConfigurationKeys {
/**
@@ -30,6 +29,10 @@ public final class ConfigurationKeys {
* The constant FILE_ROOT_CONFIG.
*/
public static final String FILE_ROOT_CONFIG = "config";
+ /**
+ * The constant SEATA_FILE_ROOT_CONFIG
+ */
+ public static final String SEATA_FILE_ROOT_CONFIG = "seata";
/**
* The constant FILE_CONFIG_SPLIT_CHAR.
*/
diff --git a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationProvider.java b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationProvider.java
index 2d2772654f2a323fd1a9be6bf750617a18056bf5..c868323e40495ecc148cf98d7096032a16d8a017 100644
--- a/config/seata-config-core/src/main/java/io/seata/config/ConfigurationProvider.java
+++ b/config/seata-config-core/src/main/java/io/seata/config/ConfigurationProvider.java
@@ -18,7 +18,6 @@ package io.seata.config;
/**
* the interface configuration provider
* @author xingfudeshi@gmail.com
- * @date 2019/04/12
*/
public interface ConfigurationProvider {
/**
diff --git a/config/seata-config-core/src/main/java/io/seata/config/ExtConfigurationProvider.java b/config/seata-config-core/src/main/java/io/seata/config/ExtConfigurationProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..cc94b67c5a526dcab08fe03a28c13628772650f6
--- /dev/null
+++ b/config/seata-config-core/src/main/java/io/seata/config/ExtConfigurationProvider.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.config;
+
+/**
+ * the interface ext configuration provider
+ * @author xingfudeshi@gmail.com
+ */
+public interface ExtConfigurationProvider {
+ /**
+ * provide a AbstractConfiguration implementation instance
+ * @param originalConfiguration
+ * @return configuration
+ */
+ Configuration provide(Configuration originalConfiguration);
+}
diff --git a/config/seata-config-core/src/main/java/io/seata/config/FileConfiguration.java b/config/seata-config-core/src/main/java/io/seata/config/FileConfiguration.java
index 53efa008d144c029aba7d4ba28dfc42344f3d75e..a5b3d29f44a9fb88b9505e1b54311a9ca7d000d2 100644
--- a/config/seata-config-core/src/main/java/io/seata/config/FileConfiguration.java
+++ b/config/seata-config-core/src/main/java/io/seata/config/FileConfiguration.java
@@ -16,9 +16,10 @@
package io.seata.config;
import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
+import java.net.URL;
+import java.util.HashMap;
import java.util.Map;
+import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
@@ -28,6 +29,7 @@ import java.util.concurrent.TimeUnit;
import com.typesafe.config.Config;
import com.typesafe.config.ConfigFactory;
+import io.netty.util.internal.ConcurrentSet;
import io.seata.common.thread.NamedThreadFactory;
import io.seata.config.ConfigFuture.ConfigOperation;
import org.apache.commons.lang.ObjectUtils;
@@ -37,40 +39,47 @@ import org.slf4j.LoggerFactory;
/**
* The type FileConfiguration.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/10
+ * @author slievrly
*/
-public class FileConfiguration extends AbstractConfiguration<ConfigChangeListener> {
+public class FileConfiguration extends AbstractConfiguration {
private static final Logger LOGGER = LoggerFactory.getLogger(FileConfiguration.class);
- private final Config fileConfig;
+ private Config fileConfig;
private ExecutorService configOperateExecutor;
- private ExecutorService configChangeExecutor;
-
private static final int CORE_CONFIG_OPERATE_THREAD = 1;
- private static final int CORE_CONFIG_CHANGE_THREAD = 1;
-
private static final int MAX_CONFIG_OPERATE_THREAD = 2;
private static final long LISTENER_CONFIG_INTERNAL = 1 * 1000;
private static final String REGISTRY_TYPE = "file";
-
+
private static final String SYS_FILE_RESOURCE_PREFIX = "file:";
- private final ConcurrentMap<String, List<ConfigChangeListener>> configListenersMap = new ConcurrentHashMap<>(8);
+ private final ConcurrentMap<String, Set<ConfigurationChangeListener>> configListenersMap = new ConcurrentHashMap<>(
+ 8);
+
+ private final Map<String, String> listenedConfigMap = new HashMap<>(8);
+
+ private final String targetFilePath;
+
+ private volatile long targetFileLastModified;
+
+ private final String name;
- private final ConcurrentMap<String, String> listenedConfigMap = new ConcurrentHashMap<>(8);
+ private final boolean allowDynamicRefresh;
/**
- * Instantiates a new File configuration.
+ * Note that:this constructor is only used to create proxy with CGLIB
+ * see io.seata.spring.boot.autoconfigure.provider.SpringBootConfigurationProvider#provide
*/
public FileConfiguration() {
- this(null);
+ this.name = null;
+ this.targetFilePath = null;
+ this.allowDynamicRefresh = false;
}
/**
@@ -79,22 +88,54 @@ public class FileConfiguration extends AbstractConfiguration<ConfigChangeListene
* @param name the name
*/
public FileConfiguration(String name) {
+ this(name, true);
+ }
+
+ /**
+ * Instantiates a new File configuration.
+ *
+ * @param name the name
+ * @param allowDynamicRefresh the allow dynamic refresh
+ */
+ public FileConfiguration(String name, boolean allowDynamicRefresh) {
+ LOGGER.info("The file name of the operation is {}", name);
if (null == name) {
- fileConfig = ConfigFactory.load();
+ throw new IllegalArgumentException("name can't be null");
+ } else if (name.startsWith(SYS_FILE_RESOURCE_PREFIX)) {
+ File targetFile = new File(name.substring(SYS_FILE_RESOURCE_PREFIX.length()));
+ if (targetFile.exists()) {
+ targetFilePath = targetFile.getPath();
+ Config appConfig = ConfigFactory.parseFileAnySyntax(targetFile);
+ fileConfig = ConfigFactory.load(appConfig);
+ } else {
+ targetFilePath = null;
+ }
+ } else {
+ URL resource = this.getClass().getClassLoader().getResource(name);
+ if (null != resource) {
+ targetFilePath = resource.getPath();
+ fileConfig = ConfigFactory.load(name);
+
+ } else {
+ targetFilePath = null;
+ }
}
- else if (name.startsWith(SYS_FILE_RESOURCE_PREFIX)) {
- Config appConfig = ConfigFactory.parseFileAnySyntax(new File(name.substring(SYS_FILE_RESOURCE_PREFIX.length())));
- fileConfig = ConfigFactory.load(appConfig);
+ /**
+ * For seata-server side the conf file should always exists.
+ * For application(or client) side,conf file may not exists when using seata-spring-boot-starter
+ */
+ if (null == targetFilePath) {
+ fileConfig = ConfigFactory.load();
+ this.allowDynamicRefresh = false;
} else {
- fileConfig = ConfigFactory.load(name);
+ targetFileLastModified = new File(targetFilePath).lastModified();
+ this.allowDynamicRefresh = allowDynamicRefresh;
}
+
+ this.name = name;
configOperateExecutor = new ThreadPoolExecutor(CORE_CONFIG_OPERATE_THREAD, MAX_CONFIG_OPERATE_THREAD,
- Integer.MAX_VALUE, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(),
+ Integer.MAX_VALUE, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(),
new NamedThreadFactory("configOperate", MAX_CONFIG_OPERATE_THREAD));
- configChangeExecutor = new ThreadPoolExecutor(CORE_CONFIG_CHANGE_THREAD, CORE_CONFIG_CHANGE_THREAD,
- Integer.MAX_VALUE, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(),
- new NamedThreadFactory("configChange", CORE_CONFIG_CHANGE_THREAD));
- configChangeExecutor.submit(new ConfigChangeRunnable());
}
@Override
@@ -130,40 +171,35 @@ public class FileConfiguration extends AbstractConfiguration<ConfigChangeListene
}
@Override
- public void addConfigListener(String dataId, ConfigChangeListener listener) {
- configListenersMap.putIfAbsent(dataId, new ArrayList<ConfigChangeListener>());
- configListenersMap.get(dataId).add(listener);
- listenedConfigMap.putIfAbsent(dataId, getConfig(dataId));
- if (null != listener.getExecutor()) {
- ConfigChangeRunnable configChangeTask = new ConfigChangeRunnable(dataId, listener);
- listener.getExecutor().submit(configChangeTask);
+ public void addConfigListener(String dataId, ConfigurationChangeListener listener) {
+ if (null == dataId || null == listener) {
+ return;
}
+ configListenersMap.putIfAbsent(dataId, new ConcurrentSet<>());
+ configListenersMap.get(dataId).add(listener);
+ listenedConfigMap.put(dataId, getConfig(dataId));
+ FileListener fileListener = new FileListener(dataId, listener);
+ fileListener.onProcessEvent(new ConfigurationChangeEvent());
}
@Override
- public void removeConfigListener(String dataId, ConfigChangeListener listener) {
- List<ConfigChangeListener> configChangeListeners = getConfigListeners(dataId);
- if (configChangeListeners == null) {
+ public void removeConfigListener(String dataId, ConfigurationChangeListener listener) {
+ Set<ConfigurationChangeListener> configChangeListeners = getConfigListeners(dataId);
+ if (dataId == null || configChangeListeners == null) {
return;
}
- List<ConfigChangeListener> newChangeListenerList = new ArrayList<>();
- for (ConfigChangeListener changeListener : configChangeListeners) {
- if (!changeListener.equals(listener)) {
- newChangeListenerList.add(changeListener);
+ if (configListenersMap.containsKey(dataId)) {
+ configListenersMap.get(dataId).remove(listener);
+ if (configListenersMap.get(dataId).isEmpty()) {
+ configListenersMap.remove(dataId);
+ listenedConfigMap.remove(dataId);
}
}
- configListenersMap.put(dataId, newChangeListenerList);
- if (newChangeListenerList.isEmpty()) {
- listenedConfigMap.remove(dataId);
- }
- if (null != listener.getExecutor()) {
- listener.getExecutor().shutdownNow();
- }
-
+ listener.onShutDown();
}
@Override
- public List<ConfigChangeListener> getConfigListeners(String dataId) {
+ public Set<ConfigurationChangeListener> getConfigListeners(String dataId) {
return configListenersMap.get(dataId);
}
@@ -196,6 +232,22 @@ public class FileConfiguration extends AbstractConfiguration<ConfigChangeListene
return;
}
try {
+ if (allowDynamicRefresh) {
+ long tempLastModified = new File(targetFilePath).lastModified();
+ if (tempLastModified > targetFileLastModified) {
+ Config tempConfig;
+ if (name.startsWith(SYS_FILE_RESOURCE_PREFIX)) {
+ Config appConfig = ConfigFactory.parseFileAnySyntax(new File(targetFilePath));
+ tempConfig = ConfigFactory.load(appConfig);
+ } else {
+ tempConfig = ConfigFactory.load(name);
+ }
+ if (null != tempConfig) {
+ fileConfig = tempConfig;
+ targetFileLastModified = tempLastModified;
+ }
+ }
+ }
if (configFuture.getOperation() == ConfigOperation.GET) {
String result = fileConfig.getString(configFuture.getDataId());
configFuture.setResult(result);
@@ -229,79 +281,49 @@ public class FileConfiguration extends AbstractConfiguration<ConfigChangeListene
}
/**
- * The type Config change runnable.
+ * The type FileListener.
*/
- class ConfigChangeRunnable implements Runnable {
+ class FileListener implements ConfigurationChangeListener {
- private String dataId;
- private ConfigChangeListener listener;
+ private final String dataId;
+ private final ConfigurationChangeListener listener;
+ private final ExecutorService executor = new ThreadPoolExecutor(CORE_LISTENER_THREAD, MAX_LISTENER_THREAD, 0L,
+ TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(),
+ new NamedThreadFactory("fileListener", MAX_LISTENER_THREAD));
/**
- * Instantiates a new Config change runnable.
- */
- public ConfigChangeRunnable() {
- }
-
- /**
- * Instantiates a new Config change runnable.
+ * Instantiates a new FileListener.
*
* @param dataId the data id
* @param listener the listener
*/
- public ConfigChangeRunnable(String dataId, ConfigChangeListener listener) {
-
- if (null == listener.getExecutor()) {
- throw new IllegalArgumentException("getExecutor is null.");
- }
+ public FileListener(String dataId, ConfigurationChangeListener listener) {
this.dataId = dataId;
this.listener = listener;
}
@Override
- public void run() {
+ public void onChangeEvent(ConfigurationChangeEvent event) {
while (true) {
try {
- Map<String, List<ConfigChangeListener>> configListenerMap;
- if (null != dataId && null != listener) {
- configListenerMap = new ConcurrentHashMap<>(8);
- configListenerMap.put(dataId, new ArrayList<>());
- configListenerMap.get(dataId).add(listener);
- } else {
- configListenerMap = configListenersMap;
- }
- for (Map.Entry<String, List<ConfigChangeListener>> entry : configListenerMap.entrySet()) {
- String configId = entry.getKey();
- String currentConfig = getConfig(configId);
- if (ObjectUtils.notEqual(currentConfig, listenedConfigMap.get(configId))) {
- listenedConfigMap.put(configId, currentConfig);
- notifyAllListener(configId, configListenerMap.get(configId));
-
- }
+ String currentConfig = getConfig(dataId);
+ String oldConfig = listenedConfigMap.get(dataId);
+ if (ObjectUtils.notEqual(currentConfig, oldConfig)) {
+ listenedConfigMap.put(dataId, currentConfig);
+ event.setDataId(dataId).setNewValue(currentConfig).setOldValue(oldConfig);
+ listener.onChangeEvent(event);
}
Thread.sleep(LISTENER_CONFIG_INTERNAL);
} catch (Exception exx) {
- LOGGER.error(exx.getMessage());
+ LOGGER.error("fileListener execute error:{}", exx.getMessage(), exx);
}
-
}
}
- private void notifyAllListener(String dataId, List<ConfigChangeListener> configChangeListeners) {
- List<ConfigChangeListener> needNotifyListeners = new ArrayList<>();
- if (null != dataId && null != listener) {
- needNotifyListeners.addAll(configChangeListeners);
- } else {
- for (ConfigChangeListener configChangeListener : configChangeListeners) {
- if (null == configChangeListener.getExecutor()) {
- needNotifyListeners.add(configChangeListener);
- }
- }
- }
- for (ConfigChangeListener configChangeListener : needNotifyListeners) {
- configChangeListener.receiveConfigInfo(listenedConfigMap.get(dataId));
- }
+ @Override
+ public ExecutorService getExecutorService() {
+ return executor;
}
-
}
}
diff --git a/config/seata-config-core/src/main/resources/file.conf b/config/seata-config-core/src/main/resources/file.conf
index beeea0272d6759a2e1cae0af7c429cfcb3474976..65fe8554e354f86c63f57fc6cabaa9aeba731ee4 100644
--- a/config/seata-config-core/src/main/resources/file.conf
+++ b/config/seata-config-core/src/main/resources/file.conf
@@ -1,68 +1,8 @@
-transport {
- # tcp udt unix-domain-socket
- type = "TCP"
- #NIO NATIVE
- server = "NIO"
- #enable heartbeat
- heartbeat = true
- #thread factory for netty
- thread-factory {
- boss-thread-prefix = "NettyBoss"
- worker-thread-prefix = "NettyServerNIOWorker"
- server-executor-thread-prefix = "NettyServerBizHandler"
- share-boss-worker = false
- client-selector-thread-prefix = "NettyClientSelector"
- client-selector-thread-size = 1
- client-worker-thread-prefix = "NettyClientWorkerThread"
- # netty boss thread size,will not be used for UDT
- boss-thread-size = 1
- #auto default pin or 8
- worker-thread-size = 8
- }
- shutdown {
- # when destroy server, wait seconds
- wait = 3
- }
- serialization = "seata"
- compressor = "none"
-}
service {
- #vgroup->rgroup
+ #transaction service group mapping
vgroup_mapping.my_test_tx_group = "default"
- #only support single node
+ #only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8091"
- #degrade current not support
- enableDegrade = false
- #disable
- disable = false
-}
-
-client {
- async.commit.buffer.limit = 10000
- lock {
- retry.internal = 10
- retry.times = 30
- }
- report.retry.count = 5
- tm.commit.retry.count = 1
- tm.rollback.retry.count = 1
- #schedule check table meta
- table.meta.check.enable = true
-}
-
-transaction {
- undo.data.validation = true
- undo.log.serialization = "jackson"
- undo.log.save.days = 7
- #schedule delete expired undo_log in milliseconds
- undo.log.delete.period = 86400000
- undo.log.table = "undo_log"
-}
-
-support {
- ## spring
- spring {
- # auto proxy the DataSource bean
- datasource.autoproxy = false
- }
+ #disable seata
+ disableGlobalTransaction = false
}
\ No newline at end of file
diff --git a/config/seata-config-core/src/main/resources/registry.conf b/config/seata-config-core/src/main/resources/registry.conf
index 2f2f2adb3010961526ea13e047e88f0c4279afd8..a0c917f8c8db205f6b4b3c8d00805372c93ff94e 100644
--- a/config/seata-config-core/src/main/resources/registry.conf
+++ b/config/seata-config-core/src/main/resources/registry.conf
@@ -8,7 +8,7 @@ registry {
cluster = "default"
}
eureka {
- serviceUrl = "http://localhost:1001/eureka"
+ serviceUrl = "http://localhost:8761/eureka"
application = "default"
weight = "1"
}
diff --git a/config/seata-config-core/src/test/java/io.seata.config/FileConfigurationTest.java b/config/seata-config-core/src/test/java/io.seata.config/FileConfigurationTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..92ac9c7eb0be38df3ca03189e114304134b806d5
--- /dev/null
+++ b/config/seata-config-core/src/test/java/io.seata.config/FileConfigurationTest.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.config;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author slievrly
+ */
+class FileConfigurationTest {
+
+ private Configuration fileConfig = ConfigurationFactory.getInstance();
+
+ @BeforeEach
+ void setUp() {
+ }
+
+ @AfterEach
+ void tearDown() {
+ }
+
+ @Test
+ void addConfigListener() throws InterruptedException {
+ CountDownLatch countDownLatch = new CountDownLatch(1);
+ boolean value = fileConfig.getBoolean("service.disableGlobalTransaction");
+ fileConfig.addConfigListener("service.disableGlobalTransaction", (event) -> {
+ Assertions.assertTrue(
+ Boolean.parseBoolean(event.getNewValue()) == !Boolean.parseBoolean(event.getOldValue()));
+ countDownLatch.countDown();
+ });
+ System.setProperty("service.disableGlobalTransaction", String.valueOf(!value));
+ Assertions.assertTrue(countDownLatch.await(2000, TimeUnit.MILLISECONDS));
+ }
+
+}
diff --git a/config/seata-config-core/src/test/resources/file.conf b/config/seata-config-core/src/test/resources/file.conf
new file mode 100644
index 0000000000000000000000000000000000000000..65fe8554e354f86c63f57fc6cabaa9aeba731ee4
--- /dev/null
+++ b/config/seata-config-core/src/test/resources/file.conf
@@ -0,0 +1,8 @@
+service {
+ #transaction service group mapping
+ vgroup_mapping.my_test_tx_group = "default"
+ #only support when registry.type=file, please don't set multiple addresses
+ default.grouplist = "127.0.0.1:8091"
+ #disable seata
+ disableGlobalTransaction = false
+}
\ No newline at end of file
diff --git a/config/seata-config-core/src/test/resources/registry.conf b/config/seata-config-core/src/test/resources/registry.conf
new file mode 100644
index 0000000000000000000000000000000000000000..a0c917f8c8db205f6b4b3c8d00805372c93ff94e
--- /dev/null
+++ b/config/seata-config-core/src/test/resources/registry.conf
@@ -0,0 +1,73 @@
+registry {
+ # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
+ type = "file"
+
+ nacos {
+ serverAddr = "localhost"
+ namespace = ""
+ cluster = "default"
+ }
+ eureka {
+ serviceUrl = "http://localhost:8761/eureka"
+ application = "default"
+ weight = "1"
+ }
+ redis {
+ serverAddr = "localhost:6379"
+ db = "0"
+ }
+ zk {
+ cluster = "default"
+ serverAddr = "127.0.0.1:2181"
+ session.timeout = 6000
+ connect.timeout = 2000
+ }
+ consul {
+ cluster = "default"
+ serverAddr = "127.0.0.1:8500"
+ }
+ etcd3 {
+ cluster = "default"
+ serverAddr = "http://localhost:2379"
+ }
+ sofa {
+ serverAddr = "127.0.0.1:9603"
+ application = "default"
+ region = "DEFAULT_ZONE"
+ datacenter = "DefaultDataCenter"
+ cluster = "default"
+ group = "SEATA_GROUP"
+ addressWaitTime = "3000"
+ }
+ file {
+ name = "file.conf"
+ }
+}
+
+config {
+ # file、nacos 、apollo、zk、consul、etcd3
+ type = "file"
+
+ nacos {
+ serverAddr = "localhost"
+ namespace = ""
+ }
+ consul {
+ serverAddr = "127.0.0.1:8500"
+ }
+ apollo {
+ app.id = "seata-server"
+ apollo.meta = "http://192.168.1.204:8801"
+ }
+ zk {
+ serverAddr = "127.0.0.1:2181"
+ session.timeout = 6000
+ connect.timeout = 2000
+ }
+ etcd3 {
+ serverAddr = "http://localhost:2379"
+ }
+ file {
+ name = "file.conf"
+ }
+}
\ No newline at end of file
diff --git a/config/seata-config-custom/src/test/java/io/seata/config/CustomConfigurationForTest.java b/config/seata-config-custom/src/test/java/io/seata/config/CustomConfigurationForTest.java
index 86f6413ec630b3cdf176cb3e0907d95f74c6432c..e84ffcfd22293899c2200a3a46bd47087fd7b55f 100644
--- a/config/seata-config-custom/src/test/java/io/seata/config/CustomConfigurationForTest.java
+++ b/config/seata-config-custom/src/test/java/io/seata/config/CustomConfigurationForTest.java
@@ -17,10 +17,10 @@ package io.seata.config;
import java.io.IOException;
import java.io.InputStream;
-import java.util.List;
import java.util.Properties;
+import java.util.Set;
-public class CustomConfigurationForTest extends AbstractConfiguration<ConfigChangeListener> {
+public class CustomConfigurationForTest extends AbstractConfiguration {
private Properties properties;
public CustomConfigurationForTest(String name) {
@@ -58,17 +58,17 @@ public class CustomConfigurationForTest extends AbstractConfiguration<ConfigChan
}
@Override
- public void addConfigListener(String dataId, ConfigChangeListener listener) {
+ public void addConfigListener(String dataId, ConfigurationChangeListener listener) {
throw new UnsupportedOperationException();
}
@Override
- public void removeConfigListener(String dataId, ConfigChangeListener listener) {
+ public void removeConfigListener(String dataId, ConfigurationChangeListener listener) {
throw new UnsupportedOperationException();
}
@Override
- public List<ConfigChangeListener> getConfigListeners(String dataId) {
+ public Set<ConfigurationChangeListener> getConfigListeners(String dataId) {
throw new UnsupportedOperationException();
}
}
diff --git a/config/seata-config-custom/src/test/java/io/seata/config/CustomConfigurationTest.java b/config/seata-config-custom/src/test/java/io/seata/config/CustomConfigurationTest.java
index e4c0829d7223a462dcbef2afef5ae21cb759f173..deba69b589bd1803543f9af33603e1b6962a5c7f 100644
--- a/config/seata-config-custom/src/test/java/io/seata/config/CustomConfigurationTest.java
+++ b/config/seata-config-custom/src/test/java/io/seata/config/CustomConfigurationTest.java
@@ -27,7 +27,7 @@ import java.util.Properties;
public class CustomConfigurationTest {
@Test
public void testCustomConfigLoad() throws Exception {
- Configuration<?> configuration = ConfigurationFactory.getInstance();
+ Configuration configuration = ConfigurationFactory.getInstance();
Assertions.assertTrue(configuration instanceof CustomConfigurationForTest);
Properties properties;
try (InputStream input = CustomConfigurationForTest.class.getClassLoader().getResourceAsStream("custom_for_test.properties")) {
diff --git a/config/seata-config-custom/src/test/resources/custom_for_test.properties b/config/seata-config-custom/src/test/resources/custom_for_test.properties
index bbc0dd5e22ec1cb80606989e24870540aecf6567..5034a7783d04ccaa276911e26460f1294f715bab 100644
--- a/config/seata-config-custom/src/test/resources/custom_for_test.properties
+++ b/config/seata-config-custom/src/test/resources/custom_for_test.properties
@@ -1,3 +1,19 @@
+#
+# Copyright 1999-2019 Seata.io Group.
+#
+# Licensed 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.
+#
+
transport.type=TCP
transport.server=NIO
service.default.grouplist=127.0.0.1:8091
diff --git a/config/seata-config-etcd3/src/main/java/io/seata/config/etcd3/EtcdConfiguration.java b/config/seata-config-etcd3/src/main/java/io/seata/config/etcd3/EtcdConfiguration.java
index 7b5da4075fac948a5df474d21a151f9ce7c72064..accf4425f477fa9e74bfe5180080fff4419194cc 100644
--- a/config/seata-config-etcd3/src/main/java/io/seata/config/etcd3/EtcdConfiguration.java
+++ b/config/seata-config-etcd3/src/main/java/io/seata/config/etcd3/EtcdConfiguration.java
@@ -15,6 +15,16 @@
*/
package io.seata.config.etcd3;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
import io.etcd.jetcd.ByteSequence;
import io.etcd.jetcd.Client;
import io.etcd.jetcd.KeyValue;
@@ -28,66 +38,56 @@ import io.etcd.jetcd.op.CmpTarget;
import io.etcd.jetcd.op.Op;
import io.etcd.jetcd.options.PutOption;
import io.etcd.jetcd.watch.WatchResponse;
+import io.netty.util.internal.ConcurrentSet;
import io.seata.common.exception.ShouldNeverHappenException;
import io.seata.common.thread.NamedThreadFactory;
import io.seata.common.util.CollectionUtils;
import io.seata.config.AbstractConfiguration;
-import io.seata.config.ConfigChangeListener;
import io.seata.config.ConfigFuture;
import io.seata.config.Configuration;
+import io.seata.config.ConfigurationChangeEvent;
+import io.seata.config.ConfigurationChangeListener;
import io.seata.config.ConfigurationFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
import static io.netty.util.CharsetUtil.UTF_8;
import static io.seata.config.ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR;
import static io.seata.config.ConfigurationKeys.FILE_ROOT_CONFIG;
/**
- * @author xingfudeshi@gmail.com
- * @date 2019/05/10
+ * The type Etcd configuration.
+ *
+ * @author xingfudeshi @gmail.com
*/
-public class EtcdConfiguration extends AbstractConfiguration<ConfigChangeListener> {
+public class EtcdConfiguration extends AbstractConfiguration {
private static final Logger LOGGER = LoggerFactory.getLogger(EtcdConfiguration.class);
private static volatile EtcdConfiguration instance;
private static volatile Client client;
- private static final Configuration FILE_CONFIG = ConfigurationFactory.getInstance();
+ private static final Configuration FILE_CONFIG = ConfigurationFactory.CURRENT_FILE_INSTANCE;
private static final String SERVER_ADDR_KEY = "serverAddr";
private static final String CONFIG_TYPE = "etcd3";
- private static final String FILE_CONFIG_KEY_PREFIX = FILE_ROOT_CONFIG + FILE_CONFIG_SPLIT_CHAR + CONFIG_TYPE + FILE_CONFIG_SPLIT_CHAR;
+ private static final String FILE_CONFIG_KEY_PREFIX = FILE_ROOT_CONFIG + FILE_CONFIG_SPLIT_CHAR + CONFIG_TYPE
+ + FILE_CONFIG_SPLIT_CHAR;
private static final int THREAD_POOL_NUM = 1;
private static final int MAP_INITIAL_CAPACITY = 8;
private ExecutorService etcdConfigExecutor;
- private ExecutorService etcdNotifierExecutor;
- private ConcurrentMap<String, List<ConfigChangeListener>> configListenersMap;
- private ConcurrentHashMap<String, List<ConfigChangeNotifier>> configChangeNotifiersMap;
+ private ConcurrentMap<String, Set<ConfigurationChangeListener>> configListenersMap = new ConcurrentHashMap<>(
+ MAP_INITIAL_CAPACITY);
private static final long VERSION_NOT_EXIST = 0;
private EtcdConfiguration() {
- etcdConfigExecutor = new ThreadPoolExecutor(THREAD_POOL_NUM, THREAD_POOL_NUM,
- Integer.MAX_VALUE, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), new NamedThreadFactory("etcd-config-executor", THREAD_POOL_NUM));
- etcdNotifierExecutor = new ThreadPoolExecutor(THREAD_POOL_NUM, THREAD_POOL_NUM,
- Integer.MAX_VALUE, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), new NamedThreadFactory("etcd-config-notifier-executor", THREAD_POOL_NUM));
- configListenersMap = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
- configChangeNotifiersMap = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
+ etcdConfigExecutor = new ThreadPoolExecutor(THREAD_POOL_NUM, THREAD_POOL_NUM, Integer.MAX_VALUE,
+ TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(),
+ new NamedThreadFactory("etcd-config-executor", THREAD_POOL_NUM));
}
/**
* get instance
*
- * @return
+ * @return instance
*/
public static EtcdConfiguration getInstance() {
if (null == instance) {
@@ -100,7 +100,6 @@ public class EtcdConfiguration extends AbstractConfiguration<ConfigChangeListene
return instance;
}
-
@Override
public String getTypeName() {
return CONFIG_TYPE;
@@ -112,21 +111,26 @@ public class EtcdConfiguration extends AbstractConfiguration<ConfigChangeListene
if ((value = getConfigFromSysPro(dataId)) != null) {
return value;
}
- ConfigFuture configFuture = new ConfigFuture(dataId, defaultValue, ConfigFuture.ConfigOperation.GET, timeoutMills);
- etcdConfigExecutor.execute(() -> complete(getClient().getKVClient().get(ByteSequence.from(dataId, UTF_8)), configFuture));
- return (String) configFuture.get();
+ ConfigFuture configFuture = new ConfigFuture(dataId, defaultValue, ConfigFuture.ConfigOperation.GET,
+ timeoutMills);
+ etcdConfigExecutor.execute(
+ () -> complete(getClient().getKVClient().get(ByteSequence.from(dataId, UTF_8)), configFuture));
+ return (String)configFuture.get();
}
@Override
public boolean putConfig(String dataId, String content, long timeoutMills) {
ConfigFuture configFuture = new ConfigFuture(dataId, content, ConfigFuture.ConfigOperation.PUT, timeoutMills);
- etcdConfigExecutor.execute(() -> complete(getClient().getKVClient().put(ByteSequence.from(dataId, UTF_8), ByteSequence.from(content, UTF_8)), configFuture));
- return (Boolean) configFuture.get();
+ etcdConfigExecutor.execute(() -> complete(
+ getClient().getKVClient().put(ByteSequence.from(dataId, UTF_8), ByteSequence.from(content, UTF_8)),
+ configFuture));
+ return (Boolean)configFuture.get();
}
@Override
public boolean putConfigIfAbsent(String dataId, String content, long timeoutMills) {
- ConfigFuture configFuture = new ConfigFuture(dataId, content, ConfigFuture.ConfigOperation.PUTIFABSENT, timeoutMills);
+ ConfigFuture configFuture = new ConfigFuture(dataId, content, ConfigFuture.ConfigOperation.PUTIFABSENT,
+ timeoutMills);
etcdConfigExecutor.execute(() -> {
//use etcd transaction to ensure the atomic operation
complete(client.getKVClient().txn()
@@ -136,7 +140,7 @@ public class EtcdConfiguration extends AbstractConfiguration<ConfigChangeListene
.Then(Op.put(ByteSequence.from(dataId, UTF_8), ByteSequence.from(content, UTF_8), PutOption.DEFAULT))
.commit(), configFuture);
});
- return (Boolean) configFuture.get();
+ return (Boolean)configFuture.get();
}
@Override
@@ -145,53 +149,38 @@ public class EtcdConfiguration extends AbstractConfiguration<ConfigChangeListene
etcdConfigExecutor.execute(() -> {
complete(getClient().getKVClient().delete(ByteSequence.from(dataId, UTF_8)), configFuture);
});
- return (Boolean) configFuture.get();
+ return (Boolean)configFuture.get();
}
@Override
- public void addConfigListener(String dataId, ConfigChangeListener listener) {
- configListenersMap.putIfAbsent(dataId, new ArrayList<>());
- configChangeNotifiersMap.putIfAbsent(dataId, new ArrayList<>());
- ConfigChangeNotifier configChangeNotifier = new ConfigChangeNotifier(dataId, listener);
- configChangeNotifiersMap.get(dataId).add(configChangeNotifier);
- if (null != listener.getExecutor()) {
- listener.getExecutor().submit(configChangeNotifier);
- } else {
- etcdNotifierExecutor.submit(configChangeNotifier);
+ public void addConfigListener(String dataId, ConfigurationChangeListener listener) {
+ if (null == dataId || null == listener) {
+ return;
}
+ configListenersMap.putIfAbsent(dataId, new ConcurrentSet<>());
+ EtcdListener etcdListener = new EtcdListener(dataId, listener);
+ configListenersMap.get(dataId).add(etcdListener);
+ etcdListener.onProcessEvent(new ConfigurationChangeEvent());
}
@Override
- public void removeConfigListener(String dataId, ConfigChangeListener listener) {
- List<ConfigChangeListener> configChangeListeners = getConfigListeners(dataId);
- if (configChangeListeners == null) {
+ public void removeConfigListener(String dataId, ConfigurationChangeListener listener) {
+ Set<ConfigurationChangeListener> configChangeListeners = getConfigListeners(dataId);
+ if (configChangeListeners == null || listener == null) {
return;
}
- List<ConfigChangeListener> newChangeListenerList = new ArrayList<>();
- for (ConfigChangeListener changeListener : configChangeListeners) {
- if (!changeListener.equals(listener)) {
- newChangeListenerList.add(changeListener);
+ for (ConfigurationChangeListener entry : configChangeListeners) {
+ ConfigurationChangeListener target = ((EtcdListener)entry).getTargetListener();
+ if (listener.equals(target)) {
+ entry.onShutDown();
+ configChangeListeners.remove(entry);
+ break;
}
}
- configListenersMap.put(dataId, newChangeListenerList);
- if (null != listener.getExecutor()) {
- listener.getExecutor().shutdownNow();
- }
- //remove and stop the configChangeNotifier
- List<ConfigChangeNotifier> configChangeNotifiers = configChangeNotifiersMap.get(dataId);
- List<ConfigChangeNotifier> newConfigChangeNotifiers = new ArrayList<>();
- for (ConfigChangeNotifier configChangeNotifier : configChangeNotifiers) {
- if (!listener.equals(configChangeNotifier.getListener())) {
- newConfigChangeNotifiers.add(configChangeNotifier);
- } else {
- configChangeNotifier.stop();
- }
- }
- configChangeNotifiersMap.put(dataId, newConfigChangeNotifiers);
}
@Override
- public List getConfigListeners(String dataId) {
+ public Set<ConfigurationChangeListener> getConfigListeners(String dataId) {
return configListenersMap.get(dataId);
}
@@ -204,7 +193,8 @@ public class EtcdConfiguration extends AbstractConfiguration<ConfigChangeListene
if (null == client) {
synchronized (EtcdConfiguration.class) {
if (null == client) {
- client = Client.builder().endpoints(FILE_CONFIG.getConfig(FILE_CONFIG_KEY_PREFIX + SERVER_ADDR_KEY)).build();
+ client = Client.builder().endpoints(FILE_CONFIG.getConfig(FILE_CONFIG_KEY_PREFIX + SERVER_ADDR_KEY))
+ .build();
}
}
}
@@ -222,7 +212,7 @@ public class EtcdConfiguration extends AbstractConfiguration<ConfigChangeListene
try {
T response = completableFuture.get();
if (response instanceof GetResponse) {
- List<KeyValue> keyValues = ((GetResponse) response).getKvs();
+ List<KeyValue> keyValues = ((GetResponse)response).getKvs();
if (CollectionUtils.isNotEmpty(keyValues)) {
ByteSequence value = keyValues.get(0).getValue();
if (null != value) {
@@ -232,7 +222,7 @@ public class EtcdConfiguration extends AbstractConfiguration<ConfigChangeListene
} else if (response instanceof PutResponse) {
configFuture.setResult(Boolean.TRUE);
} else if (response instanceof TxnResponse) {
- boolean result = ((TxnResponse) response).isSucceeded();
+ boolean result = ((TxnResponse)response).isSucceeded();
//create key if file does not exist)
if (result) {
configFuture.setResult(Boolean.TRUE);
@@ -243,19 +233,28 @@ public class EtcdConfiguration extends AbstractConfiguration<ConfigChangeListene
throw new ShouldNeverHappenException("unsupported response type");
}
} catch (Exception e) {
- LOGGER.error("error occurred while completing the future{}", e.getMessage());
+ LOGGER.error("error occurred while completing the future{}", e.getMessage(),e);
}
}
/**
* the type config change notifier
*/
- private class ConfigChangeNotifier implements Runnable {
+ private class EtcdListener implements ConfigurationChangeListener {
private final String dataId;
- private final ConfigChangeListener listener;
+ private final ConfigurationChangeListener listener;
private Watch.Watcher watcher;
+ private final ExecutorService executor = new ThreadPoolExecutor(CORE_LISTENER_THREAD, MAX_LISTENER_THREAD, 0L,
+ TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(),
+ new NamedThreadFactory("etcdListener", MAX_LISTENER_THREAD));
- ConfigChangeNotifier(String dataId, ConfigChangeListener listener) {
+ /**
+ * Instantiates a new Etcd listener.
+ *
+ * @param dataId the data id
+ * @param listener the listener
+ */
+ public EtcdListener(String dataId, ConfigurationChangeListener listener) {
this.dataId = dataId;
this.listener = listener;
}
@@ -263,19 +262,35 @@ public class EtcdConfiguration extends AbstractConfiguration<ConfigChangeListene
/**
* get the listener
*
- * @return ConfigChangeListener
+ * @return ConfigurationChangeListener target listener
*/
- ConfigChangeListener getListener() {
+ public ConfigurationChangeListener getTargetListener() {
return this.listener;
}
@Override
- public void run() {
+ public void onShutDown() {
+ this.watcher.close();
+ getExecutorService().shutdownNow();
+ }
+
+ @Override
+ public void onChangeEvent(ConfigurationChangeEvent event) {
Watch watchClient = getClient().getWatchClient();
watcher = watchClient.watch(ByteSequence.from(dataId, UTF_8), new Watch.Listener() {
+
@Override
- public void onNext(WatchResponse response) {
- notifyListeners();
+ public void onNext(WatchResponse watchResponse) {
+ try {
+ GetResponse getResponse = getClient().getKVClient().get(ByteSequence.from(dataId, UTF_8)).get();
+ List<KeyValue> keyValues = getResponse.getKvs();
+ if (CollectionUtils.isNotEmpty(keyValues)) {
+ event.setDataId(dataId).setNewValue(keyValues.get(0).getValue().toString(UTF_8));
+ listener.onChangeEvent(event);
+ }
+ } catch (Exception e) {
+ LOGGER.error("error occurred while getting value{}", e.getMessage(), e);
+ }
}
@Override
@@ -290,29 +305,9 @@ public class EtcdConfiguration extends AbstractConfiguration<ConfigChangeListene
});
}
- /**
- * notify listeners
- */
- private void notifyListeners() {
- try {
- GetResponse getResponse = getClient().getKVClient().get(ByteSequence.from(dataId, UTF_8)).get();
- List<KeyValue> keyValues = getResponse.getKvs();
- if (CollectionUtils.isNotEmpty(keyValues)) {
- for (ConfigChangeListener listener : configListenersMap.get(this.dataId)) {
- listener.receiveConfigInfo(keyValues.get(0).getValue().toString(UTF_8));
- }
- }
- } catch (Exception e) {
- LOGGER.error("error occurred while getting value{}", e.getMessage());
- }
- }
-
-
- /**
- * stop the notifier
- */
- private void stop() {
- this.watcher.close();
+ @Override
+ public ExecutorService getExecutorService() {
+ return executor;
}
}
}
diff --git a/config/seata-config-etcd3/src/main/java/io/seata/config/etcd3/EtcdConfigurationProvider.java b/config/seata-config-etcd3/src/main/java/io/seata/config/etcd3/EtcdConfigurationProvider.java
index dd146a42a9f751bc413a7c1806edff1232afc749..0bf9094c131a585f7117f1b662243b027c79898f 100644
--- a/config/seata-config-etcd3/src/main/java/io/seata/config/etcd3/EtcdConfigurationProvider.java
+++ b/config/seata-config-etcd3/src/main/java/io/seata/config/etcd3/EtcdConfigurationProvider.java
@@ -21,7 +21,6 @@ import io.seata.config.ConfigurationProvider;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/12
*/
@LoadLevel(name = "Etcd3", order = 1)
public class EtcdConfigurationProvider implements ConfigurationProvider {
diff --git a/config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfiguration.java b/config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfiguration.java
index fe0c1314c07efe0185978f01a1b2fc684e701848..cb4df11aff4154a83c00633984f5a574e79c8bdc 100644
--- a/config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfiguration.java
+++ b/config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfiguration.java
@@ -15,17 +15,21 @@
*/
package io.seata.config.nacos;
-import java.util.List;
import java.util.Properties;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.config.ConfigService;
-import com.alibaba.nacos.api.config.listener.Listener;
+import com.alibaba.nacos.api.config.listener.AbstractSharedListener;
import com.alibaba.nacos.api.exception.NacosException;
import io.seata.common.exception.NotSupportYetException;
import io.seata.config.AbstractConfiguration;
import io.seata.config.Configuration;
+import io.seata.config.ConfigurationChangeEvent;
+import io.seata.config.ConfigurationChangeListener;
import io.seata.config.ConfigurationFactory;
import io.seata.config.ConfigurationKeys;
import org.slf4j.Logger;
@@ -34,10 +38,9 @@ import org.slf4j.LoggerFactory;
/**
* The type Nacos configuration.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /2/1
+ * @author slievrly
*/
-public class NacosConfiguration extends AbstractConfiguration<Listener> {
+public class NacosConfiguration extends AbstractConfiguration {
private static volatile NacosConfiguration instance;
private static final Logger LOGGER = LoggerFactory.getLogger(NacosConfiguration.class);
@@ -48,11 +51,14 @@ public class NacosConfiguration extends AbstractConfiguration<Listener> {
private static final String PRO_NAMESPACE_KEY = "namespace";
private static final Configuration FILE_CONFIG = ConfigurationFactory.CURRENT_FILE_INSTANCE;
private static volatile ConfigService configService;
+ private static final int MAP_INITIAL_CAPACITY = 8;
+ private ConcurrentMap<String, ConcurrentMap<ConfigurationChangeListener, NacosListener>> configListenersMap
+ = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
/**
* Get instance of NacosConfiguration
*
- * @return
+ * @return instance
*/
public static NacosConfiguration getInstance() {
if (null == instance) {
@@ -68,7 +74,7 @@ public class NacosConfiguration extends AbstractConfiguration<Listener> {
/**
* Instantiates a new Nacos configuration.
*/
- public NacosConfiguration() {
+ private NacosConfiguration() {
if (null == configService) {
try {
configService = NacosFactory.createConfigService(getConfigProperties());
@@ -120,22 +126,48 @@ public class NacosConfiguration extends AbstractConfiguration<Listener> {
}
@Override
- public void addConfigListener(String dataId, Listener listener) {
+ public void addConfigListener(String dataId, ConfigurationChangeListener listener) {
+ if (null == dataId || null == listener) {
+ return;
+ }
try {
- configService.addListener(dataId, SEATA_GROUP, listener);
- } catch (NacosException exx) {
- LOGGER.error(exx.getErrMsg());
+ configListenersMap.putIfAbsent(dataId, new ConcurrentHashMap<>());
+ NacosListener nacosListener = new NacosListener(dataId, listener);
+ configListenersMap.get(dataId).put(listener, nacosListener);
+ configService.addListener(dataId, SEATA_GROUP, nacosListener);
+ } catch (Exception exx) {
+ LOGGER.error("add nacos listener error:{}", exx.getMessage(), exx);
}
}
@Override
- public void removeConfigListener(String dataId, Listener listener) {
- configService.removeListener(dataId, SEATA_GROUP, listener);
+ public void removeConfigListener(String dataId, ConfigurationChangeListener listener) {
+ Set<ConfigurationChangeListener> configChangeListeners = getConfigListeners(dataId);
+ if (configChangeListeners == null || listener == null) {
+ return;
+ }
+ for (ConfigurationChangeListener entry : configChangeListeners) {
+ if (listener.equals(entry)) {
+ NacosListener nacosListener = null;
+ if (configListenersMap.containsKey(dataId)) {
+ nacosListener = configListenersMap.get(dataId).get(listener);
+ configListenersMap.get(dataId).remove(entry);
+ }
+ if (null != nacosListener) {
+ configService.removeListener(dataId, SEATA_GROUP, nacosListener);
+ }
+ break;
+ }
+ }
}
@Override
- public List<Listener> getConfigListeners(String dataId) {
- throw new NotSupportYetException("not support getConfigListeners");
+ public Set<ConfigurationChangeListener> getConfigListeners(String dataId) {
+ if (configListenersMap.containsKey(dataId)) {
+ return configListenersMap.get(dataId).keySet();
+ } else {
+ return null;
+ }
}
private static Properties getConfigProperties() {
@@ -163,18 +195,51 @@ public class NacosConfiguration extends AbstractConfiguration<Listener> {
private static String getNacosNameSpaceFileKey() {
return ConfigurationKeys.FILE_ROOT_CONFIG + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + CONFIG_TYPE
- + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR
- + PRO_NAMESPACE_KEY;
+ + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + PRO_NAMESPACE_KEY;
}
private static String getNacosAddrFileKey() {
return ConfigurationKeys.FILE_ROOT_CONFIG + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + CONFIG_TYPE
- + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR
- + PRO_SERVER_ADDR_KEY;
+ + ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR + PRO_SERVER_ADDR_KEY;
}
@Override
public String getTypeName() {
return CONFIG_TYPE;
}
+
+ /**
+ * Non-blocking subscriptions prohibit adding subscriptions in the thread pool to prevent thread termination
+ */
+ public class NacosListener extends AbstractSharedListener {
+ private final String dataId;
+ private final ConfigurationChangeListener listener;
+
+ /**
+ * Instantiates a new Nacos listener.
+ *
+ * @param dataId the data id
+ * @param listener the listener
+ */
+ public NacosListener(String dataId, ConfigurationChangeListener listener) {
+ this.dataId = dataId;
+ this.listener = listener;
+ }
+
+ /**
+ * Gets target listener.
+ *
+ * @return the target listener
+ */
+ public ConfigurationChangeListener getTargetListener() {
+ return this.listener;
+ }
+
+ @Override
+ public void innerReceive(String dataId, String group, String configInfo) {
+ ConfigurationChangeEvent event = new ConfigurationChangeEvent().setDataId(dataId).setNewValue(configInfo)
+ .setNamespace(group);
+ listener.onProcessEvent(event);
+ }
+ }
}
diff --git a/config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfigurationProvider.java b/config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfigurationProvider.java
index 1dac870fdf111be08246341b697a4cffdf7a7a33..63d3582dabd76641266b4f890cd6b1512b02285f 100644
--- a/config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfigurationProvider.java
+++ b/config/seata-config-nacos/src/main/java/io/seata/config/nacos/NacosConfigurationProvider.java
@@ -21,7 +21,6 @@ import io.seata.config.ConfigurationProvider;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/12
*/
@LoadLevel(name = "Nacos", order = 1)
public class NacosConfigurationProvider implements ConfigurationProvider {
diff --git a/config/seata-config-spring-cloud/src/main/java/io/seata/config/springcloud/SpringCloudConfiguration.java b/config/seata-config-spring-cloud/src/main/java/io/seata/config/springcloud/SpringCloudConfiguration.java
index 111d9f07b495a5e33dd08b124b0129490f8fa868..931dca82b9fd611cec8f385a10cae43a0c4710d0 100644
--- a/config/seata-config-spring-cloud/src/main/java/io/seata/config/springcloud/SpringCloudConfiguration.java
+++ b/config/seata-config-spring-cloud/src/main/java/io/seata/config/springcloud/SpringCloudConfiguration.java
@@ -15,18 +15,18 @@
*/
package io.seata.config.springcloud;
+import java.util.Set;
+
import io.seata.common.util.StringUtils;
import io.seata.config.AbstractConfiguration;
-import io.seata.config.ConfigChangeListener;
-
-import java.util.List;
+import io.seata.config.ConfigurationChangeListener;
-
-public class SpringCloudConfiguration extends AbstractConfiguration<ConfigChangeListener> {
+public class SpringCloudConfiguration extends AbstractConfiguration {
private static final String CONFIG_TYPE = "SpringCloudConfig";
private static volatile SpringCloudConfiguration instance;
private static final String PREFIX = "seata.";
+
public static SpringCloudConfiguration getInstance() {
if (null == instance) {
synchronized (SpringCloudConfiguration.class) {
@@ -38,7 +38,7 @@ public class SpringCloudConfiguration extends AbstractConfiguration<ConfigChange
return instance;
}
- private SpringCloudConfiguration(){
+ private SpringCloudConfiguration() {
}
@@ -72,17 +72,17 @@ public class SpringCloudConfiguration extends AbstractConfiguration<ConfigChange
}
@Override
- public void addConfigListener(String dataId, ConfigChangeListener listener) {
+ public void addConfigListener(String dataId, ConfigurationChangeListener listener) {
throw new UnsupportedOperationException();
}
@Override
- public void removeConfigListener(String dataId, ConfigChangeListener listener) {
+ public void removeConfigListener(String dataId, ConfigurationChangeListener listener) {
throw new UnsupportedOperationException();
}
@Override
- public List<ConfigChangeListener> getConfigListeners(String dataId) {
+ public Set<ConfigurationChangeListener> getConfigListeners(String dataId) {
throw new UnsupportedOperationException();
}
}
diff --git a/config/seata-config-zk/src/main/java/io/seata/config/zk/ZookeeperConfiguration.java b/config/seata-config-zk/src/main/java/io/seata/config/zk/ZookeeperConfiguration.java
index 37a1ae78f228175f311e3d4456a88e76e9c4cc6b..bbf869cc0a30f44c8e5eff29ad31dd5b26a91735 100644
--- a/config/seata-config-zk/src/main/java/io/seata/config/zk/ZookeeperConfiguration.java
+++ b/config/seata-config-zk/src/main/java/io/seata/config/zk/ZookeeperConfiguration.java
@@ -15,8 +15,10 @@
*/
package io.seata.config.zk;
-import java.util.List;
+import java.util.Set;
import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.FutureTask;
import java.util.concurrent.LinkedBlockingQueue;
@@ -28,6 +30,9 @@ import io.seata.common.thread.NamedThreadFactory;
import io.seata.common.util.StringUtils;
import io.seata.config.AbstractConfiguration;
import io.seata.config.Configuration;
+import io.seata.config.ConfigurationChangeEvent;
+import io.seata.config.ConfigurationChangeListener;
+import io.seata.config.ConfigurationChangeType;
import io.seata.config.ConfigurationFactory;
import org.I0Itec.zkclient.IZkDataListener;
import org.I0Itec.zkclient.ZkClient;
@@ -37,17 +42,19 @@ import org.slf4j.LoggerFactory;
import static io.seata.config.ConfigurationKeys.FILE_CONFIG_SPLIT_CHAR;
import static io.seata.config.ConfigurationKeys.FILE_ROOT_CONFIG;
+import static io.seata.config.ConfigurationKeys.SEATA_FILE_ROOT_CONFIG;
/**
+ * The type Zookeeper configuration.
+ *
* @author crazier.huang
- * @date 2019/2/18
*/
-public class ZookeeperConfiguration extends AbstractConfiguration<IZkDataListener> {
+public class ZookeeperConfiguration extends AbstractConfiguration {
private final static Logger LOGGER = LoggerFactory.getLogger(ZookeeperConfiguration.class);
private static final String CONFIG_TYPE = "zk";
private static final String ZK_PATH_SPLIT_CHAR = "/";
- private static final String ROOT_PATH = ZK_PATH_SPLIT_CHAR + FILE_ROOT_CONFIG;
+ private static final String ROOT_PATH = ZK_PATH_SPLIT_CHAR + SEATA_FILE_ROOT_CONFIG;
private static final Configuration FILE_CONFIG = ConfigurationFactory.CURRENT_FILE_INSTANCE;
private static final String SERVER_ADDR_KEY = "serverAddr";
private static final String SESSION_TIMEOUT_KEY = "session.timeout";
@@ -61,7 +68,13 @@ public class ZookeeperConfiguration extends AbstractConfiguration<IZkDataListene
Integer.MAX_VALUE, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(),
new NamedThreadFactory("ZKConfigThread", THREAD_POOL_NUM));
private static volatile ZkClient zkClient;
+ private static final int MAP_INITIAL_CAPACITY = 8;
+ private ConcurrentMap<String, ConcurrentMap<ConfigurationChangeListener, ZKListener>> configListenersMap
+ = new ConcurrentHashMap<>(MAP_INITIAL_CAPACITY);
+ /**
+ * Instantiates a new Zookeeper configuration.
+ */
public ZookeeperConfiguration() {
if (zkClient == null) {
synchronized (ZookeeperConfiguration.class) {
@@ -153,24 +166,85 @@ public class ZookeeperConfiguration extends AbstractConfiguration<IZkDataListene
}
@Override
- public void addConfigListener(String dataId, IZkDataListener listener) {
+ public void addConfigListener(String dataId, ConfigurationChangeListener listener) {
+ if (null == dataId || null == listener) {
+ return;
+ }
String path = ROOT_PATH + ZK_PATH_SPLIT_CHAR + dataId;
if (zkClient.exists(path)) {
- zkClient.subscribeDataChanges(path, listener);
+ configListenersMap.putIfAbsent(dataId, new ConcurrentHashMap<>());
+ ZKListener zkListener = new ZKListener(path, listener);
+ configListenersMap.get(dataId).put(listener, zkListener);
+ zkClient.subscribeDataChanges(path, zkListener);
}
}
@Override
- public void removeConfigListener(String dataId, IZkDataListener listener) {
+ public void removeConfigListener(String dataId, ConfigurationChangeListener listener) {
+ Set<ConfigurationChangeListener> configChangeListeners = getConfigListeners(dataId);
+ if (configChangeListeners == null || listener == null) {
+ return;
+ }
String path = ROOT_PATH + ZK_PATH_SPLIT_CHAR + dataId;
if (zkClient.exists(path)) {
- zkClient.unsubscribeDataChanges(path, listener);
+ for (ConfigurationChangeListener entry : configChangeListeners) {
+ if (listener.equals(entry)) {
+ ZKListener zkListener = null;
+ if (configListenersMap.containsKey(dataId)) {
+ zkListener = configListenersMap.get(dataId).get(listener);
+ configListenersMap.get(dataId).remove(entry);
+ }
+ if (null != zkListener) {
+ zkClient.unsubscribeDataChanges(path, zkListener);
+ }
+ break;
+ }
+ }
}
}
@Override
- public List<IZkDataListener> getConfigListeners(String dataId) {
- throw new NotSupportYetException("not support getConfigListeners");
+ public Set<ConfigurationChangeListener> getConfigListeners(String dataId) {
+ if (configListenersMap.containsKey(dataId)) {
+ return configListenersMap.get(dataId).keySet();
+ } else {
+ return null;
+ }
+ }
+
+ /**
+ * The type Zk listener.
+ */
+ public class ZKListener implements IZkDataListener {
+
+ private String path;
+ private ConfigurationChangeListener listener;
+
+ /**
+ * Instantiates a new Zk listener.
+ *
+ * @param path the path
+ * @param listener the listener
+ */
+ public ZKListener(String path, ConfigurationChangeListener listener) {
+ this.path = path;
+ this.listener = listener;
+ }
+
+ @Override
+ public void handleDataChange(String s, Object o) throws Exception {
+ ConfigurationChangeEvent event = new ConfigurationChangeEvent().setDataId(s).setNewValue(o.toString())
+ .setChangeType(ConfigurationChangeType.MODIFY);
+ listener.onProcessEvent(event);
+
+ }
+
+ @Override
+ public void handleDataDeleted(String s) throws Exception {
+ ConfigurationChangeEvent event = new ConfigurationChangeEvent().setDataId(s).setChangeType(
+ ConfigurationChangeType.DELETE);
+ listener.onProcessEvent(event);
+ }
}
}
diff --git a/config/seata-config-zk/src/main/java/io/seata/config/zk/ZookeeperConfigurationProvider.java b/config/seata-config-zk/src/main/java/io/seata/config/zk/ZookeeperConfigurationProvider.java
index 9cddf37f80c39d8efb6d937a109ca91d0f3d02f2..09506c5a48e85029478d929610d9732a404abd16 100644
--- a/config/seata-config-zk/src/main/java/io/seata/config/zk/ZookeeperConfigurationProvider.java
+++ b/config/seata-config-zk/src/main/java/io/seata/config/zk/ZookeeperConfigurationProvider.java
@@ -21,7 +21,6 @@ import io.seata.config.ConfigurationProvider;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/12
*/
@LoadLevel(name = "ZK", order = 1)
public class ZookeeperConfigurationProvider implements ConfigurationProvider {
diff --git a/core/src/main/java/io/seata/core/codec/Codec.java b/core/src/main/java/io/seata/core/codec/Codec.java
index a44a944593e61fe4c610bb6bd26b08afd617d34c..48f54209115cfaeec9ab4e720247595ade3078da 100644
--- a/core/src/main/java/io/seata/core/codec/Codec.java
+++ b/core/src/main/java/io/seata/core/codec/Codec.java
@@ -19,7 +19,6 @@ package io.seata.core.codec;
* The interface Codec.
*
* @author zhangsen
- * @date 2019 /5/6
*/
public interface Codec {
diff --git a/core/src/main/java/io/seata/core/codec/CodecFactory.java b/core/src/main/java/io/seata/core/codec/CodecFactory.java
index 9f2aa0154dac67b74d423070430ea7176765ec24..ba2ae0df4267be0d38d26280ddf6dbc3e53a2850 100644
--- a/core/src/main/java/io/seata/core/codec/CodecFactory.java
+++ b/core/src/main/java/io/seata/core/codec/CodecFactory.java
@@ -24,7 +24,6 @@ import io.seata.common.loader.EnhancedServiceLoader;
* The type Codec factory.
*
* @author zhangsen
- * @date 2019 /5/6
*/
public class CodecFactory {
@@ -39,13 +38,13 @@ public class CodecFactory {
* @param codec the code
* @return the codec
*/
- public static synchronized Codec getCodec(byte codec) {
+ public static Codec getCodec(byte codec) {
CodecType codecType = CodecType.getByCode(codec);
if (CODEC_MAP.get(codecType) != null) {
return CODEC_MAP.get(codecType);
}
Codec codecImpl = EnhancedServiceLoader.load(Codec.class, codecType.name());
- CODEC_MAP.put(codecType, codecImpl);
+ CODEC_MAP.putIfAbsent(codecType, codecImpl);
return codecImpl;
}
diff --git a/core/src/main/java/io/seata/core/compressor/Compressor.java b/core/src/main/java/io/seata/core/compressor/Compressor.java
new file mode 100644
index 0000000000000000000000000000000000000000..8ad8d69cc009c43d706eb82fb9c25f94572f1918
--- /dev/null
+++ b/core/src/main/java/io/seata/core/compressor/Compressor.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.core.compressor;
+
+/**
+ * @author jsbxyyx
+ */
+public interface Compressor {
+
+ /**
+ * compress byte[] to byte[].
+ * @param bytes the bytes
+ * @return the byte[]
+ */
+ byte[] compress(byte[] bytes);
+
+ /**
+ * decompress byte[] to byte[].
+ * @param bytes the bytes
+ * @return the byte[]
+ */
+ byte[] decompress(byte[] bytes);
+
+}
diff --git a/core/src/main/java/io/seata/core/compressor/CompressorFactory.java b/core/src/main/java/io/seata/core/compressor/CompressorFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..3bd00996b4bb5792f35f3294a0715e9cfcf67f71
--- /dev/null
+++ b/core/src/main/java/io/seata/core/compressor/CompressorFactory.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.core.compressor;
+
+import io.seata.common.loader.EnhancedServiceLoader;
+import io.seata.common.loader.LoadLevel;
+
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * the type compressor factory
+ * @author jsbxyyx
+ */
+public class CompressorFactory {
+
+ /**
+ * The constant COMPRESSOR_MAP.
+ */
+ protected static final Map<CompressorType, Compressor> COMPRESSOR_MAP = new ConcurrentHashMap<CompressorType, Compressor>();
+
+ static {
+ COMPRESSOR_MAP.put(CompressorType.NONE, new NoneCompressor());
+ }
+
+ /**
+ * Get compressor by code.
+ *
+ * @param code the code
+ * @return the compressor
+ */
+ public static Compressor getCompressor(byte code) {
+ CompressorType type = CompressorType.getByCode(code);
+ if (COMPRESSOR_MAP.get(type) != null) {
+ return COMPRESSOR_MAP.get(type);
+ }
+ Compressor impl = EnhancedServiceLoader.load(Compressor.class, type.name());
+ COMPRESSOR_MAP.putIfAbsent(type, impl);
+ return impl;
+ }
+
+ /**
+ * None compressor
+ */
+ @LoadLevel(name = "NONE")
+ public static class NoneCompressor implements Compressor {
+ @Override
+ public byte[] compress(byte[] bytes) {
+ return bytes;
+ }
+
+ @Override
+ public byte[] decompress(byte[] bytes) {
+ return bytes;
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/seata/core/codec/CompressorType.java b/core/src/main/java/io/seata/core/compressor/CompressorType.java
similarity index 98%
rename from core/src/main/java/io/seata/core/codec/CompressorType.java
rename to core/src/main/java/io/seata/core/compressor/CompressorType.java
index 71111a95ff548bb9f88734c449be1f86cf11e449..82decad9720df9559f70d521911017f1eb0055c7 100644
--- a/core/src/main/java/io/seata/core/codec/CompressorType.java
+++ b/core/src/main/java/io/seata/core/compressor/CompressorType.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.seata.core.codec;
+package io.seata.core.compressor;
/**
* @author Geng Zhang
diff --git a/core/src/main/java/io/seata/core/constants/ConfigurationKeys.java b/core/src/main/java/io/seata/core/constants/ConfigurationKeys.java
index 97c7d41cdfc5c1981ac2fc4fcd094b7aa3184e0c..9e9495f0d85d8adff02db5aa5e2782896a5a92ae 100644
--- a/core/src/main/java/io/seata/core/constants/ConfigurationKeys.java
+++ b/core/src/main/java/io/seata/core/constants/ConfigurationKeys.java
@@ -18,7 +18,7 @@ package io.seata.core.constants;
/**
* The type Configuration keys.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class ConfigurationKeys {
@@ -35,7 +35,7 @@ public class ConfigurationKeys {
/**
* The constant STORE_MODE.
*/
- public static final String STORE_MODE = STORE_PREFIX + "mode";
+ public static final String STORE_MODE = STORE_PREFIX + "mode";
/**
* The constant STORE_FILE_PREFIX
@@ -70,43 +70,59 @@ public class ConfigurationKeys {
*/
public static final String CLIENT_PREFIX = "client.";
+ /**
+ * The constant SERVER_PREFIX.
+ */
+ public static final String SERVER_PREFIX = "server.";
+
/**
* The constant TRANSPORT_PREFIX.
*/
public static final String TRANSPORT_PREFIX = "transport.";
+ /**
+ * The constant CLIENT_RM_PREFIX.
+ */
+ public static final String CLIENT_RM_PREFIX = CLIENT_PREFIX + "rm.";
+
/**
* The constant CLIENT_ASYNC_COMMIT_BUFFER_LIMIT.
*/
- public static final String CLIENT_ASYNC_COMMIT_BUFFER_LIMIT = CLIENT_PREFIX + "async.commit.buffer.limit";
+ public static final String CLIENT_ASYNC_COMMIT_BUFFER_LIMIT = CLIENT_RM_PREFIX + "async.commit.buffer.limit";
/**
* The constant CLIENT_LOCK_RETRY_TIMES.
*/
- public static final String CLIENT_LOCK_RETRY_TIMES = CLIENT_PREFIX + "lock.retry.times";
+ public static final String CLIENT_LOCK_RETRY_TIMES = CLIENT_RM_PREFIX + "lock.retry.times";
/**
* The constant CLIENT_LOCK_RETRY_INTERNAL.
*/
- public static final String CLIENT_LOCK_RETRY_INTERNAL = CLIENT_PREFIX + "lock.retry.internal";
+ public static final String CLIENT_LOCK_RETRY_INTERNAL = CLIENT_RM_PREFIX + "lock.retry.internal";
/**
* The constant SERVICE_SESSION_RELOAD_READ_SIZE
*/
public static final String SERVICE_SESSION_RELOAD_READ_SIZE = STORE_FILE_PREFIX + "session.reload.read_size";
+ /**
+ * The constant CLIENT_REPORT_SUCCESS_ENABLE.
+ */
+ public static final String CLIENT_REPORT_SUCCESS_ENABLE = CLIENT_PREFIX + "report.success.enable";
+
/**
* The constant CLIENT_REPORT_RETRY_COUNT.
*/
- public static final String CLIENT_REPORT_RETRY_COUNT = CLIENT_PREFIX + "report.retry.count";
+ public static final String CLIENT_REPORT_RETRY_COUNT = CLIENT_RM_PREFIX + "report.retry.count";
/**
* The constant CLIENT_LOCK_RETRY_POLICY_BRANCH_ROLLBACK_ON_CONFLICT.
*/
- public static final String CLIENT_LOCK_RETRY_POLICY_BRANCH_ROLLBACK_ON_CONFLICT = CLIENT_PREFIX + "lock.retry.policy.branch-rollback-on-conflict";
+ public static final String CLIENT_LOCK_RETRY_POLICY_BRANCH_ROLLBACK_ON_CONFLICT = CLIENT_RM_PREFIX
+ + "lock.retry.policy.branch-rollback-on-conflict";
/**
* The constant CLIENT_TABLE_META_CHECK_ENABLE.
*/
- public static final String CLIENT_TABLE_META_CHECK_ENABLE = CLIENT_PREFIX + "table.meta.check.enable";
+ public static final String CLIENT_TABLE_META_CHECK_ENABLE = CLIENT_RM_PREFIX + "table.meta.check.enable";
/**
* The constant CLIENT_TM_COMMIT_RETRY_TIMES.
@@ -125,124 +141,127 @@ public class ConfigurationKeys {
/**
* The constant COMPRESSOR_FOR_RPC.
- *
+ *
* @since 0.7.0
*/
public static final String COMPRESSOR_FOR_RPC = TRANSPORT_PREFIX + "compressor";
+ /**
+ * The constant STORE_DB_PREFIX.
+ */
+ public static final String STORE_DB_PREFIX = "store.db.";
+
/**
* The constant STORE_DB_GLOBAL_TABLE.
*/
- public static final String STORE_DB_GLOBAL_TABLE = "store.db.global.table";
+ public static final String STORE_DB_GLOBAL_TABLE = STORE_DB_PREFIX + "global.table";
/**
* The constant STORE_DB_BRANCH_TABLE.
*/
- public static final String STORE_DB_BRANCH_TABLE = "store.db.branch.table";
+ public static final String STORE_DB_BRANCH_TABLE = STORE_DB_PREFIX + "branch.table";
/**
* The constant STORE_DB_GLOBAL_DEFAULT_TABLE.
*/
- public static final String STORE_DB_GLOBAL_DEFAULT_TABLE = "global_table";
+ public static final String STORE_DB_GLOBAL_DEFAULT_TABLE = "global_table";
/**
* The constant STORE_DB_BRANCH_DEFAULT_TABLE.
*/
- public static final String STORE_DB_BRANCH_DEFAULT_TABLE = "branch_table";
+ public static final String STORE_DB_BRANCH_DEFAULT_TABLE = "branch_table";
/**
* The constant STORE_DB_DATASOURCE_TYPE.
*/
- public static final String STORE_DB_DATASOURCE_TYPE = "store.db.datasource";
-
+ public static final String STORE_DB_DATASOURCE_TYPE = STORE_DB_PREFIX + "datasource";
/**
* The constant STORE_DB_TYPE.
*/
- public static final String STORE_DB_TYPE = "store.db.db-type";
+ public static final String STORE_DB_TYPE = STORE_DB_PREFIX + "db-type";
/**
* The constant STORE_DB_DRIVER_CLASS_NAME.
*/
- public static final String STORE_DB_DRIVER_CLASS_NAME = "store.db.driver-class-name";
+ public static final String STORE_DB_DRIVER_CLASS_NAME = STORE_DB_PREFIX + "driver-class-name";
/**
* The constant STORE_DB_URL.
*/
- public static final String STORE_DB_URL = "store.db.url";
+ public static final String STORE_DB_URL = STORE_DB_PREFIX + "url";
/**
* The constant STORE_DB_USER.
*/
- public static final String STORE_DB_USER = "store.db.user";
+ public static final String STORE_DB_USER = STORE_DB_PREFIX + "user";
/**
* The constant STORE_DB_PASSWORD.
*/
- public static final String STORE_DB_PASSWORD = "store.db.password";
+ public static final String STORE_DB_PASSWORD = STORE_DB_PREFIX + "password";
/**
* The constant STORE_DB_MIN_CONN.
*/
- public static final String STORE_DB_MIN_CONN = "store.db.min-conn";
+ public static final String STORE_DB_MIN_CONN = STORE_DB_PREFIX + "min-conn";
/**
* The constant STORE_DB_MAX_CONN.
*/
- public static final String STORE_DB_MAX_CONN = "store.db.max-conn";
+ public static final String STORE_DB_MAX_CONN = STORE_DB_PREFIX + "max-conn";
/**
* The constant STORE_DB_LOG_QUERY_LIMIT.
*/
- public static final String STORE_DB_LOG_QUERY_LIMIT = "store.db.query-limit";
-
- /**
- * The constant LOCK_MODE.
- */
- public static final String LOCK_MODE = "lock.mode";
+ public static final String STORE_DB_LOG_QUERY_LIMIT = STORE_DB_PREFIX + "query-limit";
/**
* The constant LOCK_DB_TABLE.
*/
- public static final String LOCK_DB_TABLE = "store.db.lock-table";
+ public static final String LOCK_DB_TABLE = STORE_DB_PREFIX + "lock-table";
/**
* The constant LOCK_DB_DEFAULT_TABLE.
*/
- public static final String LOCK_DB_DEFAULT_TABLE = "lock_table";
+ public static final String LOCK_DB_DEFAULT_TABLE = "lock_table";
+ /**
+ * The constant RECOVERY_PREFIX.
+ */
+ public static final String RECOVERY_PREFIX = SERVER_PREFIX + "recovery.";
/**
* The constant COMMITING_RETRY_PERIOD.
*/
- public static final String COMMITING_RETRY_PERIOD = "recovery.committing-retry-period";
+ public static final String COMMITING_RETRY_PERIOD = RECOVERY_PREFIX + "committing-retry-period";
/**
* The constant ASYN_COMMITING_RETRY_PERIOD.
*/
- public static final String ASYN_COMMITING_RETRY_PERIOD = "recovery.asyn-committing-retry-period";
+ public static final String ASYN_COMMITING_RETRY_PERIOD = RECOVERY_PREFIX + "asyn-committing-retry-period";
/**
* The constant ROLLBACKING_RETRY_PERIOD.
*/
- public static final String ROLLBACKING_RETRY_PERIOD = "recovery.rollbacking-retry-period";
+ public static final String ROLLBACKING_RETRY_PERIOD = RECOVERY_PREFIX + "rollbacking-retry-period";
/**
* The constant TIMEOUT_RETRY_PERIOD.
*/
- public static final String TIMEOUT_RETRY_PERIOD = "recovery.timeout-retry-period";
+ public static final String TIMEOUT_RETRY_PERIOD = RECOVERY_PREFIX + "timeout-retry-period";
/**
- * The constant TRANSACTION_PREFIX.
+ * The constant CLIENT_UNDO_PREFIX.
*/
- public static final String TRANSACTION_PREFIX = "transaction.";
+ public static final String CLIENT_UNDO_PREFIX = "client.undo.";
/**
* The constant TRANSACTION_UNDO_DATA_VALIDATION.
*/
- public static final String TRANSACTION_UNDO_DATA_VALIDATION = TRANSACTION_PREFIX + "undo.data.validation";
+ public static final String TRANSACTION_UNDO_DATA_VALIDATION = CLIENT_UNDO_PREFIX + "data.validation";
/**
* The constant TRANSACTION_UNDO_LOG_SERIALIZATION.
*/
- public static final String TRANSACTION_UNDO_LOG_SERIALIZATION = TRANSACTION_PREFIX + "undo.log.serialization";
+ public static final String TRANSACTION_UNDO_LOG_SERIALIZATION = CLIENT_UNDO_PREFIX + "log.serialization";
/**
* The constant METRICS_PREFIX.
@@ -264,25 +283,35 @@ public class ConfigurationKeys {
*/
public static final String METRICS_EXPORTER_LIST = "exporter-list";
+ /**
+ * The constant SERVER_UNDO_PREFIX.
+ */
+ public static final String SERVER_UNDO_PREFIX = SERVER_PREFIX + "undo.";
+
/**
* The constant TRANSACTION_UNDO_LOG_SAVE_DAYS.
*/
- public static final String TRANSACTION_UNDO_LOG_SAVE_DAYS = TRANSACTION_PREFIX + "undo.log.save.days";
+ public static final String TRANSACTION_UNDO_LOG_SAVE_DAYS = SERVER_UNDO_PREFIX + "log.save.days";
/**
* The constant TRANSACTION_UNDO_LOG_DELETE_PERIOD
*/
- public static final String TRANSACTION_UNDO_LOG_DELETE_PERIOD = TRANSACTION_PREFIX + "undo.log.delete.period";
+ public static final String TRANSACTION_UNDO_LOG_DELETE_PERIOD = SERVER_UNDO_PREFIX + "log.delete.period";
/**
* The constant TRANSACTION_UNDO_LOG_TABLE
*/
- public static final String TRANSACTION_UNDO_LOG_TABLE = TRANSACTION_PREFIX + "undo.log.table";
+ public static final String TRANSACTION_UNDO_LOG_TABLE = CLIENT_UNDO_PREFIX + "log.table";
+
+ /**
+ * The constant TRANSACTION_UNDO_LOG_EXCEPTION_RATE
+ */
+ public static final String TRANSACTION_LOG_EXCEPTION_RATE = CLIENT_PREFIX + "log.exceptionRate";
/**
* The constant TRANSACTION_UNDO_LOG_DEFAULT_TABLE.
*/
- public static final String TRANSACTION_UNDO_LOG_DEFAULT_TABLE = "undo_log";
+ public static final String TRANSACTION_UNDO_LOG_DEFAULT_TABLE = "undo_log";
/**
* The constant SUPPORT_PREFIX.
@@ -299,5 +328,101 @@ public class ConfigurationKeys {
/**
* The constant DATASOURCE_AUTOPROXY.
*/
- public static final String DATASOURCE_AUTOPROXY = SUPPORT_PREFIX + SPRING_PREFIX + DATASOURCE_PREFIX + "autoproxy";
+ public static final String DATASOURCE_AUTOPROXY = CLIENT_PREFIX + SUPPORT_PREFIX + SPRING_PREFIX + DATASOURCE_PREFIX
+ + "autoproxy";
+
+ /**
+ * The constant MAX_COMMIT_RETRY_TIMEOUT.
+ */
+ public static final String MAX_COMMIT_RETRY_TIMEOUT = SERVER_PREFIX + "max.commit.retry.timeout";
+
+ /**
+ * The constant MAX_ROLLBACK_RETRY_TIMEOUT.
+ */
+ public static final String MAX_ROLLBACK_RETRY_TIMEOUT = SERVER_PREFIX + "max.rollback.retry.timeout";
+
+ /**
+ * The constant TRANSPORT_TYPE
+ */
+ public static final String TRANSPORT_TYPE = TRANSPORT_PREFIX + "type";
+
+ /**
+ * The constant TRANSPORT_SERVER
+ */
+ public static final String TRANSPORT_SERVER = TRANSPORT_PREFIX + "server";
+
+ /**
+ * The constant TRANSPORT_HEARTBEAT
+ */
+ public static final String TRANSPORT_HEARTBEAT = TRANSPORT_PREFIX + "heartbeat";
+
+ /**
+ * The constant THREAD_FACTORY_PREFIX
+ */
+ public static final String THREAD_FACTORY_PREFIX = TRANSPORT_PREFIX + "thread-factory.";
+
+ /**
+ * The constant BOSS_THREAD_PREFIX
+ */
+ public static final String BOSS_THREAD_PREFIX = THREAD_FACTORY_PREFIX + "boss-thread-prefix";
+
+ /**
+ * The constant WORKER_THREAD_PREFIX
+ */
+ public static final String WORKER_THREAD_PREFIX = THREAD_FACTORY_PREFIX + "worker-thread-prefix";
+
+ /**
+ * The constant SERVER_EXECUTOR_THREAD_PREFIX
+ */
+ public static final String SERVER_EXECUTOR_THREAD_PREFIX = THREAD_FACTORY_PREFIX + "server-executor-thread-prefix";
+
+ /**
+ * The constant SHARE_BOSS_WORKER
+ */
+ public static final String SHARE_BOSS_WORKER = THREAD_FACTORY_PREFIX + "share-boss-worker";
+
+ /**
+ * The constant CLIENT_SELECTOR_THREAD_PREFIX
+ */
+ public static final String CLIENT_SELECTOR_THREAD_PREFIX = THREAD_FACTORY_PREFIX + "client-selector-thread-prefix";
+
+ /**
+ * The constant CLIENT_SELECTOR_THREAD_SIZE
+ */
+ public static final String CLIENT_SELECTOR_THREAD_SIZE = THREAD_FACTORY_PREFIX + "client-selector-thread-size";
+
+ /**
+ * The constant CLIENT_WORKER_THREAD_PREFIX
+ */
+ public static final String CLIENT_WORKER_THREAD_PREFIX = THREAD_FACTORY_PREFIX + "client-worker-thread-prefix";
+
+ /**
+ * The constant BOSS_THREAD_SIZE
+ */
+ public static final String BOSS_THREAD_SIZE = THREAD_FACTORY_PREFIX + "boss-thread-size";
+
+ /**
+ * The constant WORKER_THREAD_SIZE
+ */
+ public static final String WORKER_THREAD_SIZE = THREAD_FACTORY_PREFIX + "worker-thread-size";
+
+ /**
+ * The constant SHUTDOWN_PREFIX
+ */
+ public static final String SHUTDOWN_PREFIX = TRANSPORT_PREFIX + "shutdown.";
+
+ /**
+ * The constant SHUNDOWN_WAIT
+ */
+ public static final String SHUNDOWN_WAIT = SHUTDOWN_PREFIX + "wait";
+
+ /**
+ * The constant ENABLE_CLIENT_BATCH_SEND_REQUEST
+ */
+ public static final String ENABLE_CLIENT_BATCH_SEND_REQUEST = TRANSPORT_PREFIX + "enable-client-batch-send-request";
+
+ /**
+ * The constant DISABLE_GLOBAL_TRANSACTION.
+ */
+ public static final String DISABLE_GLOBAL_TRANSACTION = SERVICE_PREFIX + "disableGlobalTransaction";
}
diff --git a/core/src/main/java/io/seata/core/constants/DBType.java b/core/src/main/java/io/seata/core/constants/DBType.java
index fcf7c6f75ae46ba3ac34f1750c54c5f996929a63..ec93ef72c615f8b9a85bd26c7fed5398880cf7a1 100644
--- a/core/src/main/java/io/seata/core/constants/DBType.java
+++ b/core/src/main/java/io/seata/core/constants/DBType.java
@@ -21,7 +21,6 @@ import io.seata.common.util.StringUtils;
* database type
*
* @author zhangsen
- * @date 2019 /4/2
*/
public enum DBType {
diff --git a/core/src/main/java/io/seata/core/constants/ServerTableColumnsName.java b/core/src/main/java/io/seata/core/constants/ServerTableColumnsName.java
index 0e8f593ef4c83c38fb19774a467dc0bf2c0d6f9e..cd90815f642a2dc1c5aaa881cbf74f0e7c0a2c18 100644
--- a/core/src/main/java/io/seata/core/constants/ServerTableColumnsName.java
+++ b/core/src/main/java/io/seata/core/constants/ServerTableColumnsName.java
@@ -85,7 +85,7 @@ public class ServerTableColumnsName {
/**
* The constant branch_table column name branch_id
*/
- public static final String BRANCH_TABLE_BRANCH_XID = "branch_id";
+ public static final String BRANCH_TABLE_BRANCH_ID = "branch_id";
/**
* The constant branch_table column name xid
@@ -107,11 +107,6 @@ public class ServerTableColumnsName {
*/
public static final String BRANCH_TABLE_RESOURCE_ID = "resource_id";
- /**
- * The constant branch_table column name lock_key
- */
- public static final String BRANCH_TABLE_LOCK_KEY = "lock_key";
-
/**
* The constant branch_table column name branch_type
*/
diff --git a/core/src/main/java/io/seata/core/context/RootContext.java b/core/src/main/java/io/seata/core/context/RootContext.java
index fcb970af501c477085048445f44ac9a83ddf6c41..b741923a9fac3265efa327ae4641b075970755f2 100644
--- a/core/src/main/java/io/seata/core/context/RootContext.java
+++ b/core/src/main/java/io/seata/core/context/RootContext.java
@@ -16,7 +16,8 @@
package io.seata.core.context;
import io.seata.common.exception.ShouldNeverHappenException;
-
+import io.seata.core.model.BranchType;
+import io.seata.common.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -25,7 +26,7 @@ import java.util.Map;
/**
* The type Root context.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class RootContext {
@@ -36,6 +37,8 @@ public class RootContext {
*/
public static final String KEY_XID = "TX_XID";
+ public static final String KEY_XID_INTERCEPTOR_TYPE = "tx-xid-interceptor-type";
+
public static final String KEY_GLOBAL_LOCK_FLAG = "TX_LOCK";
private static ContextCore CONTEXT_HOLDER = ContextCoreLoader.load();
@@ -46,7 +49,26 @@ public class RootContext {
* @return the xid
*/
public static String getXID() {
- return CONTEXT_HOLDER.get(KEY_XID);
+ String xid = CONTEXT_HOLDER.get(KEY_XID);
+ if (StringUtils.isNotBlank(xid)) {
+ return xid;
+ }
+
+ String xidType = CONTEXT_HOLDER.get(KEY_XID_INTERCEPTOR_TYPE);
+ if (StringUtils.isNotBlank(xidType) && xidType.indexOf("_") > -1) {
+ return xidType.split("_")[0];
+ }
+
+ return null;
+ }
+
+ /**
+ * Gets xid.
+ *
+ * @return the xid
+ */
+ public static String getXIDInterceptorType() {
+ return CONTEXT_HOLDER.get(KEY_XID_INTERCEPTOR_TYPE);
}
/**
@@ -61,6 +83,36 @@ public class RootContext {
CONTEXT_HOLDER.put(KEY_XID, xid);
}
+ /**
+ * Bind interceptor type
+ *
+ * @param xidType
+ */
+ public static void bindInterceptorType(String xidType) {
+ if (StringUtils.isNotBlank(xidType)) {
+
+ String[] xidTypes = xidType.split("_");
+
+ if (xidTypes.length == 2) {
+ bindInterceptorType(xidTypes[0], BranchType.valueOf(xidTypes[1]));
+ }
+ }
+ }
+
+ /**
+ * Bind interceptor type
+ *
+ * @param xid
+ * @param branchType
+ */
+ public static void bindInterceptorType(String xid, BranchType branchType) {
+ String xidType = String.format("%s_%s", xid, branchType.name());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("bind interceptor type xid={} branchType={}", xid, branchType);
+ }
+ CONTEXT_HOLDER.put(KEY_XID_INTERCEPTOR_TYPE, xidType);
+ }
+
/**
* declare local transactions will use global lock check for update/delete/insert/selectForUpdate SQL
*/
@@ -82,11 +134,24 @@ public class RootContext {
public static String unbind() {
String xid = CONTEXT_HOLDER.remove(KEY_XID);
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("unbind " + xid);
+ LOGGER.debug("unbind {} ", xid);
}
return xid;
}
+ /**
+ * Unbind temporary string
+ *
+ * @return the string
+ */
+ public static String unbindInterceptorType() {
+ String xidType = CONTEXT_HOLDER.remove(KEY_XID_INTERCEPTOR_TYPE);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("unbind inteceptor type {}", xidType);
+ }
+ return xidType;
+ }
+
public static void unbindGlobalLockFlag() {
String lockFlag = CONTEXT_HOLDER.remove(KEY_GLOBAL_LOCK_FLAG);
if (LOGGER.isDebugEnabled() && lockFlag != null) {
@@ -126,7 +191,7 @@ public class RootContext {
*
* @return
*/
- public static Map<String, String> entries(){
+ public static Map<String, String> entries() {
return CONTEXT_HOLDER.entries();
}
}
diff --git a/core/src/main/java/io/seata/core/context/ThreadLocalContextCore.java b/core/src/main/java/io/seata/core/context/ThreadLocalContextCore.java
index 19a1598a798f52bcf1ba5850f124d85aac07857c..8f0337dbc91a8b1cd10a0c0c2480ef187d61e186 100644
--- a/core/src/main/java/io/seata/core/context/ThreadLocalContextCore.java
+++ b/core/src/main/java/io/seata/core/context/ThreadLocalContextCore.java
@@ -23,7 +23,7 @@ import io.seata.common.loader.LoadLevel;
/**
* The type Thread local context core.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
@LoadLevel(name = "ThreadLocalContextCore", order = Integer.MIN_VALUE)
public class ThreadLocalContextCore implements ContextCore {
diff --git a/core/src/main/java/io/seata/core/exception/BranchTransactionException.java b/core/src/main/java/io/seata/core/exception/BranchTransactionException.java
index 6e804ce0aa59ee2227ed3e33bc1d776af8546187..49e6d30fa1abe0b12564533bced6861049581ab8 100644
--- a/core/src/main/java/io/seata/core/exception/BranchTransactionException.java
+++ b/core/src/main/java/io/seata/core/exception/BranchTransactionException.java
@@ -20,7 +20,7 @@ package io.seata.core.exception;
*
* @author will
*/
-public class BranchTransactionException extends TransactionException{
+public class BranchTransactionException extends TransactionException {
/**
* Instantiates a new Transaction exception.
@@ -34,7 +34,7 @@ public class BranchTransactionException extends TransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param cause the cause
*/
public BranchTransactionException(TransactionExceptionCode code, Throwable cause) {
@@ -53,7 +53,7 @@ public class BranchTransactionException extends TransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param message the message
*/
public BranchTransactionException(TransactionExceptionCode code, String message) {
@@ -73,7 +73,7 @@ public class BranchTransactionException extends TransactionException{
* Instantiates a new Transaction exception.
*
* @param message the message
- * @param cause the cause
+ * @param cause the cause
*/
public BranchTransactionException(String message, Throwable cause) {
super(message, cause);
@@ -82,9 +82,9 @@ public class BranchTransactionException extends TransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param message the message
- * @param cause the cause
+ * @param cause the cause
*/
public BranchTransactionException(TransactionExceptionCode code, String message, Throwable cause) {
super(code, message, cause);
diff --git a/core/src/main/java/io/seata/core/exception/GlobalTransactionException.java b/core/src/main/java/io/seata/core/exception/GlobalTransactionException.java
index 98c4cf8c4b0674c10f92cfd48c898de070b60ad5..d0ba2bad4869bae9c97bd7e6515a3e9dd4a5cfa2 100644
--- a/core/src/main/java/io/seata/core/exception/GlobalTransactionException.java
+++ b/core/src/main/java/io/seata/core/exception/GlobalTransactionException.java
@@ -20,7 +20,7 @@ package io.seata.core.exception;
*
* @author will
*/
-public class GlobalTransactionException extends TransactionException{
+public class GlobalTransactionException extends TransactionException {
/**
* Instantiates a new Transaction exception.
@@ -34,7 +34,7 @@ public class GlobalTransactionException extends TransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param cause the cause
*/
public GlobalTransactionException(TransactionExceptionCode code, Throwable cause) {
@@ -53,7 +53,7 @@ public class GlobalTransactionException extends TransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param message the message
*/
public GlobalTransactionException(TransactionExceptionCode code, String message) {
@@ -73,7 +73,7 @@ public class GlobalTransactionException extends TransactionException{
* Instantiates a new Transaction exception.
*
* @param message the message
- * @param cause the cause
+ * @param cause the cause
*/
public GlobalTransactionException(String message, Throwable cause) {
super(message, cause);
@@ -82,9 +82,9 @@ public class GlobalTransactionException extends TransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param message the message
- * @param cause the cause
+ * @param cause the cause
*/
public GlobalTransactionException(TransactionExceptionCode code, String message, Throwable cause) {
super(code, message, cause);
diff --git a/core/src/main/java/io/seata/core/exception/RmTransactionException.java b/core/src/main/java/io/seata/core/exception/RmTransactionException.java
index 1c2485ca326da58c2b2881da742fb34b89750389..2e5ee22f20a83b5fb3b4e81e8b6046867924a4d1 100644
--- a/core/src/main/java/io/seata/core/exception/RmTransactionException.java
+++ b/core/src/main/java/io/seata/core/exception/RmTransactionException.java
@@ -20,7 +20,7 @@ package io.seata.core.exception;
*
* @author will
*/
-public class RmTransactionException extends BranchTransactionException{
+public class RmTransactionException extends BranchTransactionException {
/**
* Instantiates a new Transaction exception.
@@ -34,7 +34,7 @@ public class RmTransactionException extends BranchTransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param cause the cause
*/
public RmTransactionException(TransactionExceptionCode code, Throwable cause) {
@@ -53,7 +53,7 @@ public class RmTransactionException extends BranchTransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param message the message
*/
public RmTransactionException(TransactionExceptionCode code, String message) {
@@ -73,7 +73,7 @@ public class RmTransactionException extends BranchTransactionException{
* Instantiates a new Transaction exception.
*
* @param message the message
- * @param cause the cause
+ * @param cause the cause
*/
public RmTransactionException(String message, Throwable cause) {
super(message, cause);
@@ -82,9 +82,9 @@ public class RmTransactionException extends BranchTransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param message the message
- * @param cause the cause
+ * @param cause the cause
*/
public RmTransactionException(TransactionExceptionCode code, String message, Throwable cause) {
super(code, message, cause);
diff --git a/core/src/main/java/io/seata/core/exception/TmTransactionException.java b/core/src/main/java/io/seata/core/exception/TmTransactionException.java
index 1b39d97670a2e39ff95f69bef02f66e7da173701..35deb9f41c5489ac6e88b0d3b67d436bdf706497 100644
--- a/core/src/main/java/io/seata/core/exception/TmTransactionException.java
+++ b/core/src/main/java/io/seata/core/exception/TmTransactionException.java
@@ -20,7 +20,7 @@ package io.seata.core.exception;
*
* @author will
*/
-public class TmTransactionException extends GlobalTransactionException{
+public class TmTransactionException extends GlobalTransactionException {
/**
* Instantiates a new Transaction exception.
@@ -34,7 +34,7 @@ public class TmTransactionException extends GlobalTransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param cause the cause
*/
public TmTransactionException(TransactionExceptionCode code, Throwable cause) {
@@ -53,7 +53,7 @@ public class TmTransactionException extends GlobalTransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param message the message
*/
public TmTransactionException(TransactionExceptionCode code, String message) {
@@ -73,7 +73,7 @@ public class TmTransactionException extends GlobalTransactionException{
* Instantiates a new Transaction exception.
*
* @param message the message
- * @param cause the cause
+ * @param cause the cause
*/
public TmTransactionException(String message, Throwable cause) {
super(message, cause);
@@ -82,9 +82,9 @@ public class TmTransactionException extends GlobalTransactionException{
/**
* Instantiates a new Transaction exception.
*
- * @param code the code
+ * @param code the code
* @param message the message
- * @param cause the cause
+ * @param cause the cause
*/
public TmTransactionException(TransactionExceptionCode code, String message, Throwable cause) {
super(code, message, cause);
diff --git a/core/src/main/java/io/seata/core/lock/AbstractLocker.java b/core/src/main/java/io/seata/core/lock/AbstractLocker.java
index f6e1c56a4d3b5cc9603d0590723b50427cf52ece..b9523e24a38e3b7d35cf3e29a80f43091a96be2e 100644
--- a/core/src/main/java/io/seata/core/lock/AbstractLocker.java
+++ b/core/src/main/java/io/seata/core/lock/AbstractLocker.java
@@ -27,7 +27,6 @@ import org.slf4j.LoggerFactory;
* The type Abstract locker.
*
* @author zhangsen
- * @date 2019 -05-15
*/
public abstract class AbstractLocker implements Locker {
@@ -83,4 +82,15 @@ public abstract class AbstractLocker implements Locker {
public void cleanAllLocks() {
}
+
+ @Override
+ public boolean releaseLock(String xid, Long branchId) {
+ return false;
+ }
+
+ @Override
+ public boolean releaseLock(String xid, List<Long> branchIds) {
+ return false;
+ }
+
}
diff --git a/core/src/main/java/io/seata/core/lock/LocalDBLocker.java b/core/src/main/java/io/seata/core/lock/LocalDBLocker.java
index 02b250a50fd38dbb9cef69e735d69e40480a9e2e..6d0b19a3f13e149bae585898b6cdc9cb6fa1f261 100644
--- a/core/src/main/java/io/seata/core/lock/LocalDBLocker.java
+++ b/core/src/main/java/io/seata/core/lock/LocalDBLocker.java
@@ -21,7 +21,6 @@ import java.util.List;
* The type Local db locker.
*
* @author zhangsen
- * @date 2019 -05-15
*/
public class LocalDBLocker extends AbstractLocker {
diff --git a/core/src/main/java/io/seata/core/lock/LockMode.java b/core/src/main/java/io/seata/core/lock/LockMode.java
index d76facb5d17fc1f3392c6afb8f637d029fbb61c9..27e9b12d38d19dceca584153d5601c4f81a20be4 100644
--- a/core/src/main/java/io/seata/core/lock/LockMode.java
+++ b/core/src/main/java/io/seata/core/lock/LockMode.java
@@ -19,7 +19,6 @@ package io.seata.core.lock;
* lock mode
*
* @author zhangsen
- * @date 2019 /4/25
*/
public enum LockMode {
diff --git a/core/src/main/java/io/seata/core/lock/Locker.java b/core/src/main/java/io/seata/core/lock/Locker.java
index 723042a4225feccd80660c63c8cd3597929718e4..f29c84558a4caa9cc9b6cfc5fd4bd4039cbcc081 100644
--- a/core/src/main/java/io/seata/core/lock/Locker.java
+++ b/core/src/main/java/io/seata/core/lock/Locker.java
@@ -21,7 +21,6 @@ import java.util.List;
* The interface Locker.
*
* @author zhangsen
- * @date 2019 -05-15
*/
public interface Locker {
@@ -41,6 +40,24 @@ public interface Locker {
*/
boolean releaseLock(List<RowLock> rowLock);
+ /**
+ * Un lock boolean.
+ *
+ * @param xid the xid
+ * @param branchId the branchId
+ * @return the boolean
+ */
+ boolean releaseLock(String xid, Long branchId);
+
+ /**
+ * Un lock boolean.
+ *
+ * @param xid the xid
+ * @param branchIds the branchIds
+ * @return the boolean
+ */
+ boolean releaseLock(String xid, List<Long> branchIds);
+
/**
* Is lockable boolean.
*
diff --git a/core/src/main/java/io/seata/core/lock/RowLock.java b/core/src/main/java/io/seata/core/lock/RowLock.java
index 1ed4013edd59418032f84e476473c4921e8091b0..9a41913104f825f53f50db825f1da124dfd8a5f5 100644
--- a/core/src/main/java/io/seata/core/lock/RowLock.java
+++ b/core/src/main/java/io/seata/core/lock/RowLock.java
@@ -21,7 +21,6 @@ import io.seata.common.util.StringUtils;
* The type Row lock.
*
* @author zhangsen
- * @date 2019 -05-15
*/
public class RowLock {
diff --git a/core/src/main/java/io/seata/core/logger/StackTraceLogger.java b/core/src/main/java/io/seata/core/logger/StackTraceLogger.java
new file mode 100644
index 0000000000000000000000000000000000000000..65c6997be49aa4b8991dd2a1a83d1f88809531d3
--- /dev/null
+++ b/core/src/main/java/io/seata/core/logger/StackTraceLogger.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.core.logger;
+
+import io.seata.config.Configuration;
+import io.seata.config.ConfigurationFactory;
+import io.seata.core.constants.ConfigurationKeys;
+import org.slf4j.Logger;
+
+/**
+ * @author jsbxyyx
+ */
+public final class StackTraceLogger {
+
+ private static final Configuration CONFIG = ConfigurationFactory.getInstance();
+
+ public static void info(Logger logger, Throwable cause, String format1, Object[] args1, String format2, Object[] args2) {
+ if (logger.isInfoEnabled()) {
+ int rate = CONFIG.getInt(ConfigurationKeys.TRANSACTION_LOG_EXCEPTION_RATE, 100);
+ if (System.currentTimeMillis() % rate == 0) {
+ logger.info(format1, args1, cause);
+ } else {
+ logger.info(format2, args2);
+ }
+ }
+ }
+
+}
diff --git a/core/src/main/java/io/seata/core/model/Resource.java b/core/src/main/java/io/seata/core/model/Resource.java
index 5b6c94d84a7d989b8fc109699376c98cd1399bd6..7c95b2079845440d2d104658f62c02d44da7527e 100644
--- a/core/src/main/java/io/seata/core/model/Resource.java
+++ b/core/src/main/java/io/seata/core/model/Resource.java
@@ -39,7 +39,7 @@ public interface Resource {
String getResourceId();
/**
- * get resource type, AT、TCC etc.
+ * get resource type, AT, TCC, SAGA and XA
*
* @return
*/
diff --git a/core/src/main/java/io/seata/core/model/ResourceManager.java b/core/src/main/java/io/seata/core/model/ResourceManager.java
index f5299b66aae420e7fb3a4b262bb799e1c8b9f148..9d6214f339d8bddac13a11fd87383221855bcad4 100644
--- a/core/src/main/java/io/seata/core/model/ResourceManager.java
+++ b/core/src/main/java/io/seata/core/model/ResourceManager.java
@@ -24,8 +24,6 @@ import java.util.Map;
*/
public interface ResourceManager extends ResourceManagerInbound, ResourceManagerOutbound {
- Object RESOURCE_LOCK = new Object();
-
/**
* Register a Resource to be managed by Resource Manager.
*
diff --git a/core/src/main/java/io/seata/core/protocol/AbstractMessage.java b/core/src/main/java/io/seata/core/protocol/AbstractMessage.java
index 99abb70dee2cfabd3e6bdd670b21127207e6c0af..2a3dbc276b21f58e0d9da8266cd727d8ec60e48c 100644
--- a/core/src/main/java/io/seata/core/protocol/AbstractMessage.java
+++ b/core/src/main/java/io/seata/core/protocol/AbstractMessage.java
@@ -27,8 +27,7 @@ import java.nio.charset.Charset;
/**
* The type Abstract message.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/14
+ * @author slievrly
*/
public abstract class AbstractMessage implements MessageTypeAware, Serializable {
diff --git a/core/src/main/java/io/seata/core/protocol/AbstractResultMessage.java b/core/src/main/java/io/seata/core/protocol/AbstractResultMessage.java
index 04258a75ef54cf450629a25744fd7e971a9a681a..9b0922bdc6341ec323ee57e8f01079f60fc04434 100644
--- a/core/src/main/java/io/seata/core/protocol/AbstractResultMessage.java
+++ b/core/src/main/java/io/seata/core/protocol/AbstractResultMessage.java
@@ -18,8 +18,7 @@ package io.seata.core.protocol;
/**
* The type Abstract result message.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/14
+ * @author slievrly
*/
public abstract class AbstractResultMessage extends AbstractMessage {
diff --git a/core/src/main/java/io/seata/core/protocol/HeartbeatMessage.java b/core/src/main/java/io/seata/core/protocol/HeartbeatMessage.java
index 6271ffe86ead2854135e92b88559b06e8fee6124..55ba7d28bc2e5b2e66aca0e3c300ff7e50d6af61 100644
--- a/core/src/main/java/io/seata/core/protocol/HeartbeatMessage.java
+++ b/core/src/main/java/io/seata/core/protocol/HeartbeatMessage.java
@@ -20,8 +20,7 @@ import java.io.Serializable;
/**
* The type Heartbeat message.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/14
+ * @author slievrly
*/
public class HeartbeatMessage implements Serializable {
private static final long serialVersionUID = -985316399527884899L;
diff --git a/core/src/main/java/io/seata/core/protocol/MergeMessage.java b/core/src/main/java/io/seata/core/protocol/MergeMessage.java
index 7be16a69dfe831a13b2d280e6d18ab87f8284ed9..f54db37a85d94bed005469e3ad3d25db6927d30a 100644
--- a/core/src/main/java/io/seata/core/protocol/MergeMessage.java
+++ b/core/src/main/java/io/seata/core/protocol/MergeMessage.java
@@ -18,8 +18,7 @@ package io.seata.core.protocol;
/**
* The interface Merge message.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/9
+ * @author slievrly
*/
public interface MergeMessage {
}
diff --git a/core/src/main/java/io/seata/core/protocol/MergeResultMessage.java b/core/src/main/java/io/seata/core/protocol/MergeResultMessage.java
index 1ec0afacbf2930e16d6c8889bbdb1e9412e374a0..efda6599a1e0d3b60766a4c488c7f63ae78be0b4 100644
--- a/core/src/main/java/io/seata/core/protocol/MergeResultMessage.java
+++ b/core/src/main/java/io/seata/core/protocol/MergeResultMessage.java
@@ -19,8 +19,7 @@ package io.seata.core.protocol;
/**
* The type Merge result message.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/10
+ * @author slievrly
*/
public class MergeResultMessage extends AbstractMessage implements MergeMessage {
diff --git a/core/src/main/java/io/seata/core/protocol/MergedWarpMessage.java b/core/src/main/java/io/seata/core/protocol/MergedWarpMessage.java
index 89ca1e544a11ef0e39ce7d8a4d9bca953d727b6c..ed42616ee6b1dc3f83a05082bb2ca56cecbc2980 100644
--- a/core/src/main/java/io/seata/core/protocol/MergedWarpMessage.java
+++ b/core/src/main/java/io/seata/core/protocol/MergedWarpMessage.java
@@ -22,8 +22,7 @@ import java.util.List;
/**
* The type Merged warp message.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/9
+ * @author slievrly
*/
public class MergedWarpMessage extends AbstractMessage implements Serializable, MergeMessage {
diff --git a/core/src/main/java/io/seata/core/protocol/MessageFuture.java b/core/src/main/java/io/seata/core/protocol/MessageFuture.java
index bf97a88a7cf87f76c052650e3d4466a8d89cccaf..403237e2124a68f8f9eff60b862b453b90fda5a9 100644
--- a/core/src/main/java/io/seata/core/protocol/MessageFuture.java
+++ b/core/src/main/java/io/seata/core/protocol/MessageFuture.java
@@ -25,15 +25,13 @@ import java.util.concurrent.TimeoutException;
/**
* The type Message future.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/9
+ * @author slievrly
*/
public class MessageFuture {
private RpcMessage requestMessage;
private long timeout;
private long start = System.currentTimeMillis();
- private static final Object NULL = new Object();
- private transient CompletableFuture origin = new CompletableFuture();
+ private transient CompletableFuture<Object> origin = new CompletableFuture<>();
/**
* Is timeout boolean.
diff --git a/core/src/main/java/io/seata/core/protocol/MessageType.java b/core/src/main/java/io/seata/core/protocol/MessageType.java
index 05efe38e682efbfb6c9e93aa348a8f9fbb6e7027..b686e9bf5e711aec80d163278994b578810801d3 100644
--- a/core/src/main/java/io/seata/core/protocol/MessageType.java
+++ b/core/src/main/java/io/seata/core/protocol/MessageType.java
@@ -19,7 +19,6 @@ package io.seata.core.protocol;
* The type Message codec type.
*
* @author zhangsen
- * @date 2019 /5/6
*/
public class MessageType {
diff --git a/core/src/main/java/io/seata/core/protocol/ProtocolConstants.java b/core/src/main/java/io/seata/core/protocol/ProtocolConstants.java
index 6bdba890bc524a5de29d62f49a7419765ea26496..28e12746855fbdbde0d68b44a3d564830b271265 100644
--- a/core/src/main/java/io/seata/core/protocol/ProtocolConstants.java
+++ b/core/src/main/java/io/seata/core/protocol/ProtocolConstants.java
@@ -17,7 +17,7 @@ package io.seata.core.protocol;
import io.seata.config.ConfigurationFactory;
import io.seata.core.codec.CodecType;
-import io.seata.core.codec.CompressorType;
+import io.seata.core.compressor.CompressorType;
import io.seata.core.constants.ConfigurationKeys;
/**
diff --git a/core/src/main/java/io/seata/core/protocol/RegisterRMRequest.java b/core/src/main/java/io/seata/core/protocol/RegisterRMRequest.java
index b2ba0d7e5679c2acf8baf18ec0ec3c863865f49e..21dfb30d39678bddaaffe4a498d5bc689539b556 100644
--- a/core/src/main/java/io/seata/core/protocol/RegisterRMRequest.java
+++ b/core/src/main/java/io/seata/core/protocol/RegisterRMRequest.java
@@ -20,8 +20,7 @@ import java.io.Serializable;
/**
* The type Register rm request.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/10
+ * @author slievrly
*/
public class RegisterRMRequest extends AbstractIdentifyRequest implements Serializable {
diff --git a/core/src/main/java/io/seata/core/protocol/RegisterRMResponse.java b/core/src/main/java/io/seata/core/protocol/RegisterRMResponse.java
index a03bd8dd5c01d4f4166e20f193e83f7d7717a0a4..f590084a5dadb9c95d1647dae9be29d5371a8984 100644
--- a/core/src/main/java/io/seata/core/protocol/RegisterRMResponse.java
+++ b/core/src/main/java/io/seata/core/protocol/RegisterRMResponse.java
@@ -20,8 +20,7 @@ import java.io.Serializable;
/**
* The type Register rm response.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/10
+ * @author slievrly
*/
public class RegisterRMResponse extends AbstractIdentifyResponse implements Serializable {
diff --git a/core/src/main/java/io/seata/core/protocol/RegisterTMRequest.java b/core/src/main/java/io/seata/core/protocol/RegisterTMRequest.java
index aadaca77cf2713e3f41211b5ab33211c38a7eaa6..fb726bb888f8227cec7cbb29d5cd0e55bfc30f0e 100644
--- a/core/src/main/java/io/seata/core/protocol/RegisterTMRequest.java
+++ b/core/src/main/java/io/seata/core/protocol/RegisterTMRequest.java
@@ -20,8 +20,7 @@ import java.io.Serializable;
/**
* The type Register tm request.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/15
+ * @author slievrly
*/
public class RegisterTMRequest extends AbstractIdentifyRequest implements Serializable {
private static final long serialVersionUID = -5929081344190543690L;
diff --git a/core/src/main/java/io/seata/core/protocol/RegisterTMResponse.java b/core/src/main/java/io/seata/core/protocol/RegisterTMResponse.java
index 9ea88e5261aa952d05e956f0350140c216a1327e..e109c366e4244084f779ee0d6d7e3636aab4ac21 100644
--- a/core/src/main/java/io/seata/core/protocol/RegisterTMResponse.java
+++ b/core/src/main/java/io/seata/core/protocol/RegisterTMResponse.java
@@ -20,8 +20,7 @@ import java.io.Serializable;
/**
* The type Register tm response.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/15
+ * @author slievrly
*/
public class RegisterTMResponse extends AbstractIdentifyResponse implements Serializable {
diff --git a/core/src/main/java/io/seata/core/protocol/RpcMessage.java b/core/src/main/java/io/seata/core/protocol/RpcMessage.java
index 0111c4498107d653afd1f8ed82eb746c6e57637e..02d611ce24264c96c57c3c47ac37382a845d8f56 100644
--- a/core/src/main/java/io/seata/core/protocol/RpcMessage.java
+++ b/core/src/main/java/io/seata/core/protocol/RpcMessage.java
@@ -15,14 +15,15 @@
*/
package io.seata.core.protocol;
+import io.seata.common.util.StringUtils;
+
import java.util.HashMap;
import java.util.Map;
/**
* The type Rpc message.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/14
+ * @author slievrly
*/
public class RpcMessage {
@@ -166,4 +167,9 @@ public class RpcMessage {
public void setMessageType(byte messageType) {
this.messageType = messageType;
}
+
+ @Override
+ public String toString() {
+ return StringUtils.toString(this);
+ }
}
diff --git a/core/src/main/java/io/seata/core/protocol/Version.java b/core/src/main/java/io/seata/core/protocol/Version.java
index 6a3e8c8eb3b504e7578a14b518dda3603bc776e6..968a135832eb101052283cbb6694daaded26acc2 100644
--- a/core/src/main/java/io/seata/core/protocol/Version.java
+++ b/core/src/main/java/io/seata/core/protocol/Version.java
@@ -24,14 +24,14 @@ import io.seata.common.util.NetUtil;
/**
* The type Version.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class Version {
/**
* The constant CURRENT.
*/
- public static final String CURRENT = "0.9.0";
+ public static final String CURRENT = "1.0.0";
/**
* The constant VERSION_MAP.
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/BranchRegisterResponse.java b/core/src/main/java/io/seata/core/protocol/transaction/BranchRegisterResponse.java
index b3420248cc5d7e2eb50428d9c6aa0aa481496467..9572907757bd5c99f54ed1eb505fd98c328d2d83 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/BranchRegisterResponse.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/BranchRegisterResponse.java
@@ -22,7 +22,7 @@ import io.seata.core.protocol.MessageType;
/**
* The type Branch register response.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class BranchRegisterResponse extends AbstractTransactionResponse implements Serializable {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/BranchReportRequest.java b/core/src/main/java/io/seata/core/protocol/transaction/BranchReportRequest.java
index d16628c12f0201c842850a8d56cf496066519120..24784995991e3b3e01b7c288dd49cdb4ff11d39c 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/BranchReportRequest.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/BranchReportRequest.java
@@ -23,7 +23,7 @@ import io.seata.core.protocol.MessageType;
/**
* The type Branch report request.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class BranchReportRequest extends AbstractTransactionRequestToTC {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/BranchReportResponse.java b/core/src/main/java/io/seata/core/protocol/transaction/BranchReportResponse.java
index 05794718c3fa012995cf2d82507fe7d5047b6b90..ce619fb2c6fcfbf31f9a9f91baa979ba21fad879 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/BranchReportResponse.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/BranchReportResponse.java
@@ -20,7 +20,7 @@ import io.seata.core.protocol.MessageType;
/**
* The type Branch report response.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class BranchReportResponse extends AbstractTransactionResponse {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/BranchRollbackRequest.java b/core/src/main/java/io/seata/core/protocol/transaction/BranchRollbackRequest.java
index 9a27bee9f5ef05406a024772fb58d3a2397b7104..886b1383095797171e1bd2562fb62fd2b9ac40b4 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/BranchRollbackRequest.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/BranchRollbackRequest.java
@@ -21,7 +21,7 @@ import io.seata.core.rpc.RpcContext;
/**
* The type Branch rollback request.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class BranchRollbackRequest extends AbstractBranchEndRequest {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/BranchRollbackResponse.java b/core/src/main/java/io/seata/core/protocol/transaction/BranchRollbackResponse.java
index b57e7fc40610f494843efe10d9c377c00497f70e..5bad4782292508c7ae04a0257092b244a5a7a6c1 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/BranchRollbackResponse.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/BranchRollbackResponse.java
@@ -20,7 +20,7 @@ import io.seata.core.protocol.MessageType;
/**
* The type Branch rollback response.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class BranchRollbackResponse extends AbstractBranchEndResponse {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/GlobalBeginRequest.java b/core/src/main/java/io/seata/core/protocol/transaction/GlobalBeginRequest.java
index 4ddb7f783fbe62833a9c30421cb1f4e06f0bf015..8c9e8bb1bc95d0c7e6b913d6e8afbdef6c9224dd 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/GlobalBeginRequest.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/GlobalBeginRequest.java
@@ -21,7 +21,7 @@ import io.seata.core.rpc.RpcContext;
/**
* The type Global begin request.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class GlobalBeginRequest extends AbstractTransactionRequestToTC {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/GlobalBeginResponse.java b/core/src/main/java/io/seata/core/protocol/transaction/GlobalBeginResponse.java
index e6239e96112d0165db1dad2dee0fb7f98685e267..32c98434134faff9fef5a69d44a98fe15497fd45 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/GlobalBeginResponse.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/GlobalBeginResponse.java
@@ -20,7 +20,7 @@ import io.seata.core.protocol.MessageType;
/**
* The type Global begin response.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class GlobalBeginResponse extends AbstractTransactionResponse {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/GlobalCommitRequest.java b/core/src/main/java/io/seata/core/protocol/transaction/GlobalCommitRequest.java
index 645ca242de8e4f35c4672b13e0d96bf96cad7e82..ed127e22c76c52b29bda65a03e803fa3a2c30b81 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/GlobalCommitRequest.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/GlobalCommitRequest.java
@@ -21,7 +21,7 @@ import io.seata.core.rpc.RpcContext;
/**
* The type Global commit request.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class GlobalCommitRequest extends AbstractGlobalEndRequest {
@Override
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/GlobalCommitResponse.java b/core/src/main/java/io/seata/core/protocol/transaction/GlobalCommitResponse.java
index a88d87cb9ce9d9c161d01a3c5a5e6f82f50a033b..4e32f11827d842c6f44bd8adf338dde44e1d48ac 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/GlobalCommitResponse.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/GlobalCommitResponse.java
@@ -20,7 +20,7 @@ import io.seata.core.protocol.MessageType;
/**
* The type Global commit response.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class GlobalCommitResponse extends AbstractGlobalEndResponse {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/GlobalLockQueryRequest.java b/core/src/main/java/io/seata/core/protocol/transaction/GlobalLockQueryRequest.java
index 1c5e9f31369242f8b36cc0b893e827075fc33cc6..92534040c1b7d2cdc535cce35fee889cb7f7fdb6 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/GlobalLockQueryRequest.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/GlobalLockQueryRequest.java
@@ -21,7 +21,7 @@ import io.seata.core.rpc.RpcContext;
/**
* The type Global lock query request.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class GlobalLockQueryRequest extends BranchRegisterRequest {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/GlobalLockQueryResponse.java b/core/src/main/java/io/seata/core/protocol/transaction/GlobalLockQueryResponse.java
index 63f421b016ba9fc52e24d0b60a03f3ce6509b1e8..d4e69ab33038c7b1eb1203b4082c37b475f8815b 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/GlobalLockQueryResponse.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/GlobalLockQueryResponse.java
@@ -21,7 +21,7 @@ import io.seata.core.protocol.MessageType;
/**
* The type Global lock query response.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class GlobalLockQueryResponse extends AbstractTransactionResponse {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/GlobalReportRequest.java b/core/src/main/java/io/seata/core/protocol/transaction/GlobalReportRequest.java
index d95bab12d42d6ea14da9d51a846b74a1e5fd0c45..44c3a449daff06d75b6dc3a63d8cb549f427780e 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/GlobalReportRequest.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/GlobalReportRequest.java
@@ -19,8 +19,6 @@ import io.seata.core.model.GlobalStatus;
import io.seata.core.protocol.MessageType;
import io.seata.core.rpc.RpcContext;
-import java.nio.ByteBuffer;
-
/**
* The type Global report request.
*
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/GlobalRollbackRequest.java b/core/src/main/java/io/seata/core/protocol/transaction/GlobalRollbackRequest.java
index 54eb6778e081911886eaaaddcb7a1c2b34093d34..47b980e8e4a2cdfee8805b2427a1f31d2fd7df0b 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/GlobalRollbackRequest.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/GlobalRollbackRequest.java
@@ -21,7 +21,7 @@ import io.seata.core.rpc.RpcContext;
/**
* The type Global rollback request.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class GlobalRollbackRequest extends AbstractGlobalEndRequest {
@Override
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/GlobalRollbackResponse.java b/core/src/main/java/io/seata/core/protocol/transaction/GlobalRollbackResponse.java
index 8c17809c39b481d8224127689de98c12c730047b..6fdd04ff02d3148de49861a503ffdad1e12d67c3 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/GlobalRollbackResponse.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/GlobalRollbackResponse.java
@@ -20,7 +20,7 @@ import io.seata.core.protocol.MessageType;
/**
* The type Global rollback response.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class GlobalRollbackResponse extends AbstractGlobalEndResponse {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/GlobalStatusRequest.java b/core/src/main/java/io/seata/core/protocol/transaction/GlobalStatusRequest.java
index 3ec9979c0e75f5456431fe80347b344ea7532cb2..dd37b4593076e97c4c22ff133d304b3ea727dff0 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/GlobalStatusRequest.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/GlobalStatusRequest.java
@@ -21,7 +21,7 @@ import io.seata.core.rpc.RpcContext;
/**
* The type Global status request.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class GlobalStatusRequest extends AbstractGlobalEndRequest {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/GlobalStatusResponse.java b/core/src/main/java/io/seata/core/protocol/transaction/GlobalStatusResponse.java
index b12710625b99cc89dfa98766c3ed7dbb836be675..b5ec353812490a8ef19b4584812d96a2eab36db0 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/GlobalStatusResponse.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/GlobalStatusResponse.java
@@ -20,7 +20,7 @@ import io.seata.core.protocol.MessageType;
/**
* The type Global status response.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class GlobalStatusResponse extends AbstractGlobalEndResponse {
diff --git a/core/src/main/java/io/seata/core/protocol/transaction/UndoLogDeleteRequest.java b/core/src/main/java/io/seata/core/protocol/transaction/UndoLogDeleteRequest.java
index 89819698512b18b1c87adf21f108c9f1b242d9fc..1244c7601d641ea0a6bab108cf0035d043b84197 100644
--- a/core/src/main/java/io/seata/core/protocol/transaction/UndoLogDeleteRequest.java
+++ b/core/src/main/java/io/seata/core/protocol/transaction/UndoLogDeleteRequest.java
@@ -25,7 +25,6 @@ import java.io.Serializable;
* The type to delete undolog request.
*
* @author github-ygy
- * @date 2019-6-14
*/
public class UndoLogDeleteRequest extends AbstractTransactionRequestToRM implements Serializable {
diff --git a/core/src/main/java/io/seata/core/rpc/ChannelManager.java b/core/src/main/java/io/seata/core/rpc/ChannelManager.java
index 711c7f38520b116694c2236dc6c3807bf44a4f8b..e6fbdd4057843b1a2b3c12091abf398b40ab0cac 100644
--- a/core/src/main/java/io/seata/core/rpc/ChannelManager.java
+++ b/core/src/main/java/io/seata/core/rpc/ChannelManager.java
@@ -38,8 +38,7 @@ import java.util.concurrent.ConcurrentMap;
/**
* The type channel manager.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/07
+ * @author slievrly
*/
public class ChannelManager {
diff --git a/core/src/main/java/io/seata/core/rpc/ClientMessageListener.java b/core/src/main/java/io/seata/core/rpc/ClientMessageListener.java
index 6d1a0e70b2cc0758d7fa28a4ca5c38908c063a12..6f0302d8e2ab34b0484308601c699108fa537be4 100644
--- a/core/src/main/java/io/seata/core/rpc/ClientMessageListener.java
+++ b/core/src/main/java/io/seata/core/rpc/ClientMessageListener.java
@@ -20,8 +20,7 @@ import io.seata.core.protocol.RpcMessage;
/**
* The interface Client message listener.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/10
+ * @author slievrly
*/
public interface ClientMessageListener {
/**
diff --git a/core/src/main/java/io/seata/core/rpc/ClientMessageSender.java b/core/src/main/java/io/seata/core/rpc/ClientMessageSender.java
index 8804ba534c38c649ba0eb8818c5be0386c2cef78..f3b5037b6f22a9c3ed7aef5ef3cca252e6fa3719 100644
--- a/core/src/main/java/io/seata/core/rpc/ClientMessageSender.java
+++ b/core/src/main/java/io/seata/core/rpc/ClientMessageSender.java
@@ -22,8 +22,7 @@ import java.util.concurrent.TimeoutException;
/**
* The interface Client message sender.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/10
+ * @author slievrly
*/
public interface ClientMessageSender {
/**
diff --git a/core/src/main/java/io/seata/core/rpc/ClientType.java b/core/src/main/java/io/seata/core/rpc/ClientType.java
index bee506c7d21d0320d47201f004f0de405097cade..82989d6931ff53b0257dc46848439621f3d65c89 100644
--- a/core/src/main/java/io/seata/core/rpc/ClientType.java
+++ b/core/src/main/java/io/seata/core/rpc/ClientType.java
@@ -18,7 +18,7 @@ package io.seata.core.rpc;
/**
* The enum Client type.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public enum ClientType {
diff --git a/core/src/main/java/io/seata/core/rpc/DefaultServerMessageListenerImpl.java b/core/src/main/java/io/seata/core/rpc/DefaultServerMessageListenerImpl.java
index 343e337b621e8f276571b4c2e27c2ced32a444ad..5c5bdb4c1d3d1e956c07e4ade0705b28027a2bb3 100644
--- a/core/src/main/java/io/seata/core/rpc/DefaultServerMessageListenerImpl.java
+++ b/core/src/main/java/io/seata/core/rpc/DefaultServerMessageListenerImpl.java
@@ -44,8 +44,7 @@ import org.slf4j.LoggerFactory;
/**
* The type Default server message listener.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/18
+ * @author slievrly
*/
public class DefaultServerMessageListenerImpl implements ServerMessageListener {
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultServerMessageListenerImpl.class);
@@ -75,31 +74,39 @@ public class DefaultServerMessageListenerImpl implements ServerMessageListener {
LOGGER.debug("server received:{},clientIp:{},vgroup:{}", message,
NetUtil.toIpAddress(ctx.channel().remoteAddress()), rpcContext.getTransactionServiceGroup());
} else {
- logQueue.offer(
- message + ",clientIp:" + NetUtil.toIpAddress(ctx.channel().remoteAddress()) + ",vgroup:" + rpcContext
- .getTransactionServiceGroup());
+ try {
+ logQueue.put(message + ",clientIp:" + NetUtil.toIpAddress(ctx.channel().remoteAddress()) + ",vgroup:"
+ + rpcContext.getTransactionServiceGroup());
+ } catch (InterruptedException e) {
+ LOGGER.error("put message to logQueue error: {}", e.getMessage(), e);
+ }
}
if (!(message instanceof AbstractMessage)) {
return;
}
if (message instanceof MergedWarpMessage) {
- AbstractResultMessage[] results = new AbstractResultMessage[((MergedWarpMessage)message).msgs.size()];
+ AbstractResultMessage[] results = new AbstractResultMessage[((MergedWarpMessage) message).msgs.size()];
for (int i = 0; i < results.length; i++) {
- final AbstractMessage subMessage = ((MergedWarpMessage)message).msgs.get(i);
+ final AbstractMessage subMessage = ((MergedWarpMessage) message).msgs.get(i);
results[i] = transactionMessageHandler.onRequest(subMessage, rpcContext);
}
MergeResultMessage resultMessage = new MergeResultMessage();
resultMessage.setMsgs(results);
sender.sendResponse(request, ctx.channel(), resultMessage);
} else if (message instanceof AbstractResultMessage) {
- transactionMessageHandler.onResponse((AbstractResultMessage)message, rpcContext);
+ transactionMessageHandler.onResponse((AbstractResultMessage) message, rpcContext);
+ } else {
+ // the single send request message
+ final AbstractMessage msg = (AbstractMessage) message;
+ AbstractResultMessage result = transactionMessageHandler.onRequest(msg, rpcContext);
+ sender.sendResponse(request, ctx.channel(), result);
}
}
@Override
public void onRegRmMessage(RpcMessage request, ChannelHandlerContext ctx, ServerMessageSender sender,
RegisterCheckAuthHandler checkAuthHandler) {
- RegisterRMRequest message = (RegisterRMRequest)request.getBody();
+ RegisterRMRequest message = (RegisterRMRequest) request.getBody();
boolean isSuccess = false;
try {
if (null == checkAuthHandler || checkAuthHandler.regResourceManagerCheckAuth(message)) {
@@ -120,7 +127,7 @@ public class DefaultServerMessageListenerImpl implements ServerMessageListener {
@Override
public void onRegTmMessage(RpcMessage request, ChannelHandlerContext ctx, ServerMessageSender sender,
RegisterCheckAuthHandler checkAuthHandler) {
- RegisterTMRequest message = (RegisterTMRequest)request.getBody();
+ RegisterTMRequest message = (RegisterTMRequest) request.getBody();
String ipAndPort = NetUtil.toStringAddress(ctx.channel().remoteAddress());
Version.putChannelVersion(ctx.channel(), message.getVersion());
boolean isSuccess = false;
@@ -130,8 +137,8 @@ public class DefaultServerMessageListenerImpl implements ServerMessageListener {
Version.putChannelVersion(ctx.channel(), message.getVersion());
isSuccess = true;
if (LOGGER.isInfoEnabled()) {
- LOGGER.info(String.format("checkAuth for client:%s vgroup:%s ok", ipAndPort,
- message.getTransactionServiceGroup()));
+ LOGGER.info("checkAuth for client:{},vgroup:{},applicationId:{}",
+ ipAndPort,message.getTransactionServiceGroup(),message.getApplicationId());
}
}
} catch (Exception exx) {
diff --git a/core/src/main/java/io/seata/core/rpc/Disposable.java b/core/src/main/java/io/seata/core/rpc/Disposable.java
index 30272c36582d7812936a1089e60c74f3020a6d93..037041923246baf1d57fc724b263c9222ee0e734 100644
--- a/core/src/main/java/io/seata/core/rpc/Disposable.java
+++ b/core/src/main/java/io/seata/core/rpc/Disposable.java
@@ -18,10 +18,9 @@ package io.seata.core.rpc;
/**
*
* @author 563868273@qq.com
- * @date 2019/3/29
*/
public interface Disposable {
void destroy();
-}
\ No newline at end of file
+}
diff --git a/core/src/main/java/io/seata/core/rpc/RemotingServer.java b/core/src/main/java/io/seata/core/rpc/RemotingServer.java
index 8e72417dd95a4bab707520d853a6ebf005d0f0de..37003ce7b7b7b7f8232f6c86e2d7e0851ed070c3 100644
--- a/core/src/main/java/io/seata/core/rpc/RemotingServer.java
+++ b/core/src/main/java/io/seata/core/rpc/RemotingServer.java
@@ -18,8 +18,7 @@ package io.seata.core.rpc;
/**
* The interface Remoting server.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/12
+ * @author slievrly
*/
public interface RemotingServer extends RemotingService {
}
diff --git a/core/src/main/java/io/seata/core/rpc/RemotingService.java b/core/src/main/java/io/seata/core/rpc/RemotingService.java
index f8cfb972c8eb7a021c4accd4d6f487fb7e226a7b..6d30a41a5a98bdb2b7801d704fa9db9cc2f3296a 100644
--- a/core/src/main/java/io/seata/core/rpc/RemotingService.java
+++ b/core/src/main/java/io/seata/core/rpc/RemotingService.java
@@ -18,8 +18,7 @@ package io.seata.core.rpc;
/**
* The interface Remoting service.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/5
+ * @author slievrly
*/
public interface RemotingService {
/**
diff --git a/core/src/main/java/io/seata/core/rpc/RpcContext.java b/core/src/main/java/io/seata/core/rpc/RpcContext.java
index 6ba531eb16a7f183ad4acb68aef5b01ac331a2d8..cc5d0826f018363c48081ef91a429b252666bdd2 100644
--- a/core/src/main/java/io/seata/core/rpc/RpcContext.java
+++ b/core/src/main/java/io/seata/core/rpc/RpcContext.java
@@ -32,8 +32,7 @@ import org.slf4j.LoggerFactory;
/**
* The type rpc context.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/07
+ * @author slievrly
*/
public class RpcContext {
diff --git a/core/src/main/java/io/seata/core/rpc/ServerMessageListener.java b/core/src/main/java/io/seata/core/rpc/ServerMessageListener.java
index 3281225d301d93d35ba769a84f21b790b0629c5a..698e6db5846a35d480218ec0a9a697f448f2a2b7 100644
--- a/core/src/main/java/io/seata/core/rpc/ServerMessageListener.java
+++ b/core/src/main/java/io/seata/core/rpc/ServerMessageListener.java
@@ -22,8 +22,7 @@ import io.seata.core.rpc.netty.RegisterCheckAuthHandler;
/**
* The interface Server message listener.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/15
+ * @author slievrly
*/
public interface ServerMessageListener {
diff --git a/core/src/main/java/io/seata/core/rpc/ServerMessageSender.java b/core/src/main/java/io/seata/core/rpc/ServerMessageSender.java
index 0279d182b035fcc7fa1143308a800c1bc7998332..a3f0e1d8987fe67adcc15a28475e4809938ae2cc 100644
--- a/core/src/main/java/io/seata/core/rpc/ServerMessageSender.java
+++ b/core/src/main/java/io/seata/core/rpc/ServerMessageSender.java
@@ -25,8 +25,7 @@ import io.seata.core.protocol.RpcMessage;
/**
* The interface Server message sender.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/15
+ * @author slievrly
*/
public interface ServerMessageSender {
diff --git a/core/src/main/java/io/seata/core/rpc/TransactionMessageHandler.java b/core/src/main/java/io/seata/core/rpc/TransactionMessageHandler.java
index d7877f86bb2fc5e0269332632504026000175e70..63ce25168338eb44b918353e5deab103819b3106 100644
--- a/core/src/main/java/io/seata/core/rpc/TransactionMessageHandler.java
+++ b/core/src/main/java/io/seata/core/rpc/TransactionMessageHandler.java
@@ -21,7 +21,7 @@ import io.seata.core.protocol.AbstractResultMessage;
/**
* To handle the received RPC message on upper level.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public interface TransactionMessageHandler {
diff --git a/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemoting.java b/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemoting.java
index 8841adf070c9478ff01487b2eee2bf9354d7357a..6739961b20819562588d120803adb76e0818dc48 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemoting.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemoting.java
@@ -38,8 +38,6 @@ import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.lang.management.ManagementFactory;
import java.net.SocketAddress;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import java.util.Random;
import java.util.concurrent.BlockingQueue;
@@ -55,8 +53,7 @@ import java.util.concurrent.TimeoutException;
/**
* The type Abstract rpc remoting.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/12
+ * @author slievrly
*/
public abstract class AbstractRpcRemoting extends ChannelDuplexHandler implements Disposable {
@@ -71,7 +68,9 @@ public abstract class AbstractRpcRemoting extends ChannelDuplexHandler implement
*/
protected final ThreadPoolExecutor messageExecutor;
- /** Id generator of this remoting */
+ /**
+ * Id generator of this remoting
+ */
protected final PositiveAtomicCounter idGenerator = new PositiveAtomicCounter();
/**
@@ -133,19 +132,16 @@ public abstract class AbstractRpcRemoting extends ChannelDuplexHandler implement
timerExecutor.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
- List<MessageFuture> timeoutMessageFutures = new ArrayList<MessageFuture>(futures.size());
- for (MessageFuture future : futures.values()) {
- if (future.isTimeout()) {
- timeoutMessageFutures.add(future);
- }
- }
- for (MessageFuture messageFuture : timeoutMessageFutures) {
- futures.remove(messageFuture.getRequestMessage().getId());
- messageFuture.setResultMessage(null);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("timeout clear future : " + messageFuture.getRequestMessage().getBody());
+ for (Map.Entry<Integer, MessageFuture> entry : futures.entrySet()) {
+ if (entry.getValue().isTimeout()) {
+ futures.remove(entry.getKey());
+ entry.getValue().setResultMessage(null);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("timeout clear future: {}", entry.getValue().getRequestMessage().getBody());
+ }
}
}
+
nowMills = System.currentTimeMillis();
}
}, TIMEOUT_CHECK_INTERNAL, TIMEOUT_CHECK_INTERNAL, TimeUnit.MILLISECONDS);
@@ -233,45 +229,44 @@ public abstract class AbstractRpcRemoting extends ChannelDuplexHandler implement
futures.put(rpcMessage.getId(), messageFuture);
if (address != null) {
- ConcurrentHashMap<String, BlockingQueue<RpcMessage>> map = basketMap;
- BlockingQueue<RpcMessage> basket = map.get(address);
- if (basket == null) {
- map.putIfAbsent(address, new LinkedBlockingQueue<>());
- basket = map.get(address);
- }
- basket.offer(rpcMessage);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("offer message: " + rpcMessage.getBody());
- }
- if (!isSending) {
- synchronized (mergeLock) {
- mergeLock.notifyAll();
+ /*
+ The batch send.
+ Object From big to small: RpcMessage -> MergedWarpMessage -> AbstractMessage
+ @see AbstractRpcRemotingClient.MergedSendRunnable
+ */
+ if (NettyClientConfig.isEnableClientBatchSendRequest()) {
+ ConcurrentHashMap<String, BlockingQueue<RpcMessage>> map = basketMap;
+ BlockingQueue<RpcMessage> basket = map.get(address);
+ if (basket == null) {
+ map.putIfAbsent(address, new LinkedBlockingQueue<>());
+ basket = map.get(address);
}
- }
- } else {
- ChannelFuture future;
- channelWriteableCheck(channel, msg);
- future = channel.writeAndFlush(rpcMessage);
- future.addListener(new ChannelFutureListener() {
- @Override
- public void operationComplete(ChannelFuture future) {
- if (!future.isSuccess()) {
- MessageFuture messageFuture = futures.remove(rpcMessage.getId());
- if (messageFuture != null) {
- messageFuture.setResultMessage(future.cause());
- }
- destroyChannel(future.channel());
+ basket.offer(rpcMessage);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("offer message: {}", rpcMessage.getBody());
+ }
+ if (!isSending) {
+ synchronized (mergeLock) {
+ mergeLock.notifyAll();
}
}
- });
+ } else {
+ // the single send.
+ sendSingleRequest(channel, msg, rpcMessage);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("send this msg[{}] by single send.", msg);
+ }
+ }
+ } else {
+ sendSingleRequest(channel, msg, rpcMessage);
}
if (timeout > 0) {
try {
return messageFuture.get(timeout, TimeUnit.MILLISECONDS);
} catch (Exception exx) {
- LOGGER.error("wait response error:" + exx.getMessage() + ",ip:" + address + ",request:" + msg);
+ LOGGER.error("wait response error:{},ip:{},request:{}", exx.getMessage(), address, msg);
if (exx instanceof TimeoutException) {
- throw (TimeoutException)exx;
+ throw (TimeoutException) exx;
} else {
throw new RuntimeException(exx);
}
@@ -281,6 +276,24 @@ public abstract class AbstractRpcRemoting extends ChannelDuplexHandler implement
}
}
+ private void sendSingleRequest(Channel channel, Object msg, RpcMessage rpcMessage) {
+ ChannelFuture future;
+ channelWritableCheck(channel, msg);
+ future = channel.writeAndFlush(rpcMessage);
+ future.addListener(new ChannelFutureListener() {
+ @Override
+ public void operationComplete(ChannelFuture future) {
+ if (!future.isSuccess()) {
+ MessageFuture messageFuture = futures.remove(rpcMessage.getId());
+ if (messageFuture != null) {
+ messageFuture.setResultMessage(future.cause());
+ }
+ destroyChannel(future.channel());
+ }
+ }
+ });
+ }
+
/**
* Send request.
*
@@ -290,16 +303,16 @@ public abstract class AbstractRpcRemoting extends ChannelDuplexHandler implement
protected void sendRequest(Channel channel, Object msg) {
RpcMessage rpcMessage = new RpcMessage();
rpcMessage.setMessageType(msg instanceof HeartbeatMessage ?
- ProtocolConstants.MSGTYPE_HEARTBEAT_REQUEST
- : ProtocolConstants.MSGTYPE_RESQUEST);
+ ProtocolConstants.MSGTYPE_HEARTBEAT_REQUEST
+ : ProtocolConstants.MSGTYPE_RESQUEST);
rpcMessage.setCodec(ProtocolConstants.CONFIGURED_CODEC);
rpcMessage.setCompressor(ProtocolConstants.CONFIGURED_COMPRESSOR);
rpcMessage.setBody(msg);
rpcMessage.setId(getNextMessageId());
if (msg instanceof MergeMessage) {
- mergeMsgMap.put(rpcMessage.getId(), (MergeMessage)msg);
+ mergeMsgMap.put(rpcMessage.getId(), (MergeMessage) msg);
}
- channelWriteableCheck(channel, msg);
+ channelWritableCheck(channel, msg);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("write message:" + rpcMessage.getBody() + ", channel:" + channel + ",active?"
+ channel.isActive() + ",writable?" + channel.isWritable() + ",isopen?" + channel.isOpen());
@@ -310,27 +323,27 @@ public abstract class AbstractRpcRemoting extends ChannelDuplexHandler implement
/**
* Send response.
*
- * @param request the msg id
+ * @param request the msg id
* @param channel the channel
* @param msg the msg
*/
protected void sendResponse(RpcMessage request, Channel channel, Object msg) {
RpcMessage rpcMessage = new RpcMessage();
rpcMessage.setMessageType(msg instanceof HeartbeatMessage ?
- ProtocolConstants.MSGTYPE_HEARTBEAT_RESPONSE :
- ProtocolConstants.MSGTYPE_RESPONSE);
+ ProtocolConstants.MSGTYPE_HEARTBEAT_RESPONSE :
+ ProtocolConstants.MSGTYPE_RESPONSE);
rpcMessage.setCodec(request.getCodec()); // same with request
rpcMessage.setCompressor(request.getCompressor());
rpcMessage.setBody(msg);
rpcMessage.setId(request.getId());
- channelWriteableCheck(channel, msg);
+ channelWritableCheck(channel, msg);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("send response:" + rpcMessage.getBody() + ",channel:" + channel);
}
channel.writeAndFlush(rpcMessage);
}
- private void channelWriteableCheck(Channel channel, Object msg) {
+ private void channelWritableCheck(Channel channel, Object msg) {
int tryTimes = 0;
synchronized (lock) {
while (!channel.isWritable()) {
@@ -357,9 +370,9 @@ public abstract class AbstractRpcRemoting extends ChannelDuplexHandler implement
@Override
public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exception {
if (msg instanceof RpcMessage) {
- final RpcMessage rpcMessage = (RpcMessage)msg;
+ final RpcMessage rpcMessage = (RpcMessage) msg;
if (rpcMessage.getMessageType() == ProtocolConstants.MSGTYPE_RESQUEST
- || rpcMessage.getMessageType() == ProtocolConstants.MSGTYPE_RESQUEST_ONEWAY) {
+ || rpcMessage.getMessageType() == ProtocolConstants.MSGTYPE_RESQUEST_ONEWAY) {
if (LOGGER.isDebugEnabled()) {
LOGGER.debug(String.format("%s msgId:%s, body:%s", this, rpcMessage.getId(), rpcMessage.getBody()));
}
diff --git a/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingClient.java b/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingClient.java
index da800f2f2f13604c80e668c28c138f325b5da947..ce98d3ae0fd28fcc9a8c7df8a3199c8744e86718 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingClient.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingClient.java
@@ -52,9 +52,8 @@ import static io.seata.common.exception.FrameworkErrorCode.NoAvailableService;
/**
* The type Rpc remoting client.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
* @author zhaojun
- * @date 2018 /9/12
*/
public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
implements RegisterMsgListener, ClientMessageSender {
@@ -65,18 +64,18 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
private static final String SINGLE_LOG_POSTFIX = ";";
private static final int MAX_MERGE_SEND_MILLS = 1;
private static final String THREAD_PREFIX_SPLIT_CHAR = "_";
-
+
private static final int MAX_MERGE_SEND_THREAD = 1;
private static final long KEEP_ALIVE_TIME = Integer.MAX_VALUE;
private static final int SCHEDULE_INTERVAL_MILLS = 5;
private static final String MERGE_THREAD_PREFIX = "rpcMergeMessageSend";
-
+
private final RpcClientBootstrap clientBootstrap;
private NettyClientChannelManager clientChannelManager;
private ClientMessageListener clientMessageListener;
private final NettyPoolKey.TransactionRole transactionRole;
private ExecutorService mergeSendExecutorService;
-
+
public AbstractRpcRemotingClient(NettyClientConfig nettyClientConfig, EventExecutorGroup eventExecutorGroup,
ThreadPoolExecutor messageExecutor, NettyPoolKey.TransactionRole transactionRole) {
super(messageExecutor);
@@ -85,18 +84,18 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
clientChannelManager = new NettyClientChannelManager(
new NettyPoolableFactory(this, clientBootstrap), getPoolKeyFunction(), nettyClientConfig);
}
-
+
public NettyClientChannelManager getClientChannelManager() {
return clientChannelManager;
}
-
+
/**
* Get pool key function.
*
* @return lambda function
*/
protected abstract Function<String, NettyPoolKey> getPoolKeyFunction();
-
+
/**
* Get transaction service group.
*
@@ -113,21 +112,25 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
clientChannelManager.reconnect(getTransactionServiceGroup());
}
}, SCHEDULE_INTERVAL_MILLS, SCHEDULE_INTERVAL_MILLS, TimeUnit.SECONDS);
- mergeSendExecutorService = new ThreadPoolExecutor(MAX_MERGE_SEND_THREAD,
- MAX_MERGE_SEND_THREAD,
- KEEP_ALIVE_TIME, TimeUnit.MILLISECONDS,
- new LinkedBlockingQueue<>(),
- new NamedThreadFactory(getThreadPrefix(), MAX_MERGE_SEND_THREAD));
- mergeSendExecutorService.submit(new MergedSendRunnable());
+ if (NettyClientConfig.isEnableClientBatchSendRequest()) {
+ mergeSendExecutorService = new ThreadPoolExecutor(MAX_MERGE_SEND_THREAD,
+ MAX_MERGE_SEND_THREAD,
+ KEEP_ALIVE_TIME, TimeUnit.MILLISECONDS,
+ new LinkedBlockingQueue<>(),
+ new NamedThreadFactory(getThreadPrefix(), MAX_MERGE_SEND_THREAD));
+ mergeSendExecutorService.submit(new MergedSendRunnable());
+ }
super.init();
}
-
+
@Override
public void destroy() {
clientBootstrap.shutdown();
- mergeSendExecutorService.shutdown();
+ if (mergeSendExecutorService != null) {
+ mergeSendExecutorService.shutdown();
+ }
}
-
+
@Override
public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exception {
if (!(msg instanceof RpcMessage)) {
@@ -158,7 +161,7 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
}
super.channelRead(ctx, msg);
}
-
+
@Override
public void dispatch(RpcMessage request, ChannelHandlerContext ctx) {
if (clientMessageListener != null) {
@@ -178,14 +181,14 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
clientChannelManager.releaseChannel(ctx.channel(), NetUtil.toStringAddress(ctx.channel().remoteAddress()));
super.channelInactive(ctx);
}
-
+
@Override
public void userEventTriggered(ChannelHandlerContext ctx, Object evt) {
if (evt instanceof IdleStateEvent) {
- IdleStateEvent idleStateEvent = (IdleStateEvent)evt;
+ IdleStateEvent idleStateEvent = (IdleStateEvent) evt;
if (idleStateEvent.state() == IdleState.READER_IDLE) {
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("channel" + ctx.channel() + " read idle.");
+ LOGGER.info("channel {} read idle.", ctx.channel());
}
try {
String serverAddress = NetUtil.toStringAddress(ctx.channel().remoteAddress());
@@ -199,7 +202,7 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
if (idleStateEvent == IdleStateEvent.WRITER_IDLE_STATE_EVENT) {
try {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("will send ping msg,channel" + ctx.channel());
+ LOGGER.debug("will send ping msg,channel {}", ctx.channel());
}
sendRequest(ctx.channel(), HeartbeatMessage.PING);
} catch (Throwable throwable) {
@@ -208,18 +211,18 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
}
}
}
-
+
@Override
public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
LOGGER.error(FrameworkErrorCode.ExceptionCaught.getErrCode(),
NetUtil.toStringAddress(ctx.channel().remoteAddress()) + "connect exception. " + cause.getMessage(), cause);
clientChannelManager.releaseChannel(ctx.channel(), getAddressFromChannel(ctx.channel()));
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("remove exception rm channel:" + ctx.channel());
+ LOGGER.info("remove exception rm channel:{}", ctx.channel());
}
super.exceptionCaught(ctx, cause);
}
-
+
@Override
public Object sendMsgWithResponse(Object msg, long timeout) throws TimeoutException {
String validAddress = loadBalance(getTransactionServiceGroup());
@@ -227,23 +230,23 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
Object result = super.sendAsyncRequestWithResponse(validAddress, channel, msg, timeout);
return result;
}
-
+
@Override
public Object sendMsgWithResponse(Object msg) throws TimeoutException {
return sendMsgWithResponse(msg, NettyClientConfig.getRpcRequestTimeout());
}
-
+
@Override
public Object sendMsgWithResponse(String serverAddress, Object msg, long timeout)
throws TimeoutException {
return sendAsyncRequestWithResponse(serverAddress, clientChannelManager.acquireChannel(serverAddress), msg, timeout);
}
-
+
@Override
public void sendResponse(RpcMessage request, String serverAddress, Object msg) {
super.sendResponse(request, clientChannelManager.acquireChannel(serverAddress), msg);
}
-
+
/**
* Gets client message listener.
*
@@ -252,7 +255,7 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
public ClientMessageListener getClientMessageListener() {
return clientMessageListener;
}
-
+
/**
* Sets client message listener.
*
@@ -266,7 +269,7 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
public void destroyChannel(String serverAddress, Channel channel) {
clientChannelManager.destroyChannel(serverAddress, channel);
}
-
+
private String loadBalance(String transactionServiceGroup) {
InetSocketAddress address = null;
try {
@@ -280,7 +283,7 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
}
return NetUtil.toStringAddress(address);
}
-
+
private String getThreadPrefix() {
return AbstractRpcRemotingClient.MERGE_THREAD_PREFIX + THREAD_PREFIX_SPLIT_CHAR + transactionRole.name();
}
@@ -339,7 +342,7 @@ public abstract class AbstractRpcRemotingClient extends AbstractRpcRemoting
private void printMergeMessageLog(MergedWarpMessage mergeMessage) {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("merge msg size:" + mergeMessage.msgIds.size());
+ LOGGER.debug("merge msg size:{}", mergeMessage.msgIds.size());
for (AbstractMessage cm : mergeMessage.msgs) {
LOGGER.debug(cm.toString());
}
diff --git a/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingServer.java b/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingServer.java
index 2ff32c27ec6e7fe133c2b43945ff8e38653ec96e..4e2e8f05d241ae6c469e01c400b69b8dd4621381 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingServer.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/AbstractRpcRemotingServer.java
@@ -44,9 +44,8 @@ import org.slf4j.LoggerFactory;
/**
* The type Rpc remoting server.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
* @author xingfudeshi@gmail.com
- * @date 2018 /9/12
*/
public abstract class AbstractRpcRemotingServer extends AbstractRpcRemoting implements RemotingServer {
private static final Logger LOGGER = LoggerFactory.getLogger(AbstractRpcRemotingServer.class);
@@ -186,7 +185,7 @@ public abstract class AbstractRpcRemotingServer extends AbstractRpcRemoting impl
@Override
public void destroyChannel(String serverAddress, Channel channel) {
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("will destroy channel:" + channel + ",address:" + serverAddress);
+ LOGGER.info("will destroy channel:{},address:{}", channel, serverAddress);
}
channel.disconnect();
channel.close();
diff --git a/core/src/main/java/io/seata/core/rpc/netty/ChannelAuthHealthChecker.java b/core/src/main/java/io/seata/core/rpc/netty/ChannelAuthHealthChecker.java
index c635ff3dfcbc46afe04597ef8add9c05de9f5975..e21e1600c9fa3a0c848e165dd8a389d9f3092ba0 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/ChannelAuthHealthChecker.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/ChannelAuthHealthChecker.java
@@ -23,8 +23,7 @@ import io.netty.util.concurrent.Future;
/**
* The interface Channel auth health checker.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/25
+ * @author slievrly
*/
public interface ChannelAuthHealthChecker extends ChannelHealthChecker {
/**
diff --git a/core/src/main/java/io/seata/core/rpc/netty/ChannelEventListener.java b/core/src/main/java/io/seata/core/rpc/netty/ChannelEventListener.java
index 077ebb8a09486e8cca86c978f7302556dae9de79..df6d876cafdde8f4eb8201af66fb23d9de22a720 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/ChannelEventListener.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/ChannelEventListener.java
@@ -20,8 +20,7 @@ import io.netty.channel.Channel;
/**
* The interface Channel event listener.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/12
+ * @author slievrly
*/
public interface ChannelEventListener {
/**
diff --git a/core/src/main/java/io/seata/core/rpc/netty/DefaultChannelPoolHandler.java b/core/src/main/java/io/seata/core/rpc/netty/DefaultChannelPoolHandler.java
index 5753e004d9c313089229452ee10508e611ec64ac..07c57f84f788860f7205195b09b6ff50e7c5a1b4 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/DefaultChannelPoolHandler.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/DefaultChannelPoolHandler.java
@@ -23,8 +23,7 @@ import org.slf4j.LoggerFactory;
/**
* The type Default channel pool handler.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/10
+ * @author slievrly
*/
public class DefaultChannelPoolHandler extends AbstractChannelPoolHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultChannelPoolHandler.class);
diff --git a/core/src/main/java/io/seata/core/rpc/netty/NettyBaseConfig.java b/core/src/main/java/io/seata/core/rpc/netty/NettyBaseConfig.java
index 580b678492aeb62dfded62b7c258110a9a4131e4..6d0510c7c0a11c6d8bc7f094d28295a1265f6552 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/NettyBaseConfig.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/NettyBaseConfig.java
@@ -31,6 +31,7 @@ import io.netty.util.NettyRuntime;
import io.netty.util.internal.PlatformDependent;
import io.seata.config.Configuration;
import io.seata.config.ConfigurationFactory;
+import io.seata.core.constants.ConfigurationKeys;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,8 +39,7 @@ import org.slf4j.LoggerFactory;
/**
* The type Netty base config.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/24
+ * @author slievrly
*/
public class NettyBaseConfig {
private static final Logger LOGGER = LoggerFactory.getLogger(NettyBaseConfig.class);
@@ -51,18 +51,17 @@ public class NettyBaseConfig {
/**
* The constant BOSS_THREAD_PREFIX.
*/
- protected static final String BOSS_THREAD_PREFIX = CONFIG.getConfig("transport.thread-factory.boss-thread-prefix");
+ protected static final String BOSS_THREAD_PREFIX = CONFIG.getConfig(ConfigurationKeys.BOSS_THREAD_PREFIX);
/**
* The constant WORKER_THREAD_PREFIX.
*/
- protected static final String WORKER_THREAD_PREFIX = CONFIG.getConfig(
- "transport.thread-factory.worker-thread-prefix");
+ protected static final String WORKER_THREAD_PREFIX = CONFIG.getConfig(ConfigurationKeys.WORKER_THREAD_PREFIX);
/**
* The constant SHARE_BOSS_WORKER.
*/
- protected static final boolean SHARE_BOSS_WORKER = CONFIG.getBoolean("transport.thread-factory.share-boss-worker");
+ protected static final boolean SHARE_BOSS_WORKER = CONFIG.getBoolean(ConfigurationKeys.SHARE_BOSS_WORKER);
/**
* The constant WORKER_THREAD_SIZE.
@@ -108,8 +107,8 @@ public class NettyBaseConfig {
protected static final int MAX_ALL_IDLE_SECONDS = 0;
static {
- TRANSPORT_PROTOCOL_TYPE = TransportProtocolType.valueOf(CONFIG.getConfig("transport.type",TransportProtocolType.TCP.name()));
- String workerThreadSize = CONFIG.getConfig("transport.thread-factory.worker-thread-size");
+ TRANSPORT_PROTOCOL_TYPE = TransportProtocolType.valueOf(CONFIG.getConfig(ConfigurationKeys.TRANSPORT_TYPE, TransportProtocolType.TCP.name()));
+ String workerThreadSize = CONFIG.getConfig(ConfigurationKeys.WORKER_THREAD_SIZE);
if (StringUtils.isNotBlank(workerThreadSize) && StringUtils.isNumeric(workerThreadSize)) {
WORKER_THREAD_SIZE = Integer.parseInt(workerThreadSize);
} else if (null != WorkThreadMode.getModeByName(workerThreadSize)) {
@@ -117,7 +116,7 @@ public class NettyBaseConfig {
} else {
WORKER_THREAD_SIZE = WorkThreadMode.Default.getValue();
}
- TRANSPORT_SERVER_TYPE = TransportServerType.valueOf(CONFIG.getConfig("transport.server",TransportServerType.NIO.name()));
+ TRANSPORT_SERVER_TYPE = TransportServerType.valueOf(CONFIG.getConfig(ConfigurationKeys.TRANSPORT_SERVER, TransportServerType.NIO.name()));
switch (TRANSPORT_SERVER_TYPE) {
case NIO:
if (TRANSPORT_PROTOCOL_TYPE == TransportProtocolType.TCP) {
@@ -161,7 +160,7 @@ public class NettyBaseConfig {
default:
throw new IllegalArgumentException("unsupported.");
}
- boolean enableHeartbeat = CONFIG.getBoolean("transport.heartbeat", false);
+ boolean enableHeartbeat = CONFIG.getBoolean(ConfigurationKeys.TRANSPORT_HEARTBEAT, false);
if (enableHeartbeat) {
MAX_WRITE_IDLE_SECONDS = DEFAULT_WRITE_IDLE_SECONDS;
} else {
diff --git a/core/src/main/java/io/seata/core/rpc/netty/NettyClientChannelManager.java b/core/src/main/java/io/seata/core/rpc/netty/NettyClientChannelManager.java
index 62d093f6d65402ad4e26e89956bb06d3a1ba8804..de20cf4084312ebd3f1f2e6e7f1964af48072e63 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/NettyClientChannelManager.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/NettyClientChannelManager.java
@@ -27,16 +27,17 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.InetSocketAddress;
-import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.function.Function;
+import java.util.stream.Collectors;
/**
* Netty client pool manager.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
* @author zhaojun
*/
class NettyClientChannelManager {
@@ -159,11 +160,14 @@ class NettyClientChannelManager {
List<String> availList = null;
try {
availList = getAvailServerList(transactionServiceGroup);
- } catch (Exception exx) {
- LOGGER.error("Failed to get available servers: {}", exx.getMessage());
+ } catch (Exception e) {
+ LOGGER.error("Failed to get available servers: {}", e.getMessage(), e);
+ return;
}
if (CollectionUtils.isEmpty(availList)) {
- LOGGER.error("no available server to connect.");
+ String serviceGroup = RegistryFactory.getInstance()
+ .getServiceGroup(transactionServiceGroup);
+ LOGGER.error("no available service '{}' found, please make sure registry config correct", serviceGroup);
return;
}
for (String serverAddress : availList) {
@@ -209,15 +213,15 @@ class NettyClientChannelManager {
}
private List<String> getAvailServerList(String transactionServiceGroup) throws Exception {
- List<String> availList = new ArrayList<>();
- List<InetSocketAddress> availInetSocketAddressList = RegistryFactory.getInstance().lookup(
- transactionServiceGroup);
- if (!CollectionUtils.isEmpty(availInetSocketAddressList)) {
- for (InetSocketAddress address : availInetSocketAddressList) {
- availList.add(NetUtil.toStringAddress(address));
- }
+ List<InetSocketAddress> availInetSocketAddressList = RegistryFactory.getInstance()
+ .lookup(transactionServiceGroup);
+ if (CollectionUtils.isEmpty(availInetSocketAddressList)) {
+ return Collections.emptyList();
}
- return availList;
+
+ return availInetSocketAddressList.stream()
+ .map(NetUtil::toStringAddress)
+ .collect(Collectors.toList());
}
private Channel getExistAliveChannel(Channel rmChannel, String serverAddress) {
diff --git a/core/src/main/java/io/seata/core/rpc/netty/NettyClientConfig.java b/core/src/main/java/io/seata/core/rpc/netty/NettyClientConfig.java
index 24c7a0f7c513c833f89ef5cdf1e436f4861e9c54..47196f09ee1c2031279a8559f13ece2438e19c59 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/NettyClientConfig.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/NettyClientConfig.java
@@ -16,11 +16,12 @@
package io.seata.core.rpc.netty;
import io.netty.channel.Channel;
+import io.seata.core.constants.ConfigurationKeys;
/**
* The type Netty client config.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class NettyClientConfig extends NettyBaseConfig {
@@ -52,6 +53,7 @@ public class NettyClientConfig extends NettyBaseConfig {
private static final boolean DEFAULT_POOL_TEST_BORROW = true;
private static final boolean DEFAULT_POOL_TEST_RETURN = true;
private static final boolean DEFAULT_POOL_LIFO = true;
+ private static final boolean ENABLE_CLIENT_BATCH_SEND_REQUEST = CONFIG.getBoolean(ConfigurationKeys.ENABLE_CLIENT_BATCH_SEND_REQUEST, true);
/**
* Gets connect timeout millis.
@@ -342,7 +344,7 @@ public class NettyClientConfig extends NettyBaseConfig {
* @return the client selector thread size
*/
public int getClientSelectorThreadSize() {
- return CONFIG.getInt("transport.thread-factory.client-selector-thread-size", DEFAULT_SELECTOR_THREAD_SIZE);
+ return CONFIG.getInt(ConfigurationKeys.CLIENT_SELECTOR_THREAD_SIZE, DEFAULT_SELECTOR_THREAD_SIZE);
}
/**
@@ -360,8 +362,7 @@ public class NettyClientConfig extends NettyBaseConfig {
* @return the string
*/
public String getClientSelectorThreadPrefix() {
- return CONFIG.getConfig("transport.thread-factory.client-selector-thread-prefix",
- DEFAULT_SELECTOR_THREAD_PREFIX);
+ return CONFIG.getConfig(ConfigurationKeys.CLIENT_SELECTOR_THREAD_PREFIX, DEFAULT_SELECTOR_THREAD_PREFIX);
}
/**
@@ -370,7 +371,7 @@ public class NettyClientConfig extends NettyBaseConfig {
* @return the string
*/
public String getClientWorkerThreadPrefix() {
- return CONFIG.getConfig("transport.thread-factory.client-worker-thread-prefix", DEFAULT_WORKER_THREAD_PREFIX);
+ return CONFIG.getConfig(ConfigurationKeys.CLIENT_WORKER_THREAD_PREFIX, DEFAULT_WORKER_THREAD_PREFIX);
}
/**
@@ -444,4 +445,8 @@ public class NettyClientConfig extends NettyBaseConfig {
public String getRmDispatchThreadPrefix() {
return RPC_DISPATCH_THREAD_PREFIX + "_" + NettyPoolKey.TransactionRole.RMROLE.name();
}
+
+ public static boolean isEnableClientBatchSendRequest() {
+ return ENABLE_CLIENT_BATCH_SEND_REQUEST;
+ }
}
diff --git a/core/src/main/java/io/seata/core/rpc/netty/NettyPoolKey.java b/core/src/main/java/io/seata/core/rpc/netty/NettyPoolKey.java
index 90bddcbda51a3c1ee4a40a926695b0f0bd395ca2..43d2e3e8cbf5cc97bf56f34050b827feb10a52d9 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/NettyPoolKey.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/NettyPoolKey.java
@@ -20,8 +20,7 @@ import io.seata.core.protocol.AbstractMessage;
/**
* The type Netty pool key.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /11/29
+ * @author slievrly
*/
public class NettyPoolKey {
diff --git a/core/src/main/java/io/seata/core/rpc/netty/NettyPoolableFactory.java b/core/src/main/java/io/seata/core/rpc/netty/NettyPoolableFactory.java
index 0c5c7ebea567eb2e9301f3336b9731c8fae5f1b7..c18eae131b2846781eca84557e8bbce3c67c1da6 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/NettyPoolableFactory.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/NettyPoolableFactory.java
@@ -29,15 +29,14 @@ import java.net.InetSocketAddress;
/**
* The type Netty key poolable factory.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /11/19
+ * @author slievrly
*/
public class NettyPoolableFactory implements KeyedPoolableObjectFactory<NettyPoolKey, Channel> {
private static final Logger LOGGER = LoggerFactory.getLogger(NettyPoolableFactory.class);
-
+
private final AbstractRpcRemotingClient rpcRemotingClient;
-
+
private final RpcClientBootstrap clientBootstrap;
/**
@@ -45,8 +44,7 @@ public class NettyPoolableFactory implements KeyedPoolableObjectFactory<NettyPoo
*
* @param rpcRemotingClient the rpc remoting client
*/
- public NettyPoolableFactory(AbstractRpcRemotingClient rpcRemotingClient,
- RpcClientBootstrap clientBootstrap) {
+ public NettyPoolableFactory(AbstractRpcRemotingClient rpcRemotingClient, RpcClientBootstrap clientBootstrap) {
this.rpcRemotingClient = rpcRemotingClient;
this.clientBootstrap = clientBootstrap;
}
@@ -54,7 +52,7 @@ public class NettyPoolableFactory implements KeyedPoolableObjectFactory<NettyPoo
@Override
public Channel makeObject(NettyPoolKey key) {
InetSocketAddress address = NetUtil.toInetSocketAddress(key.getAddress());
- if (LOGGER.isInfoEnabled()) {
+ if (LOGGER.isInfoEnabled()) {
LOGGER.info("NettyPool create channel to " + key);
}
Channel tmpChannel = clientBootstrap.getNewChannel(address);
@@ -62,8 +60,7 @@ public class NettyPoolableFactory implements KeyedPoolableObjectFactory<NettyPoo
Object response;
Channel channelToServer = null;
if (null == key.getMessage()) {
- throw new FrameworkException(
- "register msg is null, role:" + key.getTransactionRole().name());
+ throw new FrameworkException("register msg is null, role:" + key.getTransactionRole().name());
}
try {
response = rpcRemotingClient.sendAsyncRequestWithResponse(tmpChannel, key.getMessage());
@@ -71,35 +68,37 @@ public class NettyPoolableFactory implements KeyedPoolableObjectFactory<NettyPoo
rpcRemotingClient.onRegisterMsgFail(key.getAddress(), tmpChannel, response, key.getMessage());
} else {
channelToServer = tmpChannel;
- rpcRemotingClient.onRegisterMsgSuccess(key.getAddress(), tmpChannel, response,
- key.getMessage());
+ rpcRemotingClient.onRegisterMsgSuccess(key.getAddress(), tmpChannel, response, key.getMessage());
}
} catch (Exception exx) {
- if (tmpChannel != null) { tmpChannel.close(); }
+ if (tmpChannel != null) {
+ tmpChannel.close();
+ }
throw new FrameworkException(
"register error,role:" + key.getTransactionRole().name() + ",err:" + exx.getMessage());
}
if (LOGGER.isInfoEnabled()) {
- LOGGER.info(
- "register success, cost " + (System.currentTimeMillis() - start) + " ms, version:"
- + getVersion(response, key.getTransactionRole()) + ",role:" + key.getTransactionRole().name()
- + ",channel:" + channelToServer);
+ LOGGER.info("register success, cost " + (System.currentTimeMillis() - start) + " ms, version:" + getVersion(
+ response, key.getTransactionRole()) + ",role:" + key.getTransactionRole().name() + ",channel:"
+ + channelToServer);
}
return channelToServer;
}
private boolean isResponseSuccess(Object response, NettyPoolKey.TransactionRole transactionRole) {
- if (null == response) { return false; }
+ if (null == response) {
+ return false;
+ }
if (transactionRole.equals(NettyPoolKey.TransactionRole.TMROLE)) {
if (!(response instanceof RegisterTMResponse)) {
return false;
}
- return ((RegisterTMResponse) response).isIdentified();
+ return ((RegisterTMResponse)response).isIdentified();
} else if (transactionRole.equals(NettyPoolKey.TransactionRole.RMROLE)) {
if (!(response instanceof RegisterRMResponse)) {
return false;
}
- return ((RegisterRMResponse) response).isIdentified();
+ return ((RegisterRMResponse)response).isIdentified();
}
return false;
}
@@ -114,7 +113,6 @@ public class NettyPoolableFactory implements KeyedPoolableObjectFactory<NettyPoo
@Override
public void destroyObject(NettyPoolKey key, Channel channel) throws Exception {
-
if (null != channel) {
if (LOGGER.isInfoEnabled()) {
LOGGER.info("will destroy channel:" + channel);
diff --git a/core/src/main/java/io/seata/core/rpc/netty/NettyServerConfig.java b/core/src/main/java/io/seata/core/rpc/netty/NettyServerConfig.java
index e3e201e6d238496e0283b81f93408424aa10dde6..48385d585938265c8717b078a4ac5767f2d0ca5d 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/NettyServerConfig.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/NettyServerConfig.java
@@ -19,12 +19,12 @@ import io.netty.buffer.PooledByteBufAllocator;
import io.netty.channel.ServerChannel;
import io.netty.channel.epoll.Epoll;
import io.netty.channel.epoll.EpollServerSocketChannel;
+import io.seata.core.constants.ConfigurationKeys;
/**
* The type Netty server config.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/12
+ * @author slievrly
*/
public class NettyServerConfig extends NettyBaseConfig {
@@ -53,7 +53,7 @@ public class NettyServerConfig extends NettyBaseConfig {
/**
* The Server channel clazz.
*/
- public final Class<? extends ServerChannel> SERVER_CHANNEL_CLAZZ = NettyBaseConfig.SERVER_CHANNEL_CLAZZ;
+ public static final Class<? extends ServerChannel> SERVER_CHANNEL_CLAZZ = NettyBaseConfig.SERVER_CHANNEL_CLAZZ;
/**
* The constant DIRECT_BYTE_BUF_ALLOCATOR.
@@ -269,7 +269,7 @@ public class NettyServerConfig extends NettyBaseConfig {
* @return the string
*/
public String getBossThreadPrefix() {
- return CONFIG.getConfig("transport.thread-factory.boss-thread-prefix", DEFAULT_BOSS_THREAD_PREFIX);
+ return CONFIG.getConfig(ConfigurationKeys.BOSS_THREAD_PREFIX, DEFAULT_BOSS_THREAD_PREFIX);
}
/**
@@ -278,7 +278,7 @@ public class NettyServerConfig extends NettyBaseConfig {
* @return the string
*/
public String getWorkerThreadPrefix() {
- return CONFIG.getConfig("transport.thread-factory.worker-thread-prefix",
+ return CONFIG.getConfig(ConfigurationKeys.WORKER_THREAD_PREFIX,
enableEpoll() ? EPOLL_WORKER_THREAD_PREFIX : NIO_WORKER_THREAD_PREFIX);
}
@@ -288,7 +288,7 @@ public class NettyServerConfig extends NettyBaseConfig {
* @return the string
*/
public String getExecutorThreadPrefix() {
- return CONFIG.getConfig("transport.thread-factory.server-executor-thread-prefix",
+ return CONFIG.getConfig(ConfigurationKeys.SERVER_EXECUTOR_THREAD_PREFIX,
DEFAULT_EXECUTOR_THREAD_PREFIX);
}
@@ -298,7 +298,7 @@ public class NettyServerConfig extends NettyBaseConfig {
* @return the int
*/
public int getBossThreadSize() {
- return CONFIG.getInt("transport.thread-factory.boss-thread-size", DEFAULT_BOSS_THREAD_SIZE);
+ return CONFIG.getInt(ConfigurationKeys.BOSS_THREAD_SIZE, DEFAULT_BOSS_THREAD_SIZE);
}
/**
@@ -307,6 +307,6 @@ public class NettyServerConfig extends NettyBaseConfig {
* @return the int
*/
public int getServerShutdownWaitTime() {
- return CONFIG.getInt("transport.shutdown.wait", DEFAULT_SHUTDOWN_TIMEOUT_SEC);
+ return CONFIG.getInt(ConfigurationKeys.SHUNDOWN_WAIT, DEFAULT_SHUTDOWN_TIMEOUT_SEC);
}
}
diff --git a/core/src/main/java/io/seata/core/rpc/netty/RegisterCheckAuthHandler.java b/core/src/main/java/io/seata/core/rpc/netty/RegisterCheckAuthHandler.java
index ef0afc75f63805f4c2aac2ad037fa4ea6e18241a..849531582be0deb099d2dd88281586df89d47259 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/RegisterCheckAuthHandler.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/RegisterCheckAuthHandler.java
@@ -21,8 +21,7 @@ import io.seata.core.protocol.RegisterTMRequest;
/**
* The interface Register check auth handler.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/7
+ * @author slievrly
*/
public interface RegisterCheckAuthHandler {
diff --git a/core/src/main/java/io/seata/core/rpc/netty/RegisterMsgListener.java b/core/src/main/java/io/seata/core/rpc/netty/RegisterMsgListener.java
index 98ba76fad0374ae459e138973143a08443817aa4..6f78e93c42a2c6dea632d16995e270eb1ac0e0b4 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/RegisterMsgListener.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/RegisterMsgListener.java
@@ -21,8 +21,7 @@ import io.seata.core.protocol.AbstractMessage;
/**
* The interface Register msg listener.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /11/29
+ * @author slievrly
*/
public interface RegisterMsgListener {
diff --git a/core/src/main/java/io/seata/core/rpc/netty/RmMessageListener.java b/core/src/main/java/io/seata/core/rpc/netty/RmMessageListener.java
index f3b297739173e6745162c6e7a8a69e9b80194a1b..59f11da4ff84ccb4866f5ecf05174eb01f08a213 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/RmMessageListener.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/RmMessageListener.java
@@ -32,8 +32,7 @@ import org.slf4j.LoggerFactory;
/**
* The type Rm message listener.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/11
+ * @author slievrly
*/
public class RmMessageListener implements ClientMessageListener {
@@ -69,14 +68,13 @@ public class RmMessageListener implements ClientMessageListener {
handleBranchCommit(request, serverAddress, (BranchCommitRequest)msg, sender);
} else if (msg instanceof BranchRollbackRequest) {
handleBranchRollback(request, serverAddress, (BranchRollbackRequest)msg, sender);
- }else if (msg instanceof UndoLogDeleteRequest) {
- handleUndoLogDelete((UndoLogDeleteRequest) msg);
+ } else if (msg instanceof UndoLogDeleteRequest) {
+ handleUndoLogDelete((UndoLogDeleteRequest)msg);
}
}
private void handleBranchRollback(RpcMessage request, String serverAddress,
- BranchRollbackRequest branchRollbackRequest,
- ClientMessageSender sender) {
+ BranchRollbackRequest branchRollbackRequest, ClientMessageSender sender) {
BranchRollbackResponse resultMessage = null;
resultMessage = (BranchRollbackResponse)handler.onRequest(branchRollbackRequest, null);
if (LOGGER.isDebugEnabled()) {
@@ -89,8 +87,7 @@ public class RmMessageListener implements ClientMessageListener {
}
}
- private void handleBranchCommit(RpcMessage request, String serverAddress,
- BranchCommitRequest branchCommitRequest,
+ private void handleBranchCommit(RpcMessage request, String serverAddress, BranchCommitRequest branchCommitRequest,
ClientMessageSender sender) {
BranchCommitResponse resultMessage = null;
diff --git a/core/src/main/java/io/seata/core/rpc/netty/RmRpcClient.java b/core/src/main/java/io/seata/core/rpc/netty/RmRpcClient.java
index aa85fb73319953ab916cb3f7e4f4e337886948ba..b1db54631f7f56b5a86d561610ecb7bc205ab3ce 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/RmRpcClient.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/RmRpcClient.java
@@ -30,7 +30,6 @@ import io.netty.util.concurrent.EventExecutorGroup;
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.common.exception.FrameworkException;
import io.seata.common.thread.NamedThreadFactory;
-import io.seata.common.util.StringUtils;
import io.seata.core.model.Resource;
import io.seata.core.model.ResourceManager;
import io.seata.core.protocol.AbstractMessage;
@@ -45,9 +44,8 @@ import static io.seata.common.Constants.DBKEYS_SPLIT_CHAR;
/**
* The type Rm rpc client.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
* @author zhaojun
- * @date 2018 /10/10
*/
@Sharable
public final class RmRpcClient extends AbstractRpcRemotingClient {
@@ -147,17 +145,7 @@ public final class RmRpcClient extends AbstractRpcRemotingClient {
protected Function<String, NettyPoolKey> getPoolKeyFunction() {
return (serverAddress) -> {
String resourceIds = getMergedResourceKeys();
- synchronized (ResourceManager.RESOURCE_LOCK) {
- while (StringUtils.isNullOrEmpty(resourceIds)) {
- try {
- ResourceManager.RESOURCE_LOCK.wait();
- } catch (InterruptedException exx) {
- LOGGER.error("wait resourceIds interrupted error:{}", exx.getMessage(), exx);
- }
- resourceIds = getMergedResourceKeys();
- }
- }
- if (LOGGER.isInfoEnabled()) {
+ if (null != resourceIds && LOGGER.isInfoEnabled()) {
LOGGER.info("RM will register :{}", resourceIds);
}
RegisterRMRequest message = new RegisterRMRequest(applicationId, transactionServiceGroup);
@@ -206,9 +194,6 @@ public final class RmRpcClient extends AbstractRpcRemotingClient {
* @param resourceId the db key
*/
public void registerResource(String resourceGroupId, String resourceId) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("register to RM resourceId:{}", resourceId);
- }
if (getClientChannelManager().getChannels().isEmpty()) {
getClientChannelManager().reconnect(transactionServiceGroup);
return;
@@ -218,26 +203,26 @@ public final class RmRpcClient extends AbstractRpcRemotingClient {
String serverAddress = entry.getKey();
Channel rmChannel = entry.getValue();
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("register resource, resourceId:{}", resourceId);
+ LOGGER.info("will register resourceId:{}", resourceId);
}
sendRegisterMessage(serverAddress, rmChannel, resourceId);
}
}
}
- private void sendRegisterMessage(String serverAddress, Channel channel, String dbKey) {
+ private void sendRegisterMessage(String serverAddress, Channel channel, String resourceId) {
RegisterRMRequest message = new RegisterRMRequest(applicationId, transactionServiceGroup);
- message.setResourceIds(dbKey);
+ message.setResourceIds(resourceId);
try {
super.sendAsyncRequestWithoutResponse(channel, message);
} catch (FrameworkException e) {
if (e.getErrcode() == FrameworkErrorCode.ChannelIsNotWritable && serverAddress != null) {
getClientChannelManager().releaseChannel(channel, serverAddress);
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("remove channel:{}", channel);
+ LOGGER.info("remove not writable channel:{}", channel);
}
} else {
- LOGGER.error("register RM failed, channel:{}", channel, e);
+ LOGGER.error("register resource failed, channel:{},resourceId:{}", channel, resourceId, e);
}
} catch (TimeoutException e) {
LOGGER.error(e.getMessage());
diff --git a/core/src/main/java/io/seata/core/rpc/netty/RpcClientBootstrap.java b/core/src/main/java/io/seata/core/rpc/netty/RpcClientBootstrap.java
index ec596a19f045eb3c91c9c2e63d1b202e95319067..5c1c0cd2759d7de49c275100e72cbd8b549da385 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/RpcClientBootstrap.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/RpcClientBootstrap.java
@@ -49,7 +49,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
/**
* Rpc client.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
* @author zhaojun
*/
public class RpcClientBootstrap implements RemotingClient {
diff --git a/core/src/main/java/io/seata/core/rpc/netty/RpcClientHandler.java b/core/src/main/java/io/seata/core/rpc/netty/RpcClientHandler.java
index 6823bca21cffe49ac2c49dae2dfbb109a129090b..5346ff898d78496be8a101b764a038039438f878 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/RpcClientHandler.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/RpcClientHandler.java
@@ -26,8 +26,7 @@ import org.slf4j.LoggerFactory;
/**
* The type Rpc client handler.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/12
+ * @author slievrly
*/
public class RpcClientHandler extends ChannelDuplexHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(RpcClientHandler.class);
diff --git a/core/src/main/java/io/seata/core/rpc/netty/RpcEventLoopGroup.java b/core/src/main/java/io/seata/core/rpc/netty/RpcEventLoopGroup.java
index 8b1ddaaee6b435f41b43e7df62d47e502aca76ad..f20d8dc08fd971922a3650b5ed14c3a535a9f6d3 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/RpcEventLoopGroup.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/RpcEventLoopGroup.java
@@ -22,8 +22,7 @@ import io.netty.channel.EventLoopGroup;
/**
* The interface Rpc event loop group.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/12
+ * @author slievrly
*/
public interface RpcEventLoopGroup {
diff --git a/core/src/main/java/io/seata/core/rpc/netty/RpcServer.java b/core/src/main/java/io/seata/core/rpc/netty/RpcServer.java
index 750b91004f5706ec3f1a28aafac1ef07a959e7e2..189652a1f13e82a862a55cb42f2bbf0bc368ea61 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/RpcServer.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/RpcServer.java
@@ -41,8 +41,7 @@ import java.util.concurrent.TimeoutException;
/**
* The type Abstract rpc server.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /10/15
+ * @author slievrly
*/
@Sharable
public class RpcServer extends AbstractRpcRemotingServer implements ServerMessageSender {
@@ -210,12 +209,11 @@ public class RpcServer extends AbstractRpcRemotingServer implements ServerMessag
* @throws TimeoutException the timeout exception
*/
@Override
- public Object sendSyncRequest(String resourceId, String clientId, Object message,
- long timeout) throws TimeoutException {
+ public Object sendSyncRequest(String resourceId, String clientId, Object message, long timeout)
+ throws TimeoutException {
Channel clientChannel = ChannelManager.getChannel(resourceId, clientId);
if (clientChannel == null) {
- throw new RuntimeException("rm client is not connected. dbkey:" + resourceId
- + ",clientId:" + clientId);
+ throw new RuntimeException("rm client is not connected. dbkey:" + resourceId + ",clientId:" + clientId);
}
return sendAsyncRequestWithResponse(null, clientChannel, message, timeout);
@@ -264,36 +262,34 @@ public class RpcServer extends AbstractRpcRemotingServer implements ServerMessag
* @throws TimeoutException the timeout exception
*/
@Override
- public Object sendSyncRequest(String resourceId, String clientId, Object message)
- throws TimeoutException {
+ public Object sendSyncRequest(String resourceId, String clientId, Object message) throws TimeoutException {
return sendSyncRequest(resourceId, clientId, message, NettyServerConfig.getRpcRequestTimeout());
}
/**
* Send request with response object.
*
- * @param channel the channel
- * @param message the msg
+ * @param channel the channel
+ * @param message the msg
* @return the object
* @throws TimeoutException the timeout exception
*/
@Override
public Object sendASyncRequest(Channel channel, Object message) throws IOException, TimeoutException {
- return sendAsyncRequestWithoutResponse(channel, message);
+ return sendAsyncRequestWithoutResponse(channel, message);
}
/**
* Dispatch.
*
* @param request the request
- * @param ctx the ctx
+ * @param ctx the ctx
*/
@Override
public void dispatch(RpcMessage request, ChannelHandlerContext ctx) {
Object msg = request.getBody();
if (msg instanceof RegisterRMRequest) {
- serverMessageListener.onRegRmMessage(request, ctx, this,
- checkAuthHandler);
+ serverMessageListener.onRegRmMessage(request, ctx, this, checkAuthHandler);
} else {
if (ChannelManager.isRegistered(ctx.channel())) {
serverMessageListener.onTrxMessage(request, ctx, this);
@@ -354,7 +350,7 @@ public class RpcServer extends AbstractRpcRemotingServer implements ServerMessag
@Override
public void channelRead(final ChannelHandlerContext ctx, Object msg) throws Exception {
if (msg instanceof RpcMessage) {
- RpcMessage rpcMessage = (RpcMessage) msg;
+ RpcMessage rpcMessage = (RpcMessage)msg;
debugLog("read:" + rpcMessage.getBody());
if (rpcMessage.getBody() instanceof RegisterTMRequest) {
serverMessageListener.onRegTmMessage(rpcMessage, ctx, this, checkAuthHandler);
diff --git a/core/src/main/java/io/seata/core/rpc/netty/ShutdownHook.java b/core/src/main/java/io/seata/core/rpc/netty/ShutdownHook.java
index 33a20d3683a9452a1d7a41fa807162ea5112e879..a9e14fa05a1c7287cdee7fa91a36cfbbe78187d5 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/ShutdownHook.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/ShutdownHook.java
@@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory;
* ensure the shutdownHook is singleton
*
* @author 563868273@qq.com
- * @date 2019/3/29
*/
public class ShutdownHook extends Thread {
@@ -114,10 +113,10 @@ public class ShutdownHook extends Thread {
@Override
public boolean equals(Object other) {
- if(this == other){
+ if (this == other) {
return true;
}
- if(!(other instanceof DisposablePriorityWrapper)){
+ if (!(other instanceof DisposablePriorityWrapper)) {
return false;
}
DisposablePriorityWrapper dpw = (DisposablePriorityWrapper)other;
diff --git a/core/src/main/java/io/seata/core/rpc/netty/TmRpcClient.java b/core/src/main/java/io/seata/core/rpc/netty/TmRpcClient.java
index 17fae302edcc88475b4574ee453935f43210b8bc..d40dc6f39aec547e43ead7e1c6d44c806f4c98db 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/TmRpcClient.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/TmRpcClient.java
@@ -39,9 +39,8 @@ import java.util.function.Function;
/**
* The type Rpc client.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
* @author zhaojun
- * @date 2018 /10/23
*/
@Sharable
public final class TmRpcClient extends AbstractRpcRemotingClient {
diff --git a/core/src/main/java/io/seata/core/rpc/netty/TransportProtocolType.java b/core/src/main/java/io/seata/core/rpc/netty/TransportProtocolType.java
index 817002a0409a26aee82cbeeb41fbf77d5734b59e..688064e62256fcb47b49764c3e61805360e5d9f3 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/TransportProtocolType.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/TransportProtocolType.java
@@ -18,8 +18,7 @@ package io.seata.core.rpc.netty;
/**
* The enum Transport protocol type.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/10
+ * @author slievrly
*/
public enum TransportProtocolType {
/**
diff --git a/core/src/main/java/io/seata/core/rpc/netty/TransportServerType.java b/core/src/main/java/io/seata/core/rpc/netty/TransportServerType.java
index c8e9fe5aa99dc6b0dc4ad9eb97cab7ee458cbd41..616b4e3dead16a0c77ecd11c3c8d840f5af2ee4d 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/TransportServerType.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/TransportServerType.java
@@ -18,8 +18,7 @@ package io.seata.core.rpc.netty;
/**
* The enum Transport server type.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /9/10
+ * @author slievrly
*/
public enum TransportServerType {
/**
diff --git a/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Decoder.java b/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Decoder.java
index 06533808160e30ac5ab0a93afbe5440d946ceef5..039ff7f5cf48a19e9a0b6d40e07c1476148dd92e 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Decoder.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Decoder.java
@@ -20,6 +20,8 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.LengthFieldBasedFrameDecoder;
import io.seata.core.codec.Codec;
import io.seata.core.codec.CodecFactory;
+import io.seata.core.compressor.Compressor;
+import io.seata.core.compressor.CompressorFactory;
import io.seata.core.protocol.HeartbeatMessage;
import io.seata.core.protocol.ProtocolConstants;
import io.seata.core.protocol.RpcMessage;
@@ -33,7 +35,7 @@ import java.util.Map;
* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
* +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
* | magic |Proto| Full length | Head | Msg |Seria|Compr| RequestId |
- * | code |colVer| （head+body) | Length |Type |lizer|ess | |
+ * | code |colVer| (head+body) | Length |Type |lizer|ess | |
* +-----------+-----------+-----------+-----------+-----------+-----------+-----------+-----------+
* | |
* | Head Map [Optional] |
@@ -75,6 +77,7 @@ public class ProtocolV1Decoder extends LengthFieldBasedFrameDecoder {
super(maxFrameLength, 3, 4, -7, 0);
}
+ @Override
protected Object decode(ChannelHandlerContext ctx, ByteBuf in) throws Exception {
Object decoded = super.decode(ctx, in);
if (decoded instanceof ByteBuf) {
@@ -106,13 +109,13 @@ public class ProtocolV1Decoder extends LengthFieldBasedFrameDecoder {
short headLength = frame.readShort();
byte messageType = frame.readByte();
byte codecType = frame.readByte();
- byte compressor = frame.readByte();
+ byte compressorType = frame.readByte();
int requestId = frame.readInt();
RpcMessage rpcMessage = new RpcMessage();
rpcMessage.setCodec(codecType);
rpcMessage.setId(requestId);
- rpcMessage.setCompressor(compressor);
+ rpcMessage.setCompressor(compressorType);
rpcMessage.setMessageType(messageType);
// direct read head with zero-copy
@@ -132,6 +135,8 @@ public class ProtocolV1Decoder extends LengthFieldBasedFrameDecoder {
if (bodyLength > 0) {
byte[] bs = new byte[bodyLength];
frame.readBytes(bs);
+ Compressor compressor = CompressorFactory.getCompressor(compressorType);
+ bs = compressor.decompress(bs);
Codec codec = CodecFactory.getCodec(codecType);
rpcMessage.setBody(codec.decode(bs));
}
diff --git a/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Encoder.java b/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Encoder.java
index 9315f24b05f40840d0ba9e144eeba149446ca56d..dc55f1f556967f5b83e3d09336b855bbf5e3fa65 100644
--- a/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Encoder.java
+++ b/core/src/main/java/io/seata/core/rpc/netty/v1/ProtocolV1Encoder.java
@@ -20,6 +20,8 @@ import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToByteEncoder;
import io.seata.core.codec.Codec;
import io.seata.core.codec.CodecFactory;
+import io.seata.core.compressor.Compressor;
+import io.seata.core.compressor.CompressorFactory;
import io.seata.core.protocol.ProtocolConstants;
import io.seata.core.protocol.RpcMessage;
import org.slf4j.Logger;
@@ -32,7 +34,7 @@ import java.util.Map;
* 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
* +-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+
* | magic |Proto| Full length | Head | Msg |Seria|Compr| RequestId |
- * | code |colVer| （head+body) | Length |Type |lizer|ess | |
+ * | code |colVer| (head+body) | Length |Type |lizer|ess | |
* +-----------+-----------+-----------+-----------+-----------+-----------+-----------+-----------+
* | |
* | Head Map [Optional] |
@@ -91,6 +93,8 @@ public class ProtocolV1Encoder extends MessageToByteEncoder {
// heartbeat has no body
Codec codec = CodecFactory.getCodec(rpcMessage.getCodec());
bodyBytes = codec.encode(rpcMessage.getBody());
+ Compressor compressor = CompressorFactory.getCompressor(rpcMessage.getCompressor());
+ bodyBytes = compressor.compress(bodyBytes);
fullLength += bodyBytes.length;
}
diff --git a/core/src/main/java/io/seata/core/store/BranchTransactionDO.java b/core/src/main/java/io/seata/core/store/BranchTransactionDO.java
index 2a646a3cf7b8224aee5c510fd895200148d3fb1c..19990bf7bda9b6fca661ce3a4a54540d9bf04913 100644
--- a/core/src/main/java/io/seata/core/store/BranchTransactionDO.java
+++ b/core/src/main/java/io/seata/core/store/BranchTransactionDO.java
@@ -24,7 +24,6 @@ import io.seata.core.model.BranchStatus;
* branch transaction data object
*
* @author zhangsen
- * @date 2019 /3/26
*/
public class BranchTransactionDO {
@@ -38,8 +37,6 @@ public class BranchTransactionDO {
private String resourceId;
- private String lockKey;
-
private String branchType;
private int status = BranchStatus.Unknown.getCode();
@@ -142,24 +139,6 @@ public class BranchTransactionDO {
this.resourceId = resourceId;
}
- /**
- * Gets lock key.
- *
- * @return the lock key
- */
- public String getLockKey() {
- return lockKey;
- }
-
- /**
- * Sets lock key.
- *
- * @param lockKey the lock key
- */
- public void setLockKey(String lockKey) {
- this.lockKey = lockKey;
- }
-
/**
* Gets branch type.
*
diff --git a/core/src/main/java/io/seata/core/store/GlobalTransactionDO.java b/core/src/main/java/io/seata/core/store/GlobalTransactionDO.java
index be54c60cc88efd1fe10d5465d7a444a51b34d7a8..2db38cb6e8f1286494094d5e1a39535e906100e3 100644
--- a/core/src/main/java/io/seata/core/store/GlobalTransactionDO.java
+++ b/core/src/main/java/io/seata/core/store/GlobalTransactionDO.java
@@ -15,7 +15,6 @@
*/
package io.seata.core.store;
-
import io.seata.common.util.StringUtils;
import java.util.Date;
@@ -24,7 +23,6 @@ import java.util.Date;
* Global Transaction data object
*
* @author zhangsen
- * @date 2019 /3/26
*/
public class GlobalTransactionDO {
@@ -249,7 +247,7 @@ public class GlobalTransactionDO {
}
@Override
- public String toString(){
+ public String toString() {
return StringUtils.toString(this);
}
diff --git a/core/src/main/java/io/seata/core/store/LockDO.java b/core/src/main/java/io/seata/core/store/LockDO.java
index 0b90302d723ff818be10d1bc91fc100e51d97e0d..eb7b70b66dd6aa11ba8d090710672e3ec93c6e13 100644
--- a/core/src/main/java/io/seata/core/store/LockDO.java
+++ b/core/src/main/java/io/seata/core/store/LockDO.java
@@ -21,7 +21,6 @@ import io.seata.common.util.StringUtils;
* The type Lock do.
*
* @author zhangsen
- * @date 2019 /4/25
*/
public class LockDO {
diff --git a/core/src/main/java/io/seata/core/store/LockStore.java b/core/src/main/java/io/seata/core/store/LockStore.java
index 49e92e6ab104a88af069a3a8087906964cb1dd5d..9b81a41f4f0d071d0264e86fdff4865eda65ac48 100644
--- a/core/src/main/java/io/seata/core/store/LockStore.java
+++ b/core/src/main/java/io/seata/core/store/LockStore.java
@@ -21,7 +21,6 @@ import java.util.List;
* The interface Lock store.
*
* @author zhangsen
- * @data 2019 /4/25
*/
public interface LockStore {
@@ -58,6 +57,10 @@ public interface LockStore {
*/
boolean unLock(List<LockDO> lockDOs);
+ boolean unLock(String xid, Long branchId);
+
+ boolean unLock(String xid, List<Long> branchIds);
+
/**
* Is lockable boolean.
*
diff --git a/core/src/main/java/io/seata/core/store/LogStore.java b/core/src/main/java/io/seata/core/store/LogStore.java
index 9ac338a57edc57dd0ac08f8fd1791bae75ecb7c2..4ecf8019349540e323f16a04b5ac6c3bb4ad6035 100644
--- a/core/src/main/java/io/seata/core/store/LogStore.java
+++ b/core/src/main/java/io/seata/core/store/LogStore.java
@@ -22,7 +22,6 @@ import java.util.List;
* the transaction log store
*
* @author zhangsen
- * @date 2019 /3/26
*/
public interface LogStore {
@@ -76,13 +75,21 @@ public interface LogStore {
boolean deleteGlobalTransactionDO(GlobalTransactionDO globalTransactionDO);
/**
- * Query branch transaction do boolean.
+ * Query branch transaction do list.
*
* @param xid the xid
- * @return the boolean
+ * @return the BranchTransactionDO list
*/
List<BranchTransactionDO> queryBranchTransactionDO(String xid);
+ /**
+ * Query branch transaction do list.
+ *
+ * @param xids the xid list
+ * @return the BranchTransactionDO list
+ */
+ List<BranchTransactionDO> queryBranchTransactionDO(List<String> xids);
+
/**
* Insert branch transaction do boolean.
*
@@ -107,4 +114,13 @@ public interface LogStore {
*/
boolean deleteBranchTransactionDO(BranchTransactionDO branchTransactionDO);
+ /**
+ * Gets current max session id.
+ *
+ * @param high the high
+ * @param low the low
+ * @return the current max session id
+ */
+ long getCurrentMaxSessionId(long high, long low);
+
}
diff --git a/core/src/main/java/io/seata/core/store/StoreMode.java b/core/src/main/java/io/seata/core/store/StoreMode.java
index 012ff1a83fadcadb02f197bab81c9979f98da52b..666cfc513038769ed91915b63f08f07ea2c4ce7a 100644
--- a/core/src/main/java/io/seata/core/store/StoreMode.java
+++ b/core/src/main/java/io/seata/core/store/StoreMode.java
@@ -19,7 +19,6 @@ package io.seata.core.store;
* transaction log store mode
*
* @author zhangsen
- * @date 2019 /4/2
*/
public enum StoreMode {
diff --git a/core/src/main/java/io/seata/core/store/db/AbstractDataSourceGenerator.java b/core/src/main/java/io/seata/core/store/db/AbstractDataSourceGenerator.java
index 22de5464b90099aa846d2a60b9fd83c595f22588..ce7599b781d756abd046aaccbbd2bd6d2033c6c5 100644
--- a/core/src/main/java/io/seata/core/store/db/AbstractDataSourceGenerator.java
+++ b/core/src/main/java/io/seata/core/store/db/AbstractDataSourceGenerator.java
@@ -26,7 +26,6 @@ import io.seata.core.constants.DBType;
* The type Abstract data source generator.
*
* @author zhangsen
- * @date 2019 /4/24
*/
public abstract class AbstractDataSourceGenerator implements DataSourceGenerator {
@@ -35,6 +34,10 @@ public abstract class AbstractDataSourceGenerator implements DataSourceGenerator
*/
protected static final Configuration CONFIG = ConfigurationFactory.getInstance();
+ private static final int DEFAULT_DB_MAX_CONN = 10;
+
+ private static final int DEFAULT_DB_MIN_CONN = 1;
+
/**
* Get db type db type.
*
@@ -43,17 +46,21 @@ public abstract class AbstractDataSourceGenerator implements DataSourceGenerator
protected DBType getDBType() {
return DBType.valueof(CONFIG.getConfig(ConfigurationKeys.STORE_DB_TYPE));
}
+
/**
* get db driver class name
+ *
* @return the db driver class name
*/
protected String getDriverClassName() {
- String driverClassName = CONFIG.getConfig(ConfigurationKeys.STORE_DB_DRIVER_CLASS_NAME);
- if (StringUtils.isBlank(driverClassName)) {
- throw new StoreException("the {store.db.driver-class-name} can't be empty.");
- }
- return driverClassName;
- }
+ String driverClassName = CONFIG.getConfig(ConfigurationKeys.STORE_DB_DRIVER_CLASS_NAME);
+ if (StringUtils.isBlank(driverClassName)) {
+ throw new StoreException(
+ String.format("the {%s} can't be empty", ConfigurationKeys.STORE_DB_DRIVER_CLASS_NAME));
+ }
+ return driverClassName;
+ }
+
/**
* Get url string.
*
@@ -62,7 +69,7 @@ public abstract class AbstractDataSourceGenerator implements DataSourceGenerator
protected String getUrl() {
String url = CONFIG.getConfig(ConfigurationKeys.STORE_DB_URL);
if (StringUtils.isBlank(url)) {
- throw new StoreException("the {store.db.url} can't be empty.");
+ throw new StoreException(String.format("the {%s} can't be empty", ConfigurationKeys.STORE_DB_URL));
}
return url;
}
@@ -75,7 +82,7 @@ public abstract class AbstractDataSourceGenerator implements DataSourceGenerator
protected String getUser() {
String user = CONFIG.getConfig(ConfigurationKeys.STORE_DB_USER);
if (StringUtils.isBlank(user)) {
- throw new StoreException("the {store.db.user} can't be empty.");
+ throw new StoreException(String.format("the {%s} can't be empty", ConfigurationKeys.STORE_DB_USER));
}
return user;
}
@@ -96,8 +103,8 @@ public abstract class AbstractDataSourceGenerator implements DataSourceGenerator
* @return the int
*/
protected int getMinConn() {
- int minConn = CONFIG.getInt(ConfigurationKeys.STORE_DB_MIN_CONN);
- return minConn < 0 ? 0 : minConn;
+ int minConn = CONFIG.getInt(ConfigurationKeys.STORE_DB_MIN_CONN, DEFAULT_DB_MIN_CONN);
+ return minConn < 0 ? DEFAULT_DB_MIN_CONN : minConn;
}
/**
@@ -106,8 +113,8 @@ public abstract class AbstractDataSourceGenerator implements DataSourceGenerator
* @return the int
*/
protected int getMaxConn() {
- int maxConn = CONFIG.getInt(ConfigurationKeys.STORE_DB_MAX_CONN);
- return maxConn < 0 ? 1 : maxConn;
+ int maxConn = CONFIG.getInt(ConfigurationKeys.STORE_DB_MAX_CONN, DEFAULT_DB_MAX_CONN);
+ return maxConn < 0 ? DEFAULT_DB_MAX_CONN : maxConn;
}
/**
diff --git a/core/src/main/java/io/seata/core/store/db/DataSourceGenerator.java b/core/src/main/java/io/seata/core/store/db/DataSourceGenerator.java
index 0d8028578034657f5b8116f6074b783f94c3f0ff..cad6d3ea55a8b45c95fcd5a509d37127b070320c 100644
--- a/core/src/main/java/io/seata/core/store/db/DataSourceGenerator.java
+++ b/core/src/main/java/io/seata/core/store/db/DataSourceGenerator.java
@@ -21,7 +21,6 @@ import javax.sql.DataSource;
* The interface Data source generator.
*
* @author zhangsen
- * @date 2019 /4/24
*/
public interface DataSourceGenerator {
diff --git a/core/src/main/java/io/seata/core/store/db/LockStoreDataBaseDAO.java b/core/src/main/java/io/seata/core/store/db/LockStoreDataBaseDAO.java
index f45830f2cb8a5a8df048a81fbabc4a46ba30cdb3..41dd86c32496e3f5ced985cc5e71c3328f82a427 100644
--- a/core/src/main/java/io/seata/core/store/db/LockStoreDataBaseDAO.java
+++ b/core/src/main/java/io/seata/core/store/db/LockStoreDataBaseDAO.java
@@ -15,6 +15,7 @@
*/
package io.seata.core.store.db;
+import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -23,15 +24,16 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
+import java.util.StringJoiner;
import java.util.stream.Collectors;
-import javax.sql.DataSource;
-
import io.seata.common.exception.DataAccessException;
import io.seata.common.exception.StoreException;
import io.seata.common.executor.Initialize;
import io.seata.common.loader.LoadLevel;
import io.seata.common.util.CollectionUtils;
+import io.seata.common.util.IOUtil;
+import io.seata.common.util.LambdaUtils;
import io.seata.common.util.StringUtils;
import io.seata.config.Configuration;
import io.seata.config.ConfigurationFactory;
@@ -46,7 +48,6 @@ import org.slf4j.LoggerFactory;
* The type Data base lock store.
*
* @author zhangsen
- * @date 2019 /4/25
*/
@LoadLevel(name = "db")
public class LockStoreDataBaseDAO implements LockStore, Initialize {
@@ -104,25 +105,24 @@ public class LockStoreDataBaseDAO implements LockStore, Initialize {
Connection conn = null;
PreparedStatement ps = null;
ResultSet rs = null;
- List<LockDO> unrepeatedLockDOs = null;
Set<String> dbExistedRowKeys = new HashSet<>();
boolean originalAutoCommit = true;
+ if (lockDOs.size() > 1) {
+ lockDOs = lockDOs.stream().filter(LambdaUtils.distinctByKey(LockDO::getRowKey)).collect(Collectors.toList());
+ }
try {
conn = logStoreDataSource.getConnection();
if (originalAutoCommit = conn.getAutoCommit()) {
conn.setAutoCommit(false);
}
//check lock
- StringBuilder sb = new StringBuilder();
+ StringJoiner sj = new StringJoiner(",");
for (int i = 0; i < lockDOs.size(); i++) {
- sb.append("?");
- if (i != (lockDOs.size() - 1)) {
- sb.append(", ");
- }
+ sj.add("?");
}
boolean canLock = true;
//query
- String checkLockSQL = LockStoreSqls.getCheckLockableSql(lockTable, sb.toString(), dbType);
+ String checkLockSQL = LockStoreSqls.getCheckLockableSql(lockTable, sj.toString(), dbType);
ps = conn.prepareStatement(checkLockSQL);
for (int i = 0; i < lockDOs.size(); i++) {
ps.setString(i + 1, lockDOs.get(i).getRowKey());
@@ -149,6 +149,7 @@ public class LockStoreDataBaseDAO implements LockStore, Initialize {
conn.rollback();
return false;
}
+ List<LockDO> unrepeatedLockDOs = null;
if (CollectionUtils.isNotEmpty(dbExistedRowKeys)) {
unrepeatedLockDOs = lockDOs.stream().filter(lockDO -> !dbExistedRowKeys.contains(lockDO.getRowKey()))
.collect(Collectors.toList());
@@ -159,13 +160,21 @@ public class LockStoreDataBaseDAO implements LockStore, Initialize {
conn.rollback();
return true;
}
-
//lock
- for (LockDO lockDO : unrepeatedLockDOs) {
+ if (unrepeatedLockDOs.size() == 1) {
+ LockDO lockDO = unrepeatedLockDOs.get(0);
if (!doAcquireLock(conn, lockDO)) {
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Global lock acquire failed, xid {} branchId {} pk {}", lockDO.getXid(),
- lockDO.getBranchId(), lockDO.getPk());
+ LOGGER.info("Global lock acquire failed, xid {} branchId {} pk {}", lockDO.getXid(), lockDO.getBranchId(), lockDO.getPk());
+ }
+ conn.rollback();
+ return false;
+ }
+ } else {
+ if (!doAcquireLocks(conn, unrepeatedLockDOs)) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("Global lock batch acquire failed, xid {} branchId {} pks {}", unrepeatedLockDOs.get(0).getXid(),
+ unrepeatedLockDOs.get(0).getBranchId(), unrepeatedLockDOs.stream().map(lockDO -> lockDO.getPk()).collect(Collectors.toList()));
}
conn.rollback();
return false;
@@ -176,18 +185,7 @@ public class LockStoreDataBaseDAO implements LockStore, Initialize {
} catch (SQLException e) {
throw new StoreException(e);
} finally {
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException e) {
- }
- }
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(rs, ps);
if (conn != null) {
try {
if (originalAutoCommit) {
@@ -213,37 +211,70 @@ public class LockStoreDataBaseDAO implements LockStore, Initialize {
conn = logStoreDataSource.getConnection();
conn.setAutoCommit(true);
- StringBuilder sb = new StringBuilder();
+ StringJoiner sj = new StringJoiner(",");
for (int i = 0; i < lockDOs.size(); i++) {
- sb.append("?");
- if (i != (lockDOs.size() - 1)) {
- sb.append(", ");
- }
+ sj.add("?");
}
//batch release lock
- String batchDeleteSQL = LockStoreSqls.getBatchDeleteLockSql(lockTable, sb.toString(), dbType);
+ String batchDeleteSQL = LockStoreSqls.getBatchDeleteLockSql(lockTable, sj.toString(), dbType);
ps = conn.prepareStatement(batchDeleteSQL);
ps.setString(1, lockDOs.get(0).getXid());
for (int i = 0; i < lockDOs.size(); i++) {
ps.setString(i + 2, lockDOs.get(i).getRowKey());
}
- return ps.executeUpdate() > 0;
+ ps.executeUpdate();
} catch (SQLException e) {
throw new StoreException(e);
} finally {
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
+ IOUtil.close(ps, conn);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean unLock(String xid, Long branchId) {
+ Connection conn = null;
+ PreparedStatement ps = null;
+ try {
+ conn = logStoreDataSource.getConnection();
+ conn.setAutoCommit(true);
+ //batch release lock by branch
+ String batchDeleteSQL = LockStoreSqls.getBatchDeleteLockSqlByBranch(lockTable, dbType);
+ ps = conn.prepareStatement(batchDeleteSQL);
+ ps.setString(1, xid);
+ ps.setLong(2, branchId);
+ ps.executeUpdate();
+ } catch (SQLException e) {
+ throw new StoreException(e);
+ } finally {
+ IOUtil.close(ps, conn);
+ }
+ return true;
+ }
+
+ @Override
+ public boolean unLock(String xid, List<Long> branchIds) {
+ Connection conn = null;
+ PreparedStatement ps = null;
+ try {
+ conn = logStoreDataSource.getConnection();
+ conn.setAutoCommit(true);
+ StringJoiner sj = new StringJoiner(",");
+ branchIds.stream().forEach(branchId -> sj.add("?"));
+ //batch release lock by branch list
+ String batchDeleteSQL = LockStoreSqls.getBatchDeleteLockSqlByBranchs(lockTable, sj.toString(), dbType);
+ ps = conn.prepareStatement(batchDeleteSQL);
+ ps.setString(1, xid);
+ for (int i = 0; i < branchIds.size(); i++) {
+ ps.setLong(i + 2, branchIds.get(i));
}
+ ps.executeUpdate();
+ } catch (SQLException e) {
+ throw new StoreException(e);
+ } finally {
+ IOUtil.close(ps, conn);
}
+ return true;
}
@Override
@@ -259,12 +290,7 @@ public class LockStoreDataBaseDAO implements LockStore, Initialize {
} catch (SQLException e) {
throw new DataAccessException(e);
} finally {
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(conn);
}
}
@@ -292,12 +318,40 @@ public class LockStoreDataBaseDAO implements LockStore, Initialize {
} catch (SQLException e) {
throw new StoreException(e);
} finally {
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
+ IOUtil.close(ps);
+ }
+ }
+
+ /**
+ * Do acquire lock boolean.
+ *
+ * @param conn the conn
+ * @param lockDOs the lock do list
+ * @return the boolean
+ */
+ protected boolean doAcquireLocks(Connection conn, List<LockDO> lockDOs) {
+ PreparedStatement ps = null;
+ try {
+ //insert
+ String insertLockSQL = LockStoreSqls.getInsertLockSQL(lockTable, dbType);
+ ps = conn.prepareStatement(insertLockSQL);
+ for (LockDO lockDO : lockDOs) {
+ ps.setString(1, lockDO.getXid());
+ ps.setLong(2, lockDO.getTransactionId());
+ ps.setLong(3, lockDO.getBranchId());
+ ps.setString(4, lockDO.getResourceId());
+ ps.setString(5, lockDO.getTableName());
+ ps.setString(6, lockDO.getPk());
+ ps.setString(7, lockDO.getRowKey());
+ ps.addBatch();
}
+ return ps.executeBatch().length == lockDOs.size();
+ } catch (SQLException e) {
+ LOGGER.error("Global lock batch acquire error: {}", e.getMessage(), e);
+ //return false,let the caller go to conn.rollabck()
+ return false;
+ } finally {
+ IOUtil.close(ps);
}
}
@@ -312,16 +366,13 @@ public class LockStoreDataBaseDAO implements LockStore, Initialize {
PreparedStatement ps = null;
ResultSet rs = null;
try {
- StringBuilder sb = new StringBuilder();
+ StringJoiner sj = new StringJoiner(",");
for (int i = 0; i < lockDOs.size(); i++) {
- sb.append("?");
- if (i != (lockDOs.size() - 1)) {
- sb.append(", ");
- }
+ sj.add("?");
}
//query
- String checkLockSQL = LockStoreSqls.getCheckLockableSql(lockTable, sb.toString(), dbType);
+ String checkLockSQL = LockStoreSqls.getCheckLockableSql(lockTable, sj.toString(), dbType);
ps = conn.prepareStatement(checkLockSQL);
for (int i = 0; i < lockDOs.size(); i++) {
ps.setString(i + 1, lockDOs.get(i).getRowKey());
@@ -337,18 +388,7 @@ public class LockStoreDataBaseDAO implements LockStore, Initialize {
} catch (SQLException e) {
throw new DataAccessException(e);
} finally {
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException e) {
- }
- }
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(rs, ps);
}
}
diff --git a/core/src/main/java/io/seata/core/store/db/LockStoreSqls.java b/core/src/main/java/io/seata/core/store/db/LockStoreSqls.java
index d286c77e2731598009023250b11d0c5c86f58e71..48aa1d864d947192a4e683060becab7bbb1949f0 100644
--- a/core/src/main/java/io/seata/core/store/db/LockStoreSqls.java
+++ b/core/src/main/java/io/seata/core/store/db/LockStoreSqls.java
@@ -23,7 +23,6 @@ import io.seata.core.constants.ServerTableColumnsName;
* The type Lock store sqls.
*
* @author zhangsen
- * @date 2019 /4/26
*/
public class LockStoreSqls {
@@ -73,6 +72,20 @@ public class LockStoreSqls {
public static final String BATCH_DELETE_LOCK_SQL = "delete from " + LOCK_TABLE_PLACEHOLD
+ " where " + ServerTableColumnsName.LOCK_TABLE_XID + " = ? and " + ServerTableColumnsName.LOCK_TABLE_ROW_KEY + " in (" + IN_PARAMS_PLACEHOLD + ") ";
+ /**
+ * The constant BATCH_DELETE_LOCK_BY_BRANCH_SQL.
+ */
+ public static final String BATCH_DELETE_LOCK_BY_BRANCH_SQL = "delete from " + LOCK_TABLE_PLACEHOLD
+ + " where " + ServerTableColumnsName.LOCK_TABLE_XID + " = ? and " + ServerTableColumnsName.LOCK_TABLE_BRANCH_ID + " = ? ";
+
+
+ /**
+ * The constant BATCH_DELETE_LOCK_BY_BRANCHS_SQL.
+ */
+ public static final String BATCH_DELETE_LOCK_BY_BRANCHS_SQL = "delete from " + LOCK_TABLE_PLACEHOLD
+ + " where " + ServerTableColumnsName.LOCK_TABLE_XID + " = ? and " + ServerTableColumnsName.LOCK_TABLE_BRANCH_ID + " in (" + IN_PARAMS_PLACEHOLD + ") ";
+
+
/**
* The constant QUERY_LOCK_SQL.
*/
@@ -128,6 +141,31 @@ public class LockStoreSqls {
paramPlaceHold);
}
+
+ /**
+ * Get batch delete lock sql string.
+ *
+ * @param lockTable the lock table
+ * @param dbType the db type
+ * @return the string
+ */
+ public static String getBatchDeleteLockSqlByBranch(String lockTable, String dbType) {
+ return BATCH_DELETE_LOCK_BY_BRANCH_SQL.replace(LOCK_TABLE_PLACEHOLD, lockTable);
+ }
+
+ /**
+ * Get batch delete lock sql string.
+ *
+ * @param lockTable the lock table
+ * @param paramPlaceHold the param place hold
+ * @param dbType the db type
+ * @return the string
+ */
+ public static String getBatchDeleteLockSqlByBranchs(String lockTable, String paramPlaceHold, String dbType) {
+ return BATCH_DELETE_LOCK_BY_BRANCHS_SQL.replace(LOCK_TABLE_PLACEHOLD, lockTable).replace(IN_PARAMS_PLACEHOLD,
+ paramPlaceHold);
+ }
+
/**
* Get query lock sql string.
*
diff --git a/core/src/main/java/io/seata/core/store/db/LogStoreDataBaseDAO.java b/core/src/main/java/io/seata/core/store/db/LogStoreDataBaseDAO.java
index 8670d5639b6b1b55580cf273991c2a8cdb00a544..1d8e5afef04f040fe57491541d8c90a595e7179c 100644
--- a/core/src/main/java/io/seata/core/store/db/LogStoreDataBaseDAO.java
+++ b/core/src/main/java/io/seata/core/store/db/LogStoreDataBaseDAO.java
@@ -22,6 +22,7 @@ import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
+import java.util.StringJoiner;
import javax.sql.DataSource;
@@ -29,6 +30,7 @@ import io.seata.common.exception.DataAccessException;
import io.seata.common.exception.StoreException;
import io.seata.common.executor.Initialize;
import io.seata.common.loader.LoadLevel;
+import io.seata.common.util.IOUtil;
import io.seata.common.util.StringUtils;
import io.seata.config.Configuration;
import io.seata.config.ConfigurationFactory;
@@ -44,7 +46,6 @@ import org.slf4j.LoggerFactory;
* The type Log store data base dao.
*
* @author zhangsen
- * @date 2019 /4/2
*/
@LoadLevel(name = "db")
public class LogStoreDataBaseDAO implements LogStore, Initialize {
@@ -136,24 +137,7 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
} catch (SQLException e) {
throw new DataAccessException(e);
} finally {
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException e) {
- }
- }
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(rs, ps, conn);
}
}
@@ -177,30 +161,13 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
} catch (SQLException e) {
throw new DataAccessException(e);
} finally {
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException e) {
- }
- }
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(rs, ps, conn);
}
}
@Override
public List<GlobalTransactionDO> queryGlobalTransactionDO(int[] statuses, int limit) {
- List<GlobalTransactionDO> ret = new ArrayList<GlobalTransactionDO>();
+ List<GlobalTransactionDO> ret = new ArrayList<>();
Connection conn = null;
PreparedStatement ps = null;
ResultSet rs = null;
@@ -231,24 +198,7 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
} catch (SQLException e) {
throw new DataAccessException(e);
} finally {
- if (rs != null) {
- try {
- rs.close();
- } catch (SQLException e) {
- }
- }
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(rs, ps, conn);
}
}
@@ -267,8 +217,8 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
ps.setString(4, globalTransactionDO.getApplicationId());
ps.setString(5, globalTransactionDO.getTransactionServiceGroup());
String transactionName = globalTransactionDO.getTransactionName();
- transactionName = transactionName.length() > transactionNameColumnSize ?
- transactionName.substring(0, transactionNameColumnSize) : transactionName;
+ transactionName = transactionName.length() > transactionNameColumnSize ? transactionName.substring(0,
+ transactionNameColumnSize) : transactionName;
ps.setString(6, transactionName);
ps.setInt(7, globalTransactionDO.getTimeout());
ps.setLong(8, globalTransactionDO.getBeginTime());
@@ -277,18 +227,7 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
} catch (SQLException e) {
throw new StoreException(e);
} finally {
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(ps, conn);
}
}
@@ -307,18 +246,7 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
} catch (SQLException e) {
throw new StoreException(e);
} finally {
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(ps, conn);
}
}
@@ -336,18 +264,7 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
} catch (SQLException e) {
throw new StoreException(e);
} finally {
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(ps, conn);
}
}
@@ -357,6 +274,7 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
String sql = LogStoreSqls.getQureyBranchTransaction(brachTable, dbType);
Connection conn = null;
PreparedStatement ps = null;
+ ResultSet rs = null;
try {
conn = logStoreDataSource.getConnection();
conn.setAutoCommit(true);
@@ -364,7 +282,7 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
ps = conn.prepareStatement(sql);
ps.setString(1, xid);
- ResultSet rs = ps.executeQuery();
+ rs = ps.executeQuery();
while (rs.next()) {
rets.add(convertBranchTransactionDO(rs));
}
@@ -372,18 +290,37 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
} catch (SQLException e) {
throw new DataAccessException(e);
} finally {
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
+ IOUtil.close(rs, ps, conn);
+ }
+ }
+
+ @Override
+ public List<BranchTransactionDO> queryBranchTransactionDO(List<String> xids) {
+ int length = xids.size();
+ int retsSize = length * 3;
+ List<BranchTransactionDO> rets = new ArrayList<>(retsSize);
+ StringJoiner sj = new StringJoiner(",");
+ xids.stream().forEach(xid -> sj.add("?"));
+ String sql = LogStoreSqls.getQureyBranchTransaction(brachTable, dbType, sj.toString());
+ Connection conn = null;
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ conn = logStoreDataSource.getConnection();
+ conn.setAutoCommit(true);
+ ps = conn.prepareStatement(sql);
+ for (int i = 0; i < length; i++) {
+ ps.setString(i + 1, xids.get(i));
}
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
+ rs = ps.executeQuery();
+ while (rs.next()) {
+ rets.add(convertBranchTransactionDO(rs));
}
+ return rets;
+ } catch (SQLException e) {
+ throw new DataAccessException(e);
+ } finally {
+ IOUtil.close(rs, ps, conn);
}
}
@@ -401,27 +338,15 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
ps.setLong(3, branchTransactionDO.getBranchId());
ps.setString(4, branchTransactionDO.getResourceGroupId());
ps.setString(5, branchTransactionDO.getResourceId());
- ps.setString(6, branchTransactionDO.getLockKey());
- ps.setString(7, branchTransactionDO.getBranchType());
- ps.setInt(8, branchTransactionDO.getStatus());
- ps.setString(9, branchTransactionDO.getClientId());
- ps.setString(10, branchTransactionDO.getApplicationData());
+ ps.setString(6, branchTransactionDO.getBranchType());
+ ps.setInt(7, branchTransactionDO.getStatus());
+ ps.setString(8, branchTransactionDO.getClientId());
+ ps.setString(9, branchTransactionDO.getApplicationData());
return ps.executeUpdate() > 0;
} catch (SQLException e) {
throw new StoreException(e);
} finally {
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(ps, conn);
}
}
@@ -441,18 +366,7 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
} catch (SQLException e) {
throw new StoreException(e);
} finally {
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(ps, conn);
}
}
@@ -467,23 +381,46 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
ps = conn.prepareStatement(sql);
ps.setString(1, branchTransactionDO.getXid());
ps.setLong(2, branchTransactionDO.getBranchId());
- return ps.executeUpdate() > 0;
+ ps.executeUpdate();
} catch (SQLException e) {
throw new StoreException(e);
} finally {
- if (ps != null) {
- try {
- ps.close();
- } catch (SQLException e) {
- }
- }
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- }
+ IOUtil.close(ps, conn);
+ }
+ return true;
+ }
+
+ @Override
+ public long getCurrentMaxSessionId(long high, long low) {
+ String transMaxSql = LogStoreSqls.getQureyGlobalMax(globalTable, dbType);
+ String branchMaxSql = LogStoreSqls.getQureyBranchMax(brachTable, dbType);
+ long maxTransId = getCurrentMaxSessionId(transMaxSql, high, low);
+ long maxBranchId = getCurrentMaxSessionId(branchMaxSql, high, low);
+ return maxBranchId > maxTransId ? maxBranchId : maxTransId;
+ }
+
+ private long getCurrentMaxSessionId(String sql, long high, long low) {
+ long max = 0;
+ Connection conn = null;
+ PreparedStatement ps = null;
+ ResultSet rs = null;
+ try {
+ conn = logStoreDataSource.getConnection();
+ conn.setAutoCommit(true);
+ ps = conn.prepareStatement(sql);
+ ps.setLong(1, high);
+ ps.setLong(2, low);
+
+ rs = ps.executeQuery();
+ while (rs.next()) {
+ max = rs.getLong(1);
}
+ } catch (SQLException e) {
+ throw new DataAccessException(e);
+ } finally {
+ IOUtil.close(rs, ps, conn);
}
+ return max;
}
private GlobalTransactionDO convertGlobalTransactionDO(ResultSet rs) throws SQLException {
@@ -495,7 +432,8 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
globalTransactionDO.setTimeout(rs.getInt(ServerTableColumnsName.GLOBAL_TABLE_TIMEOUT));
globalTransactionDO.setTransactionId(rs.getLong(ServerTableColumnsName.GLOBAL_TABLE_TRANSACTION_ID));
globalTransactionDO.setTransactionName(rs.getString(ServerTableColumnsName.GLOBAL_TABLE_TRANSACTION_NAME));
- globalTransactionDO.setTransactionServiceGroup(rs.getString(ServerTableColumnsName.GLOBAL_TABLE_TRANSACTION_SERVICE_GROUP));
+ globalTransactionDO.setTransactionServiceGroup(
+ rs.getString(ServerTableColumnsName.GLOBAL_TABLE_TRANSACTION_SERVICE_GROUP));
globalTransactionDO.setApplicationData(rs.getString(ServerTableColumnsName.GLOBAL_TABLE_APPLICATION_DATA));
globalTransactionDO.setGmtCreate(rs.getTimestamp(ServerTableColumnsName.GLOBAL_TABLE_GMT_CREATE));
globalTransactionDO.setGmtModified(rs.getTimestamp(ServerTableColumnsName.GLOBAL_TABLE_GMT_MODIFIED));
@@ -508,10 +446,9 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
branchTransactionDO.setStatus(rs.getInt(ServerTableColumnsName.BRANCH_TABLE_STATUS));
branchTransactionDO.setApplicationData(rs.getString(ServerTableColumnsName.BRANCH_TABLE_APPLICATION_DATA));
branchTransactionDO.setClientId(rs.getString(ServerTableColumnsName.BRANCH_TABLE_CLIENT_ID));
- branchTransactionDO.setLockKey(rs.getString(ServerTableColumnsName.BRANCH_TABLE_LOCK_KEY));
branchTransactionDO.setXid(rs.getString(ServerTableColumnsName.BRANCH_TABLE_XID));
branchTransactionDO.setResourceId(rs.getString(ServerTableColumnsName.BRANCH_TABLE_RESOURCE_ID));
- branchTransactionDO.setBranchId(rs.getLong(ServerTableColumnsName.BRANCH_TABLE_BRANCH_XID));
+ branchTransactionDO.setBranchId(rs.getLong(ServerTableColumnsName.BRANCH_TABLE_BRANCH_ID));
branchTransactionDO.setBranchType(rs.getString(ServerTableColumnsName.BRANCH_TABLE_BRANCH_TYPE));
branchTransactionDO.setTransactionId(rs.getLong(ServerTableColumnsName.BRANCH_TABLE_TRANSACTION_ID));
branchTransactionDO.setGmtCreate(rs.getTimestamp(ServerTableColumnsName.BRANCH_TABLE_GMT_CREATE));
@@ -526,22 +463,23 @@ public class LogStoreDataBaseDAO implements LogStore, Initialize {
ColumnInfo columnInfo = queryTableStructure(globalTable, TRANSACTION_NAME_KEY);
if (columnInfo == null) {
LOGGER.warn("{} table or {} column not found", globalTable, TRANSACTION_NAME_KEY);
- return ;
+ return;
}
this.transactionNameColumnSize = columnInfo.getColumnSize();
}
/**
* query column info from table
+ *
* @param tableName the table name
- * @param colName the column name
+ * @param colName the column name
* @return the column info
*/
private ColumnInfo queryTableStructure(final String tableName, String colName) {
- try(Connection conn = logStoreDataSource.getConnection()) {
+ try (Connection conn = logStoreDataSource.getConnection()) {
DatabaseMetaData dbmd = conn.getMetaData();
String schema = getSchema(conn);
- ResultSet tableRs = dbmd.getTables(null, schema, null, new String[] { "TABLE" });
+ ResultSet tableRs = dbmd.getTables(null, schema, null, new String[] {"TABLE"});
while (tableRs.next()) {
String table = tableRs.getString("TABLE_NAME");
if (StringUtils.equalsIgnoreCase(table, tableName)) {
diff --git a/core/src/main/java/io/seata/core/store/db/LogStoreSqls.java b/core/src/main/java/io/seata/core/store/db/LogStoreSqls.java
index e2526b0fd86456f86710263da29dc8791deb877f..e5994c187e71b3fae7740ee4910c6d7372c8f8be 100644
--- a/core/src/main/java/io/seata/core/store/db/LogStoreSqls.java
+++ b/core/src/main/java/io/seata/core/store/db/LogStoreSqls.java
@@ -23,7 +23,6 @@ import io.seata.core.constants.ServerTableColumnsName;
* database log store SQLs
*
* @author zhangsen
- * @date 2019 /4/2
*/
public class LogStoreSqls {
@@ -61,8 +60,8 @@ public class LogStoreSqls {
*/
protected static final String ALL_BRANCH_COLUMNS
= ServerTableColumnsName.BRANCH_TABLE_XID + ", " + ServerTableColumnsName.BRANCH_TABLE_TRANSACTION_ID + ", "
- + ServerTableColumnsName.BRANCH_TABLE_BRANCH_XID + ", " + ServerTableColumnsName.BRANCH_TABLE_RESOURCE_GROUP_ID + ", "
- + ServerTableColumnsName.BRANCH_TABLE_RESOURCE_ID + ", " + ServerTableColumnsName.BRANCH_TABLE_LOCK_KEY + ", "
+ + ServerTableColumnsName.BRANCH_TABLE_BRANCH_ID + ", " + ServerTableColumnsName.BRANCH_TABLE_RESOURCE_GROUP_ID + ", "
+ + ServerTableColumnsName.BRANCH_TABLE_RESOURCE_ID + ", "
+ ServerTableColumnsName.BRANCH_TABLE_BRANCH_TYPE + ", " + ServerTableColumnsName.BRANCH_TABLE_STATUS + ", "
+ ServerTableColumnsName.BRANCH_TABLE_CLIENT_ID + ", " + ServerTableColumnsName.BRANCH_TABLE_APPLICATION_DATA + ", "
+ ServerTableColumnsName.BRANCH_TABLE_GMT_CREATE + ", " + ServerTableColumnsName.BRANCH_TABLE_GMT_MODIFIED;
@@ -143,34 +142,36 @@ public class LogStoreSqls {
*/
public static final String INSERT_BRANCH_TRANSACTION_MYSQL = "insert into " + BRANCH_TABLE_PLACEHOLD + "("
+ ALL_BRANCH_COLUMNS + ")" +
- "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, now(), now())";
+ "values (?, ?, ?, ?, ?, ?, ?, ?, ?, now(), now())";
/**
* The constant INSERT_BRANCH_TRANSACTION_ORACLE.
*/
public static final String INSERT_BRANCH_TRANSACTION_ORACLE = "insert into " + BRANCH_TABLE_PLACEHOLD + "("
+ ALL_BRANCH_COLUMNS + ")" +
- "values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, sysdate, sysdate)";
+ "values (?, ?, ?, ?, ?, ?, ?, ?, ?, sysdate, sysdate)";
/**
* The constant UPDATE_BRANCH_TRANSACTION_STATUS_MYSQL.
*/
public static final String UPDATE_BRANCH_TRANSACTION_STATUS_MYSQL = "update " + BRANCH_TABLE_PLACEHOLD
+ " set " + ServerTableColumnsName.BRANCH_TABLE_STATUS + " = ?, " + ServerTableColumnsName.BRANCH_TABLE_GMT_MODIFIED + " = now() where "
- + ServerTableColumnsName.BRANCH_TABLE_XID + " = ? and " + ServerTableColumnsName.BRANCH_TABLE_BRANCH_XID + " = ?";
+ + ServerTableColumnsName.BRANCH_TABLE_XID + " = ? and " + ServerTableColumnsName.BRANCH_TABLE_BRANCH_ID + " = ?";
/**
* The constant UPDATE_BRANCH_TRANSACTION_STATUS_ORACLE.
*/
public static final String UPDATE_BRANCH_TRANSACTION_STATUS_ORACLE = "update " + BRANCH_TABLE_PLACEHOLD
+ " set " + ServerTableColumnsName.BRANCH_TABLE_STATUS + " = ?, " + ServerTableColumnsName.BRANCH_TABLE_GMT_MODIFIED
- + " = sysdate where " + ServerTableColumnsName.BRANCH_TABLE_XID + " = ? and " + ServerTableColumnsName.BRANCH_TABLE_BRANCH_XID + " = ?";
+ + " = sysdate where " + ServerTableColumnsName.BRANCH_TABLE_XID + " = ? and " + ServerTableColumnsName.BRANCH_TABLE_BRANCH_ID
+ + " = ?";
/**
* The constant DELETE_BRANCH_TRANSACTION_BY_BRANCH_ID.
*/
public static final String DELETE_BRANCH_TRANSACTION_BY_BRANCH_ID = "delete from " + BRANCH_TABLE_PLACEHOLD
- + " where " + ServerTableColumnsName.BRANCH_TABLE_XID + " = ? and " + ServerTableColumnsName.BRANCH_TABLE_BRANCH_XID + " = ?";
+ + " where " + ServerTableColumnsName.BRANCH_TABLE_XID + " = ? and " + ServerTableColumnsName.BRANCH_TABLE_BRANCH_ID
+ + " = ?";
/**
* The constant DELETE_BRANCH_TRANSACTION_BY_XID.
@@ -182,7 +183,29 @@ public class LogStoreSqls {
* The constant QUREY_BRANCH_TRANSACTION.
*/
public static final String QUREY_BRANCH_TRANSACTION = "select " + ALL_BRANCH_COLUMNS + " from "
- + BRANCH_TABLE_PLACEHOLD + " where " + ServerTableColumnsName.BRANCH_TABLE_XID + " = ?";
+ + BRANCH_TABLE_PLACEHOLD + " where " + ServerTableColumnsName.BRANCH_TABLE_XID + " = ? order by "
+ + ServerTableColumnsName.BRANCH_TABLE_BRANCH_ID + " asc";
+
+ /**
+ * The constant QUREY_BRANCH_TRANSACTION_XIDS.
+ */
+ public static final String QUREY_BRANCH_TRANSACTION_XIDS = "select " + ALL_BRANCH_COLUMNS + " from "
+ + BRANCH_TABLE_PLACEHOLD + " where " + ServerTableColumnsName.BRANCH_TABLE_XID + " in (" + PRAMETER_PLACEHOLD + ") order by "
+ + ServerTableColumnsName.BRANCH_TABLE_BRANCH_ID + " asc";
+
+ /**
+ * The constant CHECK_MAX_TRANS_ID.
+ */
+ public static final String QUERY_MAX_TRANS_ID = "select max(" + ServerTableColumnsName.GLOBAL_TABLE_TRANSACTION_ID
+ + ") from " + GLOBAL_TABLE_PLACEHOLD + " where " + ServerTableColumnsName.GLOBAL_TABLE_TRANSACTION_ID
+ + " < ? and " + ServerTableColumnsName.GLOBAL_TABLE_TRANSACTION_ID + " > ?";
+
+ /**
+ * The constant CHECK_MAX_BTANCH_ID.
+ */
+ public static final String QUERY_MAX_BTANCH_ID = "select max(" + ServerTableColumnsName.BRANCH_TABLE_BRANCH_ID
+ + ") from " + BRANCH_TABLE_PLACEHOLD + " where " + ServerTableColumnsName.BRANCH_TABLE_BRANCH_ID + " < ? and "
+ + ServerTableColumnsName.BRANCH_TABLE_BRANCH_ID + " > ?";
/**
* Get insert global transaction sql string.
@@ -367,4 +390,40 @@ public class LogStoreSqls {
public static String getQureyBranchTransaction(String branchTable, String dbType) {
return QUREY_BRANCH_TRANSACTION.replace(BRANCH_TABLE_PLACEHOLD, branchTable);
}
+
+ /**
+ * Get qurey branch transaction string.
+ *
+ * @param branchTable the branch table
+ * @param dbType the db type
+ * @param paramsPlaceHolder the params place holder
+ * @return the string
+ */
+ public static String getQureyBranchTransaction(String branchTable, String dbType,
+ String paramsPlaceHolder) {
+ return QUREY_BRANCH_TRANSACTION_XIDS.replace(BRANCH_TABLE_PLACEHOLD, branchTable)
+ .replace(PRAMETER_PLACEHOLD, paramsPlaceHolder);
+ }
+
+ /**
+ * Gets qurey global max.
+ *
+ * @param globalTable the global table
+ * @param dbType the db type
+ * @return the qurey global max
+ */
+ public static String getQureyGlobalMax(String globalTable, String dbType) {
+ return QUERY_MAX_TRANS_ID.replace(GLOBAL_TABLE_PLACEHOLD, globalTable);
+ }
+
+ /**
+ * Gets qurey branch max.
+ *
+ * @param branchTable the branch table
+ * @param dbType the db type
+ * @return the qurey branch max
+ */
+ public static String getQureyBranchMax(String branchTable, String dbType) {
+ return QUERY_MAX_BTANCH_ID.replace(BRANCH_TABLE_PLACEHOLD, branchTable);
+ }
}
diff --git a/core/src/test/java/io/seata/core/context/ContextCoreTest.java b/core/src/test/java/io/seata/core/context/ContextCoreTest.java
index 6fc75d5000cff4dc97d23045dee8548c284f32c0..8d99fc2311a121636027e5f76fb51c3d0c42ed60 100644
--- a/core/src/test/java/io/seata/core/context/ContextCoreTest.java
+++ b/core/src/test/java/io/seata/core/context/ContextCoreTest.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Context core test.
*
* @author guoyao
- * @date 2019 /3/5
*/
public class ContextCoreTest {
diff --git a/core/src/test/java/io/seata/core/context/RootContextTest.java b/core/src/test/java/io/seata/core/context/RootContextTest.java
index 6909b5e108e3963a328dfbebf18ca88e8ee7d629..6987f017eec6cb7325916cd884d49259f054f8fc 100644
--- a/core/src/test/java/io/seata/core/context/RootContextTest.java
+++ b/core/src/test/java/io/seata/core/context/RootContextTest.java
@@ -26,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Root context test.
*
* @author guoyao
- * @date 2019 /3/2
*/
public class RootContextTest {
diff --git a/core/src/test/java/io/seata/core/model/BranchStatusTest.java b/core/src/test/java/io/seata/core/model/BranchStatusTest.java
index 105ce064cfb525f81c7b9fd8d3d1ebad37be978b..73da69315ce695ac489ce12c14018dac3040c5d2 100644
--- a/core/src/test/java/io/seata/core/model/BranchStatusTest.java
+++ b/core/src/test/java/io/seata/core/model/BranchStatusTest.java
@@ -23,7 +23,6 @@ import org.junit.jupiter.api.Test;
* A unit test for {@link BranchStatus}
*
* @author Lay
- * @date 2019/3/6
*/
public class BranchStatusTest {
diff --git a/core/src/test/java/io/seata/core/model/BranchTypeTest.java b/core/src/test/java/io/seata/core/model/BranchTypeTest.java
index 78c6f80781558930c6c4e6a54bb4898b13be1f65..07fed04df54c0c62873c0bbd67bbf5e91a89b9a5 100644
--- a/core/src/test/java/io/seata/core/model/BranchTypeTest.java
+++ b/core/src/test/java/io/seata/core/model/BranchTypeTest.java
@@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test;
* A unit test for {@link BranchType}
*
* @author Lay
- * @date 2019/3/6
*/
public class BranchTypeTest {
diff --git a/core/src/test/java/io/seata/core/model/GlobalStatusTest.java b/core/src/test/java/io/seata/core/model/GlobalStatusTest.java
index 8f2e026baf8b084a2374ca21e7e22d55f9cc6a9d..f6fba62a0bdb405914eda51c8a26b2f28660b482 100644
--- a/core/src/test/java/io/seata/core/model/GlobalStatusTest.java
+++ b/core/src/test/java/io/seata/core/model/GlobalStatusTest.java
@@ -22,7 +22,6 @@ import org.junit.jupiter.api.Test;
* A unit test for {@link GlobalStatus}
*
* @author Lay
- * @date 2019/3/6
*/
public class GlobalStatusTest {
private static final int BEGIN_CODE = 1;
diff --git a/core/src/test/java/io/seata/core/protocol/MessageFutureTest.java b/core/src/test/java/io/seata/core/protocol/MessageFutureTest.java
index 9944a612bfca1e9830936d56346323206117aab0..e0eabc77cb19a84da8ed0c73934f2279fecee026 100644
--- a/core/src/test/java/io/seata/core/protocol/MessageFutureTest.java
+++ b/core/src/test/java/io/seata/core/protocol/MessageFutureTest.java
@@ -32,7 +32,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Message future test.
*
* @author guoyao
- * @date 2019 /3/2
*/
public class MessageFutureTest {
diff --git a/core/src/test/java/io/seata/core/protocol/RegisterTMRequestTest.java b/core/src/test/java/io/seata/core/protocol/RegisterTMRequestTest.java
index 8e13d103ff4a11e7a3115b2c440f6f3c2d39d197..f17ddd9f0cab7303dee34aa52c1411b734f28214 100644
--- a/core/src/test/java/io/seata/core/protocol/RegisterTMRequestTest.java
+++ b/core/src/test/java/io/seata/core/protocol/RegisterTMRequestTest.java
@@ -24,7 +24,6 @@ import static io.netty.buffer.Unpooled.buffer;
* @author kaitithoma
* @author Danaykap
*
- * @date 2019/05/13
*
*/
diff --git a/core/src/test/java/io/seata/core/protocol/RpcMessageTest.java b/core/src/test/java/io/seata/core/protocol/RpcMessageTest.java
index 833719b046f45b25d5b2ecfe9fa3c2aba9bf4731..98486a26ea378c43e51a387c2e56405d76f543d4 100644
--- a/core/src/test/java/io/seata/core/protocol/RpcMessageTest.java
+++ b/core/src/test/java/io/seata/core/protocol/RpcMessageTest.java
@@ -26,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
* The type Rpc message test.
*
* @author guoyao
- * @date 2019 /3/2
*/
public class RpcMessageTest {
diff --git a/core/src/test/java/io/seata/core/protocol/transaction/BranchRollbackRequestTest.java b/core/src/test/java/io/seata/core/protocol/transaction/BranchRollbackRequestTest.java
index 0317fb15fb6f55a3a251e7174921a118660cfa3a..eda94ba4fca6e2236af45a6a5b7388c9d1ce61cb 100644
--- a/core/src/test/java/io/seata/core/protocol/transaction/BranchRollbackRequestTest.java
+++ b/core/src/test/java/io/seata/core/protocol/transaction/BranchRollbackRequestTest.java
@@ -21,8 +21,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
/**
- * @author: jimin.jm@alibaba-inc.com
- * @date 2019/04/16
+ * @author: slievrly
*/
public class BranchRollbackRequestTest {
@Test
@@ -40,4 +39,4 @@ public class BranchRollbackRequestTest {
}
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/io/seata/core/protocol/transaction/BranchRollbackResponseTest.java b/core/src/test/java/io/seata/core/protocol/transaction/BranchRollbackResponseTest.java
index e0bb83f48a9e32f5baea95687858266549406b32..5de4e35ec0cc9aa04678806e226b3ed0225f6d77 100644
--- a/core/src/test/java/io/seata/core/protocol/transaction/BranchRollbackResponseTest.java
+++ b/core/src/test/java/io/seata/core/protocol/transaction/BranchRollbackResponseTest.java
@@ -21,8 +21,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
/**
- * @author: jimin.jm@alibaba-inc.com
- * @date 2019/04/16
+ * @author: slievrly
*/
public class BranchRollbackResponseTest {
@Test
@@ -39,4 +38,4 @@ public class BranchRollbackResponseTest {
}
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/io/seata/core/protocol/transaction/GlobalBeginResponseTest.java b/core/src/test/java/io/seata/core/protocol/transaction/GlobalBeginResponseTest.java
index ee3cc6a9542baf2e62804f461e62c5a4bd6909a9..022aedaf479b740f2fb6cd1263a5fbc011dd7f6e 100644
--- a/core/src/test/java/io/seata/core/protocol/transaction/GlobalBeginResponseTest.java
+++ b/core/src/test/java/io/seata/core/protocol/transaction/GlobalBeginResponseTest.java
@@ -24,7 +24,6 @@ import org.junit.jupiter.api.Test;
* A unit test for {@link GlobalBeginResponse}
*
* @author liujc
- * @date 2019/3/22 11:09
**/
public class GlobalBeginResponseTest {
private final String XID = "test_xid";
diff --git a/core/src/test/java/io/seata/core/rpc/RpcContextTest.java b/core/src/test/java/io/seata/core/rpc/RpcContextTest.java
index 92fefa2a4078b893328fb7e931d95dcff7b79a7e..3c45fab4f8c50a0f43f3ef0f505a57e9db7efa6d 100644
--- a/core/src/test/java/io/seata/core/rpc/RpcContextTest.java
+++ b/core/src/test/java/io/seata/core/rpc/RpcContextTest.java
@@ -26,7 +26,6 @@ import java.util.HashSet;
* @author kaitithoma
* @author Danaykap
*
- * @date 2019/ 3/31
*
*/
@@ -183,4 +182,4 @@ public class RpcContextTest {
rpcContext.toString());
}
-}
\ No newline at end of file
+}
diff --git a/core/src/test/java/io/seata/core/rpc/netty/NettyBaseConfigTest.java b/core/src/test/java/io/seata/core/rpc/netty/NettyBaseConfigTest.java
index d1faf93584d9000a4035eb4837454dfb37137a5b..2d3cdaf28f355fcfc88fbb028cddf8cb35115933 100644
--- a/core/src/test/java/io/seata/core/rpc/netty/NettyBaseConfigTest.java
+++ b/core/src/test/java/io/seata/core/rpc/netty/NettyBaseConfigTest.java
@@ -20,8 +20,7 @@ import org.junit.jupiter.api.Test;
/**
* The type Netty base config test.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /1/7
+ * @author slievrly
*/
public class NettyBaseConfigTest {
/**
diff --git a/core/src/test/java/io/seata/core/rpc/netty/NettyPoolKeyTest.java b/core/src/test/java/io/seata/core/rpc/netty/NettyPoolKeyTest.java
index 66dc03205e360a5a9770cea75235c11fa4f58a04..1279434390f5206bb0697f03b4cfca2d440aa89a 100644
--- a/core/src/test/java/io/seata/core/rpc/netty/NettyPoolKeyTest.java
+++ b/core/src/test/java/io/seata/core/rpc/netty/NettyPoolKeyTest.java
@@ -21,8 +21,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
- * @author: jimin.jm@alibaba-inc.com
- * @date 2019/04/12
+ * @author: slievrly
*/
public class NettyPoolKeyTest {
diff --git a/core/src/test/java/io/seata/core/rpc/netty/TmRpcClientTest.java b/core/src/test/java/io/seata/core/rpc/netty/TmRpcClientTest.java
index 44bfbc25aa1cdf342e15e5a012b7303fffdd857e..6734e486fe7c4663a9f252d20f546a453191cf62 100644
--- a/core/src/test/java/io/seata/core/rpc/netty/TmRpcClientTest.java
+++ b/core/src/test/java/io/seata/core/rpc/netty/TmRpcClientTest.java
@@ -33,8 +33,7 @@ import java.util.concurrent.TimeUnit;
/**
* The type Tm rpc client test.
*
- * @author jimin.jm @alibaba-inc.com xiajun.0706@163.com
- * @date 2019 /01/25
+ * @author slievrly xiajun.0706@163.com
*/
public class TmRpcClientTest {
diff --git a/core/src/test/java/io/seata/core/store/db/DataBaseLockStoreDAOTest.java b/core/src/test/java/io/seata/core/store/db/DataBaseLockStoreDAOTest.java
index cb8a2a2eddd788619f01da2294863d4362f377d5..e4e0302f96f566907a32a6fd15881d375d0e24f1 100644
--- a/core/src/test/java/io/seata/core/store/db/DataBaseLockStoreDAOTest.java
+++ b/core/src/test/java/io/seata/core/store/db/DataBaseLockStoreDAOTest.java
@@ -15,6 +15,7 @@
*/
package io.seata.core.store.db;
+import io.seata.common.util.IOUtil;
import io.seata.core.store.LockDO;
import org.apache.commons.dbcp.BasicDataSource;
@@ -33,7 +34,6 @@ import java.util.List;
/**
* @author zhangsen
- * @date 2019/4/26
*/
public class DataBaseLockStoreDAOTest {
@@ -71,13 +71,7 @@ public class DataBaseLockStoreDAOTest {
} catch (Exception e) {
e.printStackTrace();
} finally {
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- e.printStackTrace();
- }
- }
+ IOUtil.close(conn);
}
}
@@ -110,12 +104,7 @@ public class DataBaseLockStoreDAOTest {
Assertions.assertTrue(false);
}
} finally {
- if(conn != null){
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(conn);
}
Assertions.assertTrue(dataBaseLockStoreDAO.unLock(lockDOs));
@@ -152,12 +141,7 @@ public class DataBaseLockStoreDAOTest {
Assertions.assertTrue(false);
}
} finally {
- if(conn != null){
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(conn);
}
//lock again
@@ -208,12 +192,7 @@ public class DataBaseLockStoreDAOTest {
}
} finally {
- if(conn != null){
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(conn);
}
@@ -271,12 +250,7 @@ public class DataBaseLockStoreDAOTest {
Assertions.assertTrue(false);
}
} finally {
- if(conn != null){
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(conn);
}
List<LockDO> lockDOs_2 = new ArrayList<>();
diff --git a/core/src/test/java/io/seata/core/store/db/LogStoreDataBaseDAOTest.java b/core/src/test/java/io/seata/core/store/db/LogStoreDataBaseDAOTest.java
index 43a748557dbe42e9e9621116fe6e5351ccabf124..0c2249200bc3ab42dd4391ec6062c55527fec852 100644
--- a/core/src/test/java/io/seata/core/store/db/LogStoreDataBaseDAOTest.java
+++ b/core/src/test/java/io/seata/core/store/db/LogStoreDataBaseDAOTest.java
@@ -16,6 +16,7 @@
package io.seata.core.store.db;
import io.seata.common.util.CollectionUtils;
+import io.seata.common.util.IOUtil;
import io.seata.core.store.BranchTransactionDO;
import io.seata.core.store.GlobalTransactionDO;
import org.apache.commons.dbcp.BasicDataSource;
@@ -35,7 +36,6 @@ import java.util.List;
/**
* @author zhangsen
- * @date 2019/4/26
*/
public class LogStoreDataBaseDAOTest {
@@ -83,13 +83,7 @@ public class LogStoreDataBaseDAOTest {
} catch (Exception e) {
e.printStackTrace();
} finally {
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- e.printStackTrace();
- }
- }
+ IOUtil.close(conn);
}
}
@@ -131,9 +125,7 @@ public class LogStoreDataBaseDAOTest {
//delete
conn.createStatement().execute(delSql);
}finally {
- if(conn != null){
- conn.close();
- }
+ IOUtil.close(conn);
}
}
@@ -175,9 +167,7 @@ public class LogStoreDataBaseDAOTest {
//delete
conn.createStatement().execute(delSql);
}finally {
- if(conn != null){
- conn.close();
- }
+ IOUtil.close(conn);
}
}
@@ -247,9 +237,7 @@ public class LogStoreDataBaseDAOTest {
conn = dataSource.getConnection();
conn.createStatement().execute(delSql);
}finally {
- if(conn != null){
- conn.close();
- }
+ IOUtil.close(conn);
}
}
@@ -316,9 +304,7 @@ public class LogStoreDataBaseDAOTest {
conn = dataSource.getConnection();
conn.createStatement().execute(delSql);
}finally {
- if(conn != null){
- conn.close();
- }
+ IOUtil.close(conn);
}
}
@@ -354,9 +340,7 @@ public class LogStoreDataBaseDAOTest {
conn.createStatement().execute(delSql);
}finally {
- if(conn != null){
- conn.close();
- }
+ IOUtil.close(conn);
}
}
@@ -407,9 +391,7 @@ public class LogStoreDataBaseDAOTest {
conn.createStatement().execute(delSql);
}finally {
- if(conn != null){
- conn.close();
- }
+ IOUtil.close(conn);
}
}
@@ -447,9 +429,7 @@ public class LogStoreDataBaseDAOTest {
}
rs.close();
}finally {
- if(conn != null){
- conn.close();
- }
+ IOUtil.close(conn);
}
}
@@ -464,7 +444,6 @@ public class LogStoreDataBaseDAOTest {
branchTransactionDO.setBranchId(345465676);
branchTransactionDO.setBranchType("TCC");
branchTransactionDO.setResourceGroupId("abc");
- branchTransactionDO.setLockKey("t:1,2,3;t2,4,5,6");
branchTransactionDO.setResourceGroupId("a");
branchTransactionDO.setClientId("1.1.1.1");
branchTransactionDO.setStatus(1);
@@ -483,7 +462,6 @@ public class LogStoreDataBaseDAOTest {
branchTransactionDO.setBranchId(78563453);
branchTransactionDO.setBranchType("TCC");
branchTransactionDO.setResourceGroupId("abc");
- branchTransactionDO.setLockKey("t:6;t2:7");
branchTransactionDO.setResourceGroupId("a");
branchTransactionDO.setClientId("1.1.1.1");
branchTransactionDO.setStatus(1);
@@ -514,9 +492,7 @@ public class LogStoreDataBaseDAOTest {
conn.createStatement().execute(delSql);
}finally {
- if(conn != null){
- conn.close();
- }
+ IOUtil.close(conn);
}
}
@@ -529,7 +505,6 @@ public class LogStoreDataBaseDAOTest {
branchTransactionDO.setBranchId(1234508);
branchTransactionDO.setBranchType("TCC");
branchTransactionDO.setResourceGroupId("abc");
- branchTransactionDO.setLockKey("t:1,2,3;t2,4,5,6");
branchTransactionDO.setResourceGroupId("a");
branchTransactionDO.setClientId("1.1.1.1");
branchTransactionDO.setStatus(1);
@@ -555,9 +530,7 @@ public class LogStoreDataBaseDAOTest {
conn.createStatement().execute(delSql);
}finally {
- if(conn != null){
- conn.close();
- }
+ IOUtil.close(conn);
}
}
@@ -571,7 +544,6 @@ public class LogStoreDataBaseDAOTest {
branchTransactionDO.setBranchId(343434318);
branchTransactionDO.setBranchType("TCC");
branchTransactionDO.setResourceGroupId("abc");
- branchTransactionDO.setLockKey("t:1,2,3;t2,4,5,6");
branchTransactionDO.setResourceGroupId("a");
branchTransactionDO.setClientId("1.1.1.1");
branchTransactionDO.setStatus(1);
@@ -600,9 +572,7 @@ public class LogStoreDataBaseDAOTest {
conn.createStatement().execute(delSql);
}finally {
- if(conn != null){
- conn.close();
- }
+ IOUtil.close(conn);
}
}
@@ -615,7 +585,6 @@ public class LogStoreDataBaseDAOTest {
branchTransactionDO.setBranchId(34567798);
branchTransactionDO.setBranchType("TCC");
branchTransactionDO.setResourceGroupId("abc");
- branchTransactionDO.setLockKey("t:1,2,3;t2,4,5,6");
branchTransactionDO.setResourceGroupId("a");
branchTransactionDO.setClientId("1.1.1.1");
branchTransactionDO.setStatus(1);
@@ -652,9 +621,7 @@ public class LogStoreDataBaseDAOTest {
rs.close();
}finally {
- if(conn != null){
- conn.close();
- }
+ IOUtil.close(conn);
}
}
diff --git a/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulListener.java b/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulListener.java
index dcc3370fcb885f3e17162f2617a198e6705c6ca1..e7efca4aa91387379fc4ce8ea3d94942867c9760 100644
--- a/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulListener.java
+++ b/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulListener.java
@@ -21,7 +21,6 @@ import java.util.List;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/3/26
*/
public interface ConsulListener {
/**
diff --git a/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulRegistryProvider.java b/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulRegistryProvider.java
index 77f8f262068de39efb1f61e7e0a3a242df603ddd..6566110284427f7cd07513e31446832ab6b34351 100644
--- a/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulRegistryProvider.java
+++ b/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulRegistryProvider.java
@@ -21,7 +21,6 @@ import io.seata.discovery.registry.RegistryService;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/12
*/
@LoadLevel(name = "Consul", order = 1)
public class ConsulRegistryProvider implements RegistryProvider {
diff --git a/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulRegistryServiceImpl.java b/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulRegistryServiceImpl.java
index 4a8ca66ff4e048198244d60ca78dc30511a99b69..3fce0d156de9869c52843805bb8604d0e7378458 100644
--- a/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulRegistryServiceImpl.java
+++ b/discovery/seata-discovery-consul/src/main/java/io/seata/discovery/registry/consul/ConsulRegistryServiceImpl.java
@@ -42,7 +42,6 @@ import java.util.stream.Collectors;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/4/1
*/
public class ConsulRegistryServiceImpl implements RegistryService<ConsulListener> {
@@ -245,17 +244,6 @@ public class ConsulRegistryServiceImpl implements RegistryService<ConsulListener
.build());
}
- /**
- * get service group
- *
- * @param key
- * @return clusterNameKey
- */
- private String getServiceGroup(String key) {
- String clusterNameKey = PREFIX_SERVICE_ROOT + CONFIG_SPLIT_CHAR + PREFIX_SERVICE_MAPPING + key;
- return ConfigurationFactory.getInstance().getConfig(clusterNameKey);
- }
-
/**
* refresh cluster
*
@@ -331,4 +319,4 @@ public class ConsulRegistryServiceImpl implements RegistryService<ConsulListener
client = null;
}
-}
\ No newline at end of file
+}
diff --git a/discovery/seata-discovery-consul/src/test/java/io/seata/discovery/registry/consul/ConsulRegistryServiceImplTest.java b/discovery/seata-discovery-consul/src/test/java/io/seata/discovery/registry/consul/ConsulRegistryServiceImplTest.java
index 08ba4ad5b2d4b7ff0d6a92a952548a6b08274c0e..99f25023d881adb99703ab2753d8d4c95a20219e 100644
--- a/discovery/seata-discovery-consul/src/test/java/io/seata/discovery/registry/consul/ConsulRegistryServiceImplTest.java
+++ b/discovery/seata-discovery-consul/src/test/java/io/seata/discovery/registry/consul/ConsulRegistryServiceImplTest.java
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.verify;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/04
*/
public class ConsulRegistryServiceImplTest {
diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/AbstractLoadBalance.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/AbstractLoadBalance.java
index e0ce85ae801d763f2f19fde273260ce6b258ff06..c9bda8fac5989197be54ea722e3b0aceaae8bf1a 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/AbstractLoadBalance.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/AbstractLoadBalance.java
@@ -22,8 +22,7 @@ import io.seata.common.util.CollectionUtils;
/**
* The type Abstract load balance.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /02/12
+ * @author slievrly
*/
public abstract class AbstractLoadBalance implements LoadBalance {
diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/LoadBalance.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/LoadBalance.java
index 5a6932a4dd5986249b8109576281d3bc09efcc85..c0d1a690d0c903fbbb550ffff8b5ae4599fbb626 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/LoadBalance.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/LoadBalance.java
@@ -20,8 +20,7 @@ import java.util.List;
/**
* The interface Load balance.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /02/12
+ * @author slievrly
*/
public interface LoadBalance {
diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/LoadBalanceFactory.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/LoadBalanceFactory.java
index a275843cf819d710c68c1b70bb7fcc53bcc96278..887d3cf275421a7bb270a2feab73ced6632c7ea6 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/LoadBalanceFactory.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/LoadBalanceFactory.java
@@ -20,8 +20,7 @@ import io.seata.common.loader.EnhancedServiceLoader;
/**
* The type Load balance factory.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /02/12
+ * @author slievrly
*/
public class LoadBalanceFactory {
diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/RandomLoadBalance.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/RandomLoadBalance.java
index a8d530b1d46ba780fafadddf5dfff5bd6745ec1e..8587c097c651769adafd026f47b6fd18335f5423 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/RandomLoadBalance.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/RandomLoadBalance.java
@@ -24,7 +24,6 @@ import io.seata.common.loader.LoadLevel;
* The type Random load balance.
*
* @author yuoyao
- * @date 2019 /02/14
*/
@LoadLevel(name = "RandomLoadBalance", order = 2)
public class RandomLoadBalance extends AbstractLoadBalance {
diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/RoundRobinLoadBalance.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/RoundRobinLoadBalance.java
index 2ceaea10d3636bb2dd123f779126f70255bc1fa9..5ab192e874f37cd0a88d2841872b1f9064ae4716 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/RoundRobinLoadBalance.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/loadbalance/RoundRobinLoadBalance.java
@@ -23,8 +23,7 @@ import io.seata.common.loader.LoadLevel;
/**
* The type Round robin load balance.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /02/12
+ * @author slievrly
*/
@LoadLevel(name = "RoundRobinLoadBalance", order = 1)
public class RoundRobinLoadBalance extends AbstractLoadBalance {
@@ -40,7 +39,7 @@ public class RoundRobinLoadBalance extends AbstractLoadBalance {
private int getPositiveSequence() {
for (; ; ) {
int current = sequence.get();
- int next = (current >= Integer.MAX_VALUE ? 0 : current + 1);
+ int next = current >= Integer.MAX_VALUE ? 0 : current + 1;
if (sequence.compareAndSet(current, next)) {
return current;
}
diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/FileRegistryServiceImpl.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/FileRegistryServiceImpl.java
index 48bff75f999458fa8f0b0213dc5acf936d291186..a8e5e7492870dcb4f6ffe1be5a5ee8caa16cbe4c 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/FileRegistryServiceImpl.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/FileRegistryServiceImpl.java
@@ -28,8 +28,7 @@ import java.util.List;
/**
* The type File registry service.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /02/12
+ * @author slievrly
*/
public class FileRegistryServiceImpl implements RegistryService<ConfigChangeListener> {
private static volatile FileRegistryServiceImpl instance;
@@ -79,7 +78,7 @@ public class FileRegistryServiceImpl implements RegistryService<ConfigChangeList
@Override
public List<InetSocketAddress> lookup(String key) throws Exception {
- String clusterName = CONFIG.getConfig(PREFIX_SERVICE_ROOT + CONFIG_SPLIT_CHAR + PREFIX_SERVICE_MAPPING + key);
+ String clusterName = getServiceGroup(key);
if (null == clusterName) {
return null;
}
diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryFactory.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryFactory.java
index bde2d86ad21899eaf28d6771c9b5513ad2e781ba..7f2d09df4007222c81923674fa83a4a04ab5ae09 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryFactory.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryFactory.java
@@ -28,8 +28,7 @@ import java.util.Objects;
/**
* The type Registry factory.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /2/1
+ * @author slievrly
*/
public class RegistryFactory {
private static final Logger LOGGER = LoggerFactory.getLogger(RegistryFactory.class);
diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryProvider.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryProvider.java
index 105b6d0e41efabebacd577c5bfdc5016d875dd64..402eb48033b399d183891b0b6ec6424843ae1d9b 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryProvider.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryProvider.java
@@ -18,7 +18,6 @@ package io.seata.discovery.registry;
/**
* the interface registry provider
* @author xingfudeshi@gmail.com
- * @date 2019/04/12
*/
public interface RegistryProvider {
/**
diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryService.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryService.java
index f59974c1bb90b97336e3ea27f71941137c442c9e..1e7ed6eeecd19155acd402aad0627cdbca9b4558 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryService.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryService.java
@@ -15,6 +15,9 @@
*/
package io.seata.discovery.registry;
+import io.seata.config.Configuration;
+import io.seata.config.ConfigurationFactory;
+
import java.net.InetSocketAddress;
import java.util.List;
@@ -22,8 +25,7 @@ import java.util.List;
* The interface Registry service.
*
* @param <T> the type parameter
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /1/31
+ * @author slievrly
*/
public interface RegistryService<T> {
@@ -88,4 +90,15 @@ public interface RegistryService<T> {
* @throws Exception
*/
void close() throws Exception;
+
+ /**
+ * Get current service group name
+ *
+ * @param key service group
+ * @return the service group name
+ */
+ default String getServiceGroup(String key) {
+ Configuration config = ConfigurationFactory.getInstance();
+ return config.getConfig(PREFIX_SERVICE_ROOT + CONFIG_SPLIT_CHAR + PREFIX_SERVICE_MAPPING + key);
+ }
}
diff --git a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryType.java b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryType.java
index 72fb0dbaf57b8d00fbd2d2f9c30d4660d1179071..929e05272b66398cc0d0b9a4209178f4338ba0a3 100644
--- a/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryType.java
+++ b/discovery/seata-discovery-core/src/main/java/io/seata/discovery/registry/RegistryType.java
@@ -20,8 +20,7 @@ import io.seata.common.exception.NotSupportYetException;
/**
* The enum Registry type.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /02/26
+ * @author slievrly
*/
public enum RegistryType {
/**
diff --git a/discovery/seata-discovery-core/src/test/java/io/seata/discovery/loadbalance/LoadBalanceFactoryTest.java b/discovery/seata-discovery-core/src/test/java/io/seata/discovery/loadbalance/LoadBalanceFactoryTest.java
index 062ae3f5813266824ffb6a21ba1f9506d22e553e..0a967b402443d742216c58d23d8f00e6d369a938 100644
--- a/discovery/seata-discovery-core/src/test/java/io/seata/discovery/loadbalance/LoadBalanceFactoryTest.java
+++ b/discovery/seata-discovery-core/src/test/java/io/seata/discovery/loadbalance/LoadBalanceFactoryTest.java
@@ -32,8 +32,7 @@ import java.util.stream.Stream;
/**
* The type Load balance factory test.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /02/12
+ * @author slievrly
*/
public class LoadBalanceFactoryTest {
diff --git a/discovery/seata-discovery-custom/src/main/java/io/seata/discovery/registry/custom/CustomRegistryProvider.java b/discovery/seata-discovery-custom/src/main/java/io/seata/discovery/registry/custom/CustomRegistryProvider.java
index 02606c0bc3a44b3844461c5c0b8628e4dcd00460..8b740b7aadb665198f21b2c3141d335a2de6626d 100644
--- a/discovery/seata-discovery-custom/src/main/java/io/seata/discovery/registry/custom/CustomRegistryProvider.java
+++ b/discovery/seata-discovery-custom/src/main/java/io/seata/discovery/registry/custom/CustomRegistryProvider.java
@@ -32,7 +32,7 @@ import java.util.stream.Stream;
public class CustomRegistryProvider implements RegistryProvider {
private static final String FILE_CONFIG_KEY_PREFIX = "registry.custom.name";
- private final String CUSTOM_NAME;
+ private final String customName;
public CustomRegistryProvider() {
String name = ConfigurationFactory.CURRENT_FILE_INSTANCE.getConfig(FILE_CONFIG_KEY_PREFIX);
@@ -43,11 +43,11 @@ public class CustomRegistryProvider implements RegistryProvider {
.anyMatch(ct -> ct.name().equalsIgnoreCase(name))) {
throw new IllegalArgumentException(String.format("custom registry type name %s is not allowed", name));
}
- CUSTOM_NAME = name;
+ customName = name;
}
@Override
public RegistryService provide() {
- return EnhancedServiceLoader.load(RegistryProvider.class, CUSTOM_NAME).provide();
+ return EnhancedServiceLoader.load(RegistryProvider.class, customName).provide();
}
}
diff --git a/discovery/seata-discovery-custom/src/test/java/io/seata/discovery/registry/custom/CustomRegistryServiceForTest.java b/discovery/seata-discovery-custom/src/test/java/io/seata/discovery/registry/custom/CustomRegistryServiceForTest.java
index 3d6b70c835e3000f40f4b48257a4800f4b12606e..804ef1fd513291bf29ed2204e93273e9d433de81 100644
--- a/discovery/seata-discovery-custom/src/test/java/io/seata/discovery/registry/custom/CustomRegistryServiceForTest.java
+++ b/discovery/seata-discovery-custom/src/test/java/io/seata/discovery/registry/custom/CustomRegistryServiceForTest.java
@@ -51,4 +51,5 @@ public class CustomRegistryServiceForTest implements RegistryService<ConfigChang
public void close() throws Exception {
throw new UnsupportedOperationException();
}
+
}
diff --git a/discovery/seata-discovery-etcd3/src/main/java/io/seata/discovery/registry/etcd3/EtcdRegistryProvider.java b/discovery/seata-discovery-etcd3/src/main/java/io/seata/discovery/registry/etcd3/EtcdRegistryProvider.java
index 990d1a762807449bc2c5f01c7f2ca79adc772a63..5cd80941541e53e21c8f625980e4a27c101765b8 100644
--- a/discovery/seata-discovery-etcd3/src/main/java/io/seata/discovery/registry/etcd3/EtcdRegistryProvider.java
+++ b/discovery/seata-discovery-etcd3/src/main/java/io/seata/discovery/registry/etcd3/EtcdRegistryProvider.java
@@ -21,7 +21,6 @@ import io.seata.discovery.registry.RegistryService;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/18
*/
@LoadLevel(name = "Etcd3", order = 1)
public class EtcdRegistryProvider implements RegistryProvider {
diff --git a/discovery/seata-discovery-etcd3/src/main/java/io/seata/discovery/registry/etcd3/EtcdRegistryServiceImpl.java b/discovery/seata-discovery-etcd3/src/main/java/io/seata/discovery/registry/etcd3/EtcdRegistryServiceImpl.java
index e18f8ba5cea7fd7b4dbf046819e433a553ea379b..eefbb93d976bcfb67003677e0ddff03ee3f1b05f 100644
--- a/discovery/seata-discovery-etcd3/src/main/java/io/seata/discovery/registry/etcd3/EtcdRegistryServiceImpl.java
+++ b/discovery/seata-discovery-etcd3/src/main/java/io/seata/discovery/registry/etcd3/EtcdRegistryServiceImpl.java
@@ -34,13 +34,14 @@ import io.seata.common.util.StringUtils;
import io.seata.config.Configuration;
import io.seata.config.ConfigurationFactory;
import io.seata.discovery.registry.RegistryService;
-import java.util.Objects;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.net.InetSocketAddress;
import java.util.HashSet;
import java.util.List;
+import java.util.Objects;
+import java.util.Collections;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
@@ -56,7 +57,6 @@ import static io.netty.util.CharsetUtil.UTF_8;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/18
*/
public class EtcdRegistryServiceImpl implements RegistryService<Watch.Listener> {
private static final Logger LOGGER = LoggerFactory.getLogger(EtcdRegistryServiceImpl.class);
@@ -213,7 +213,8 @@ public class EtcdRegistryServiceImpl implements RegistryService<Watch.Listener>
});
}
- return clusterAddressMap.get(cluster).getValue();
+ Pair<Long, List<InetSocketAddress>> pair = clusterAddressMap.get(cluster);
+ return Objects.isNull(pair) ? Collections.emptyList() : pair.getValue();
}
@Override
@@ -269,17 +270,6 @@ public class EtcdRegistryServiceImpl implements RegistryService<Watch.Listener>
return client;
}
- /**
- * get service group
- *
- * @param key
- * @return clusterNameKey
- */
- private String getServiceGroup(String key) {
- String clusterNameKey = PREFIX_SERVICE_ROOT + CONFIG_SPLIT_CHAR + PREFIX_SERVICE_MAPPING + key;
- return ConfigurationFactory.getInstance().getConfig(clusterNameKey);
- }
-
/**
* get cluster name
*
diff --git a/discovery/seata-discovery-etcd3/src/test/java/io/seata/discovery/registry/etcd/EtcdRegistryProviderTest.java b/discovery/seata-discovery-etcd3/src/test/java/io/seata/discovery/registry/etcd/EtcdRegistryProviderTest.java
index d5e5ea22ef808aedb171e9a0a1ff9f3126ab0ce7..8d5fa6142c93bf75ea5fbce59862e1390c67e80e 100644
--- a/discovery/seata-discovery-etcd3/src/test/java/io/seata/discovery/registry/etcd/EtcdRegistryProviderTest.java
+++ b/discovery/seata-discovery-etcd3/src/test/java/io/seata/discovery/registry/etcd/EtcdRegistryProviderTest.java
@@ -23,7 +23,6 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/26
* the type etcd registry provider test
*/
public class EtcdRegistryProviderTest {
diff --git a/discovery/seata-discovery-etcd3/src/test/java/io/seata/discovery/registry/etcd/EtcdRegistryServiceImplTest.java b/discovery/seata-discovery-etcd3/src/test/java/io/seata/discovery/registry/etcd/EtcdRegistryServiceImplTest.java
index d2eecf29873838c7be0c07c44b0e237ee0c37d63..7eecff8b69241212fa320fd82bfe47ba0123d7a7 100644
--- a/discovery/seata-discovery-etcd3/src/test/java/io/seata/discovery/registry/etcd/EtcdRegistryServiceImplTest.java
+++ b/discovery/seata-discovery-etcd3/src/test/java/io/seata/discovery/registry/etcd/EtcdRegistryServiceImplTest.java
@@ -40,7 +40,6 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/26
*/
@Disabled
public class EtcdRegistryServiceImplTest {
diff --git a/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/CustomEurekaInstanceConfig.java b/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/CustomEurekaInstanceConfig.java
index c9d68492153723a815362cba5271b69f301fb1f9..0151294c6eba7887e2da2e6ad8542eccd0f3dad9 100644
--- a/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/CustomEurekaInstanceConfig.java
+++ b/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/CustomEurekaInstanceConfig.java
@@ -21,7 +21,6 @@ import com.netflix.appinfo.MyDataCenterInstanceConfig;
/**
* @author: rui_849217@163.com
- * @date: 2018/2/18
* override MyDataCenterInstanceConfig for set value,
* eg: instanceId \ipAddress \ applicationName...
*/
diff --git a/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/EurekaRegistryProvider.java b/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/EurekaRegistryProvider.java
index ceedb26bd643e360f0eb05336f850d46cbf27af0..d55407f3cfd1fe92a02972cd0c124578b5cfdd15 100644
--- a/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/EurekaRegistryProvider.java
+++ b/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/EurekaRegistryProvider.java
@@ -21,7 +21,6 @@ import io.seata.discovery.registry.RegistryProvider;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/12
*/
@LoadLevel(name = "Eureka", order = 1)
public class EurekaRegistryProvider implements RegistryProvider {
diff --git a/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/EurekaRegistryServiceImpl.java b/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/EurekaRegistryServiceImpl.java
index bf18955dc23329b2c25aada6de55059141d354f9..3ebeb61d8d274e1f58c8317b8e05a032dd2b01bc 100644
--- a/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/EurekaRegistryServiceImpl.java
+++ b/discovery/seata-discovery-eureka/src/main/java/io/seata/discovery/registry/eureka/EurekaRegistryServiceImpl.java
@@ -22,7 +22,6 @@ import com.netflix.config.ConfigurationManager;
import com.netflix.discovery.DefaultEurekaClientConfig;
import com.netflix.discovery.DiscoveryClient;
import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaEvent;
import com.netflix.discovery.EurekaEventListener;
import com.netflix.discovery.shared.Application;
import io.seata.common.exception.EurekaRegistryException;
@@ -41,6 +40,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Properties;
import java.util.Set;
+import java.util.Collections;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -48,7 +48,6 @@ import java.util.concurrent.ConcurrentMap;
* The type Eureka registry service.
*
* @author: rui_849217@163.com
- * @date: 2018/3/6
*/
public class EurekaRegistryServiceImpl implements RegistryService<EurekaEventListener> {
private static final Logger LOGGER = LoggerFactory.getLogger(EurekaRegistryServiceImpl.class);
@@ -76,7 +75,6 @@ public class EurekaRegistryServiceImpl implements RegistryService<EurekaEventLis
private static volatile EurekaRegistryServiceImpl instance;
private static volatile EurekaClient eurekaClient;
-
private EurekaRegistryServiceImpl() {
}
@@ -126,26 +124,21 @@ public class EurekaRegistryServiceImpl implements RegistryService<EurekaEventLis
@Override
public List<InetSocketAddress> lookup(String key) throws Exception {
- Configuration config = ConfigurationFactory.getInstance();
- String clusterName = config.getConfig(PREFIX_SERVICE_ROOT + CONFIG_SPLIT_CHAR + PREFIX_SERVICE_MAPPING + key);
+ String clusterName = getServiceGroup(key);
if (null == clusterName) {
return null;
}
if (!subscribeListener) {
refreshCluster();
- subscribe(null, new EurekaEventListener() {
- @Override
- public void onEvent(EurekaEvent event) {
- try {
- refreshCluster();
- } catch (Exception e) {
- LOGGER.error("Eureka event listener refreshCluster error:{}", e.getMessage(), e);
- }
+ subscribe(null, event -> {
+ try {
+ refreshCluster();
+ } catch (Exception e) {
+ LOGGER.error("Eureka event listener refreshCluster error:{}", e.getMessage(), e);
}
});
}
-
- return new ArrayList<>(clusterAddressMap.get(clusterName.toUpperCase()));
+ return new ArrayList<>(clusterAddressMap.getOrDefault(clusterName.toUpperCase(), Collections.emptySet()));
}
@Override
@@ -159,7 +152,7 @@ public class EurekaRegistryServiceImpl implements RegistryService<EurekaEventLis
private void refreshCluster() {
List<Application> applications = getEurekaClient(false).getApplications().getRegisteredApplications();
- if (CollectionUtils.isEmpty(applications)){
+ if (CollectionUtils.isEmpty(applications)) {
clusterAddressMap.clear();
if (LOGGER.isDebugEnabled()) {
@@ -222,16 +215,18 @@ public class EurekaRegistryServiceImpl implements RegistryService<EurekaEventLis
}
private EurekaClient getEurekaClient(boolean needRegister) throws EurekaRegistryException {
- if (eurekaClient == null) {
+ if (null == eurekaClient) {
synchronized (EurekaRegistryServiceImpl.class) {
try {
- if (!needRegister) {
- instanceConfig = new CustomEurekaInstanceConfig();
+ if (null == eurekaClient) {
+ if (!needRegister) {
+ instanceConfig = new CustomEurekaInstanceConfig();
+ }
+ ConfigurationManager.loadProperties(getEurekaProperties(needRegister));
+ InstanceInfo instanceInfo = new EurekaConfigBasedInstanceInfoProvider(instanceConfig).get();
+ applicationInfoManager = new ApplicationInfoManager(instanceConfig, instanceInfo);
+ eurekaClient = new DiscoveryClient(applicationInfoManager, new DefaultEurekaClientConfig());
}
- ConfigurationManager.loadProperties(getEurekaProperties(needRegister));
- InstanceInfo instanceInfo = new EurekaConfigBasedInstanceInfoProvider(instanceConfig).get();
- applicationInfoManager = new ApplicationInfoManager(instanceConfig, instanceInfo);
- eurekaClient = new DiscoveryClient(applicationInfoManager, new DefaultEurekaClientConfig());
} catch (Exception e) {
clean();
throw new EurekaRegistryException("register eureka is error!", e);
@@ -248,7 +243,7 @@ public class EurekaRegistryServiceImpl implements RegistryService<EurekaEventLis
}
private String getInstanceId() {
- return String.format("%s:%s:%d", instanceConfig.getAppname(), instanceConfig.getIpAddress(),
+ return String.format("%s:%s:%d", instanceConfig.getIpAddress(), instanceConfig.getAppname(),
instanceConfig.getNonSecurePort());
}
@@ -258,13 +253,10 @@ public class EurekaRegistryServiceImpl implements RegistryService<EurekaEventLis
}
private String getEurekaApplicationFileKey() {
- return FILE_ROOT_REGISTRY + FILE_CONFIG_SPLIT_CHAR + REGISTRY_TYPE + FILE_CONFIG_SPLIT_CHAR
- + CLUSTER;
+ return FILE_ROOT_REGISTRY + FILE_CONFIG_SPLIT_CHAR + REGISTRY_TYPE + FILE_CONFIG_SPLIT_CHAR + CLUSTER;
}
private String getEurekaInstanceWeightFileKey() {
- return FILE_ROOT_REGISTRY + FILE_CONFIG_SPLIT_CHAR + REGISTRY_TYPE + FILE_CONFIG_SPLIT_CHAR
- + REGISTRY_WEIGHT;
+ return FILE_ROOT_REGISTRY + FILE_CONFIG_SPLIT_CHAR + REGISTRY_TYPE + FILE_CONFIG_SPLIT_CHAR + REGISTRY_WEIGHT;
}
-
}
diff --git a/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryProvider.java b/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryProvider.java
index d201ce29c22ecfa048187227808a61c485127834..c07e0ce0aaa333a36c6e81cf43a9c1cba458a067 100644
--- a/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryProvider.java
+++ b/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryProvider.java
@@ -21,7 +21,6 @@ import io.seata.discovery.registry.RegistryProvider;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/12
*/
@LoadLevel(name = "Nacos", order = 1)
public class NacosRegistryProvider implements RegistryProvider {
diff --git a/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java b/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java
index 575e0fd64b433acbb5d5cc3a4a6aeb29c6428416..7ab82f04b4f8ba01e75e0b4987a3c987507a9d1e 100644
--- a/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java
+++ b/discovery/seata-discovery-nacos/src/main/java/io/seata/discovery/registry/nacos/NacosRegistryServiceImpl.java
@@ -22,23 +22,22 @@ import java.util.Properties;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
-import io.seata.config.Configuration;
-import io.seata.config.ConfigurationFactory;
-import io.seata.config.ConfigurationKeys;
-import io.seata.discovery.registry.RegistryService;
import com.alibaba.nacos.api.naming.NamingFactory;
import com.alibaba.nacos.api.naming.NamingService;
-import com.alibaba.nacos.api.naming.listener.Event;
import com.alibaba.nacos.api.naming.listener.EventListener;
import com.alibaba.nacos.api.naming.listener.NamingEvent;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.client.naming.utils.CollectionUtils;
+import io.seata.config.Configuration;
+import io.seata.config.ConfigurationFactory;
+import io.seata.config.ConfigurationKeys;
+import io.seata.discovery.registry.RegistryService;
+
/**
* The type Nacos registry service.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /1/31
+ * @author slievrly
*/
public class NacosRegistryServiceImpl implements RegistryService<EventListener> {
private static final String DEFAULT_NAMESPACE = "";
@@ -52,6 +51,7 @@ public class NacosRegistryServiceImpl implements RegistryService<EventListener>
private static final ConcurrentMap<String, List<EventListener>> LISTENER_SERVICE_MAP = new ConcurrentHashMap<>();
private static final ConcurrentMap<String, List<InetSocketAddress>> CLUSTER_ADDRESS_MAP = new ConcurrentHashMap<>();
private static volatile NacosRegistryServiceImpl instance;
+ private static final Object LOCK_OBJ = new Object();
private NacosRegistryServiceImpl() {
}
@@ -112,41 +112,41 @@ public class NacosRegistryServiceImpl implements RegistryService<EventListener>
@Override
public List<InetSocketAddress> lookup(String key) throws Exception {
- Configuration config = ConfigurationFactory.getInstance();
- String clusterName = config.getConfig(PREFIX_SERVICE_ROOT + CONFIG_SPLIT_CHAR + PREFIX_SERVICE_MAPPING + key);
+ String clusterName = getServiceGroup(key);
if (null == clusterName) {
return null;
}
if (!LISTENER_SERVICE_MAP.containsKey(clusterName)) {
- List<String> clusters = new ArrayList<>();
- clusters.add(clusterName);
- List<Instance> firstAllInstances = getNamingInstance().getAllInstances(PRO_SERVER_ADDR_KEY, clusters);
- if (null != firstAllInstances) {
- List<InetSocketAddress> newAddressList = new ArrayList<>();
- for (Instance instance : firstAllInstances) {
- if (instance.isEnabled() && instance.isHealthy()) {
- newAddressList.add(new InetSocketAddress(instance.getIp(), instance.getPort()));
- }
- }
- CLUSTER_ADDRESS_MAP.put(clusterName, newAddressList);
- }
- subscribe(clusterName, new EventListener() {
- @Override
- public void onEvent(Event event) {
- List<Instance> instances = ((NamingEvent) event).getInstances();
- if (null == instances && null != CLUSTER_ADDRESS_MAP.get(clusterName)) {
- CLUSTER_ADDRESS_MAP.remove(clusterName);
- } else if (!CollectionUtils.isEmpty(instances)) {
+ synchronized (LOCK_OBJ) {
+ if (!LISTENER_SERVICE_MAP.containsKey(clusterName)) {
+ List<String> clusters = new ArrayList<>();
+ clusters.add(clusterName);
+ List<Instance> firstAllInstances = getNamingInstance().getAllInstances(PRO_SERVER_ADDR_KEY, clusters);
+ if (null != firstAllInstances) {
List<InetSocketAddress> newAddressList = new ArrayList<>();
- for (Instance instance : instances) {
+ for (Instance instance : firstAllInstances) {
if (instance.isEnabled() && instance.isHealthy()) {
newAddressList.add(new InetSocketAddress(instance.getIp(), instance.getPort()));
}
}
CLUSTER_ADDRESS_MAP.put(clusterName, newAddressList);
}
+ subscribe(clusterName, event -> {
+ List<Instance> instances = ((NamingEvent)event).getInstances();
+ if (null == instances && null != CLUSTER_ADDRESS_MAP.get(clusterName)) {
+ CLUSTER_ADDRESS_MAP.remove(clusterName);
+ } else if (!CollectionUtils.isEmpty(instances)) {
+ List<InetSocketAddress> newAddressList = new ArrayList<>();
+ for (Instance instance : instances) {
+ if (instance.isEnabled() && instance.isHealthy()) {
+ newAddressList.add(new InetSocketAddress(instance.getIp(), instance.getPort()));
+ }
+ }
+ CLUSTER_ADDRESS_MAP.put(clusterName, newAddressList);
+ }
+ });
}
- });
+ }
}
return CLUSTER_ADDRESS_MAP.get(clusterName);
}
diff --git a/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisListener.java b/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisListener.java
index b31f560938253a2083c10e7619930fa11befaee9..a6e66353a822e3478cdb727e1ffe9dc2f41437cc 100644
--- a/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisListener.java
+++ b/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisListener.java
@@ -19,7 +19,6 @@ package io.seata.discovery.registry.redis;
* The RedisListener
*
* @author kl @kailing.pub
- * @date 2019 /2/27
*/
public interface RedisListener {
/**
@@ -37,4 +36,4 @@ public interface RedisListener {
* @param event the event
*/
void onEvent(String event);
-}
\ No newline at end of file
+}
diff --git a/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisRegistryProvider.java b/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisRegistryProvider.java
index 10bd29dcae9b36779f98a56456484048b1c491b3..f7edd5848c98183a0827be3f0e48d80a2e29fc56 100644
--- a/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisRegistryProvider.java
+++ b/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisRegistryProvider.java
@@ -21,7 +21,6 @@ import io.seata.discovery.registry.RegistryService;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/12
*/
@LoadLevel(name = "Redis", order = 1)
public class RedisRegistryProvider implements RegistryProvider {
diff --git a/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisRegistryServiceImpl.java b/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisRegistryServiceImpl.java
index 3990c70bd851519adc9a448324e71b511416fd8b..c22545d4724970ca5c882069893a88b8b5e5d1fc 100644
--- a/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisRegistryServiceImpl.java
+++ b/discovery/seata-discovery-redis/src/main/java/io/seata/discovery/registry/redis/RedisRegistryServiceImpl.java
@@ -22,6 +22,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Collections;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
@@ -46,7 +47,6 @@ import redis.clients.jedis.Protocol;
* The type Redis registry service.
*
* @author kl @kailing.pub
- * @date 2019 /2/27
*/
public class RedisRegistryServiceImpl implements RegistryService<RedisListener> {
@@ -140,12 +140,9 @@ public class RedisRegistryServiceImpl implements RegistryService<RedisListener>
public void register(InetSocketAddress address) {
NetUtil.validAddress(address);
String serverAddr = NetUtil.toStringAddress(address);
- Jedis jedis = jedisPool.getResource();
- try {
+ try (Jedis jedis = jedisPool.getResource()) {
jedis.hset(getRedisRegistryKey(), serverAddr, ManagementFactory.getRuntimeMXBean().getName());
jedis.publish(getRedisRegistryKey(), serverAddr + "-" + RedisListener.REGISTER);
- } finally {
- jedis.close();
}
}
@@ -153,12 +150,9 @@ public class RedisRegistryServiceImpl implements RegistryService<RedisListener>
public void unregister(InetSocketAddress address) {
NetUtil.validAddress(address);
String serverAddr = NetUtil.toStringAddress(address);
- Jedis jedis = jedisPool.getResource();
- try {
+ try (Jedis jedis = jedisPool.getResource()) {
jedis.hdel(getRedisRegistryKey(), serverAddr);
jedis.publish(getRedisRegistryKey(), serverAddr + "-" + RedisListener.UN_REGISTER);
- } finally {
- jedis.close();
}
}
@@ -167,19 +161,13 @@ public class RedisRegistryServiceImpl implements RegistryService<RedisListener>
String redisRegistryKey = REDIS_FILEKEY_PREFIX + cluster;
LISTENER_SERVICE_MAP.putIfAbsent(cluster, new ArrayList<>());
LISTENER_SERVICE_MAP.get(cluster).add(listener);
- threadPoolExecutor.submit(new Runnable() {
- @Override
- public void run() {
- try {
- Jedis jedis = jedisPool.getResource();
- try {
- jedis.subscribe(new NotifySub(LISTENER_SERVICE_MAP.get(cluster)), redisRegistryKey);
- } finally {
- jedis.close();
- }
- } catch (Exception e) {
- LOGGER.error(e.getMessage(), e);
+ threadPoolExecutor.submit(() -> {
+ try {
+ try (Jedis jedis = jedisPool.getResource()) {
+ jedis.subscribe(new NotifySub(LISTENER_SERVICE_MAP.get(cluster)), redisRegistryKey);
}
+ } catch (Exception e) {
+ LOGGER.error(e.getMessage(), e);
}
});
}
@@ -190,18 +178,14 @@ public class RedisRegistryServiceImpl implements RegistryService<RedisListener>
@Override
public List<InetSocketAddress> lookup(String key) {
- Configuration config = ConfigurationFactory.getInstance();
- String clusterName = config.getConfig(PREFIX_SERVICE_ROOT + CONFIG_SPLIT_CHAR + PREFIX_SERVICE_MAPPING + key);
+ String clusterName = getServiceGroup(key);
if (null == clusterName) {
return null;
}
if (!LISTENER_SERVICE_MAP.containsKey(clusterName)) {
- Jedis jedis = jedisPool.getResource();
- Map<String, String> instances = null;
- try {
+ Map<String, String> instances;
+ try (Jedis jedis = jedisPool.getResource()) {
instances = jedis.hgetAll(getRedisRegistryKey());
- } finally {
- jedis.close();
}
if (null != instances && !instances.isEmpty()) {
Set<InetSocketAddress> newAddressSet = new HashSet<>();
@@ -211,26 +195,23 @@ public class RedisRegistryServiceImpl implements RegistryService<RedisListener>
}
CLUSTER_ADDRESS_MAP.put(clusterName, newAddressSet);
}
- subscribe(clusterName, new RedisListener() {
- @Override
- public void onEvent(String msg) {
- String[] msgr = msg.split("-");
- String serverAddr = msgr[0];
- String eventType = msgr[1];
- switch (eventType) {
- case RedisListener.REGISTER:
- CLUSTER_ADDRESS_MAP.get(clusterName).add(NetUtil.toInetSocketAddress(serverAddr));
- break;
- case RedisListener.UN_REGISTER:
- CLUSTER_ADDRESS_MAP.get(clusterName).remove(NetUtil.toInetSocketAddress(serverAddr));
- break;
- default:
- throw new ShouldNeverHappenException("unknown redis msg:" + msg);
- }
+ subscribe(clusterName, msg -> {
+ String[] msgr = msg.split("-");
+ String serverAddr = msgr[0];
+ String eventType = msgr[1];
+ switch (eventType) {
+ case RedisListener.REGISTER:
+ CLUSTER_ADDRESS_MAP.get(clusterName).add(NetUtil.toInetSocketAddress(serverAddr));
+ break;
+ case RedisListener.UN_REGISTER:
+ CLUSTER_ADDRESS_MAP.get(clusterName).remove(NetUtil.toInetSocketAddress(serverAddr));
+ break;
+ default:
+ throw new ShouldNeverHappenException("unknown redis msg:" + msg);
}
});
}
- return new ArrayList<>(CLUSTER_ADDRESS_MAP.get(clusterName));
+ return new ArrayList<>(CLUSTER_ADDRESS_MAP.getOrDefault(clusterName, Collections.emptySet()));
}
@Override
@@ -274,4 +255,5 @@ public class RedisRegistryServiceImpl implements RegistryService<RedisListener>
private String getRedisDbFileKey() {
return REDIS_FILEKEY_PREFIX + REDIS_DB;
}
-}
\ No newline at end of file
+
+}
diff --git a/discovery/seata-discovery-sofa/src/main/java/io/seata/discovery/registry/sofa/SofaRegistryProvider.java b/discovery/seata-discovery-sofa/src/main/java/io/seata/discovery/registry/sofa/SofaRegistryProvider.java
index 83574898ff083741dd9c1395c9682b609903fc6b..7b67e563813c5e93e2c73a6288fc1f1756d5e7ca 100644
--- a/discovery/seata-discovery-sofa/src/main/java/io/seata/discovery/registry/sofa/SofaRegistryProvider.java
+++ b/discovery/seata-discovery-sofa/src/main/java/io/seata/discovery/registry/sofa/SofaRegistryProvider.java
@@ -22,7 +22,6 @@ import io.seata.discovery.registry.RegistryService;
/**
* @author leizhiyuan
- * @date 2019/04/15
*/
@LoadLevel(name = "Sofa", order = 1)
public class SofaRegistryProvider implements RegistryProvider {
diff --git a/discovery/seata-discovery-sofa/src/main/java/io/seata/discovery/registry/sofa/SofaRegistryServiceImpl.java b/discovery/seata-discovery-sofa/src/main/java/io/seata/discovery/registry/sofa/SofaRegistryServiceImpl.java
index a5773c8bf24911c4b772ccd1fc441096ebdc6b1a..e4499d042700f808912fcf4bb8305d46493b4efe 100644
--- a/discovery/seata-discovery-sofa/src/main/java/io/seata/discovery/registry/sofa/SofaRegistryServiceImpl.java
+++ b/discovery/seata-discovery-sofa/src/main/java/io/seata/discovery/registry/sofa/SofaRegistryServiceImpl.java
@@ -29,7 +29,6 @@ import com.alipay.sofa.registry.client.api.RegistryClient;
import com.alipay.sofa.registry.client.api.RegistryClientConfig;
import com.alipay.sofa.registry.client.api.SubscriberDataObserver;
import com.alipay.sofa.registry.client.api.model.RegistryType;
-import com.alipay.sofa.registry.client.api.model.UserData;
import com.alipay.sofa.registry.client.api.registration.PublisherRegistration;
import com.alipay.sofa.registry.client.api.registration.SubscriberRegistration;
import com.alipay.sofa.registry.client.provider.DefaultRegistryClient;
@@ -48,7 +47,6 @@ import static io.seata.config.ConfigurationKeys.FILE_ROOT_REGISTRY;
* The type SOFARegistry registry service.
*
* @author leizhiyuan
- * @date 2019 /4/15
*/
public class SofaRegistryServiceImpl implements RegistryService<SubscriberDataObserver> {
@@ -159,27 +157,22 @@ public class SofaRegistryServiceImpl implements RegistryService<SubscriberDataOb
@Override
public List<InetSocketAddress> lookup(String key) throws Exception {
- Configuration config = ConfigurationFactory.getInstance();
- String clusterName = config.getConfig(PREFIX_SERVICE_ROOT + CONFIG_SPLIT_CHAR + PREFIX_SERVICE_MAPPING + key);
+ String clusterName = getServiceGroup(key);
if (null == clusterName) {
return null;
}
if (!LISTENER_SERVICE_MAP.containsKey(clusterName)) {
CountDownLatch respondRegistries = new CountDownLatch(1);
- subscribe(clusterName, new SubscriberDataObserver() {
- @Override
- public void handleData(String dataId, UserData data) {
- Map<String, List<String>> instances = data.getZoneData();
- if (null == instances && null != CLUSTER_ADDRESS_MAP.get(clusterName)) {
- CLUSTER_ADDRESS_MAP.remove(clusterName);
- } else {
- List<InetSocketAddress> tranformData = flatData(instances);
- List<InetSocketAddress> newAddressList = new ArrayList<>();
- newAddressList.addAll(tranformData);
- CLUSTER_ADDRESS_MAP.put(clusterName, newAddressList);
- }
- respondRegistries.countDown();
+ subscribe(clusterName, (dataId, data) -> {
+ Map<String, List<String>> instances = data.getZoneData();
+ if (null == instances && null != CLUSTER_ADDRESS_MAP.get(clusterName)) {
+ CLUSTER_ADDRESS_MAP.remove(clusterName);
+ } else {
+ List<InetSocketAddress> tranformData = flatData(instances);
+ List<InetSocketAddress> newAddressList = new ArrayList<>(tranformData);
+ CLUSTER_ADDRESS_MAP.put(clusterName, newAddressList);
}
+ respondRegistries.countDown();
});
//wait max for first lookup
@@ -191,7 +184,7 @@ public class SofaRegistryServiceImpl implements RegistryService<SubscriberDataOb
}
private List<InetSocketAddress> flatData(Map<String, List<String>> instances) {
- List<InetSocketAddress> result = new ArrayList<InetSocketAddress>();
+ List<InetSocketAddress> result = new ArrayList<>();
for (Map.Entry<String, List<String>> entry : instances.entrySet()) {
for (String str : entry.getValue()) {
diff --git a/discovery/seata-discovery-zk/src/main/java/io/seata/discovery/registry/zk/ZookeeperRegisterServiceImpl.java b/discovery/seata-discovery-zk/src/main/java/io/seata/discovery/registry/zk/ZookeeperRegisterServiceImpl.java
index bb18581d1edcf39540a34a22d460dead741f925f..02b198f4377277a9c24aaa7e19f9696cdabcc56c 100644
--- a/discovery/seata-discovery-zk/src/main/java/io/seata/discovery/registry/zk/ZookeeperRegisterServiceImpl.java
+++ b/discovery/seata-discovery-zk/src/main/java/io/seata/discovery/registry/zk/ZookeeperRegisterServiceImpl.java
@@ -45,7 +45,6 @@ import static io.seata.common.Constants.IP_PORT_SPLIT_CHAR;
* zookeeper path as /registry/zk/
*
* @author crazier.huang
- * @date 2019/2/15
*/
public class ZookeeperRegisterServiceImpl implements RegistryService<IZkChildListener> {
private static final Logger LOGGER = LoggerFactory.getLogger(ZookeeperRegisterServiceImpl.class);
@@ -245,7 +244,7 @@ public class ZookeeperRegisterServiceImpl implements RegistryService<IZkChildLis
private void recover() throws Exception {
// recover Server
if (!REGISTERED_PATH_SET.isEmpty()) {
- REGISTERED_PATH_SET.forEach(path -> doRegister(path));
+ REGISTERED_PATH_SET.forEach(this::doRegister);
}
// recover client
if (!LISTENER_SERVICE_MAP.isEmpty()) {
@@ -262,16 +261,13 @@ public class ZookeeperRegisterServiceImpl implements RegistryService<IZkChildLis
}
}
- private void subscribeCluster(String clusterName) throws Exception {
- subscribe(clusterName, new IZkChildListener() {
- @Override
- public void handleChildChange(String parentPath, List<String> currentChilds) throws Exception {
- String clusterName = parentPath.replace(ROOT_PATH, "");
- if (CollectionUtils.isEmpty(currentChilds) && CLUSTER_ADDRESS_MAP.get(clusterName) != null) {
- CLUSTER_ADDRESS_MAP.remove(clusterName);
- } else if (!CollectionUtils.isEmpty(currentChilds)) {
- refreshClusterAddressMap(clusterName, currentChilds);
- }
+ private void subscribeCluster(String cluster) throws Exception {
+ subscribe(cluster, (parentPath, currentChilds) -> {
+ String clusterName = parentPath.replace(ROOT_PATH, "");
+ if (CollectionUtils.isEmpty(currentChilds) && CLUSTER_ADDRESS_MAP.get(clusterName) != null) {
+ CLUSTER_ADDRESS_MAP.remove(clusterName);
+ } else if (!CollectionUtils.isEmpty(currentChilds)) {
+ refreshClusterAddressMap(clusterName, currentChilds);
}
});
}
@@ -299,12 +295,6 @@ public class ZookeeperRegisterServiceImpl implements RegistryService<IZkChildLis
return FILE_CONFIG.getConfig(clusterConfigName);
}
- private String getServiceGroup(String key) {
- Configuration configuration = ConfigurationFactory.getInstance();
- String clusterNameKey = PREFIX_SERVICE_ROOT + CONFIG_SPLIT_CHAR + PREFIX_SERVICE_MAPPING + key;
- return configuration.getConfig(clusterNameKey);
- }
-
private String getRegisterPathByPath(InetSocketAddress address) {
return ROOT_PATH + getClusterName() + ZK_PATH_SPLIT_CHAR + NetUtil.toStringAddress(address);
}
diff --git a/discovery/seata-discovery-zk/src/main/java/io/seata/discovery/registry/zk/ZookeeperRegistryProvider.java b/discovery/seata-discovery-zk/src/main/java/io/seata/discovery/registry/zk/ZookeeperRegistryProvider.java
index f97e719934111f75869dffe6325c213049bafdd9..fdab6790a8d7b0994785fe0c5f745668b547804a 100644
--- a/discovery/seata-discovery-zk/src/main/java/io/seata/discovery/registry/zk/ZookeeperRegistryProvider.java
+++ b/discovery/seata-discovery-zk/src/main/java/io/seata/discovery/registry/zk/ZookeeperRegistryProvider.java
@@ -21,7 +21,6 @@ import io.seata.discovery.registry.RegistryService;
/**
* @author xingfudeshi@gmail.com
- * @date 2019/04/12
*/
@LoadLevel(name = "ZK", order = 1)
public class ZookeeperRegistryProvider implements RegistryProvider {
diff --git a/distribution/Dockerfile b/distribution/Dockerfile
new file mode 100644
index 0000000000000000000000000000000000000000..6186bd07b8e9a9fe19f26f51d5e86c97cf28b1c8
--- /dev/null
+++ b/distribution/Dockerfile
@@ -0,0 +1,18 @@
+# https://hub.docker.com/orgs/seataio
+FROM openjdk:8u232-jre-stretch
+
+# set label
+LABEL maintainer="Seata <seata.io>"
+
+WORKDIR /$BASE_DIR
+
+# ADD FORM distribution
+ADD bin/ /seata-server/bin
+ADD lib/ /seata-server/lib
+ADD conf/ /seata-server/conf
+ADD LICENSE-BIN /seata-server/LICENSE
+
+# set extra environment
+ENV EXTRA_JVM_ARGUMENTS="-Djava.security.egd=file:/dev/./urandom -server -Xss512k -XX:+UnlockExperimentalVMOptions -XX:+UseContainerSupport XX:SurvivorRatio=10 -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -XX:MaxDirectMemorySize=1024m -XX:-OmitStackTraceInFastThrow -XX:-UseAdaptiveSizePolicy -XX:+HeapDumpOnOutOfMemoryError -XX:+DisableExplicitGC -XX:+CMSParallelRemarkEnabled -XX:+UseCMSInitiatingOccupancyOnly -XX:CMSInitiatingOccupancyFraction=75 -Xloggc:/var/log/seata_gc.log -verbose:gc -Dio.netty.leakDetectionLevel=advanced"
+
+CMD ["sh","/seata-server/bin/seata-server.sh"]
diff --git a/integration/dubbo-alibaba/src/main/java/io/seata/integration/dubbo/alibaba/TransactionPropagationFilter.java b/integration/dubbo-alibaba/src/main/java/io/seata/integration/dubbo/alibaba/TransactionPropagationFilter.java
index ccd1dc41d5ed716864827c4dce0f6283db14c3c2..2111709e1ecc4fd82037e80caf57586149549aed 100644
--- a/integration/dubbo-alibaba/src/main/java/io/seata/integration/dubbo/alibaba/TransactionPropagationFilter.java
+++ b/integration/dubbo-alibaba/src/main/java/io/seata/integration/dubbo/alibaba/TransactionPropagationFilter.java
@@ -24,7 +24,6 @@ import com.alibaba.dubbo.rpc.Result;
import com.alibaba.dubbo.rpc.RpcContext;
import com.alibaba.dubbo.rpc.RpcException;
import io.seata.core.context.RootContext;
-
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,19 +40,24 @@ public class TransactionPropagationFilter implements Filter {
@Override
public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
String xid = RootContext.getXID();
- String rpcXid = RpcContext.getContext().getAttachment(RootContext.KEY_XID);
+ String xidInterceptorType = RootContext.getXIDInterceptorType();
+
+ String rpcXid = getRpcXid();
+ String rpcXidInterceptorType = RpcContext.getContext().getAttachment(RootContext.KEY_XID_INTERCEPTOR_TYPE);
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("xid in RootContext[" + xid + "] xid in RpcContext[" + rpcXid + "]");
+ LOGGER.debug("xid in RootContext[{}] xid in RpcContext[{}]", xid, rpcXid);
}
boolean bind = false;
if (xid != null) {
RpcContext.getContext().setAttachment(RootContext.KEY_XID, xid);
+ RpcContext.getContext().setAttachment(RootContext.KEY_XID_INTERCEPTOR_TYPE, xidInterceptorType);
} else {
if (rpcXid != null) {
RootContext.bind(rpcXid);
+ RootContext.bindInterceptorType(rpcXidInterceptorType);
bind = true;
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("bind[" + rpcXid + "] to RootContext");
+ LOGGER.debug("bind[{}] interceptorType[{}] to RootContext", rpcXid, rpcXidInterceptorType);
}
}
}
@@ -62,18 +66,33 @@ public class TransactionPropagationFilter implements Filter {
} finally {
if (bind) {
+ String unbindInterceptorType = RootContext.unbindInterceptorType();
String unbindXid = RootContext.unbind();
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("unbind[" + unbindXid + "] from RootContext");
+ LOGGER.debug("unbind[{}] interceptorType[{}] from RootContext", unbindXid, unbindInterceptorType);
}
if (!rpcXid.equalsIgnoreCase(unbindXid)) {
- LOGGER.warn("xid in change during RPC from " + rpcXid + " to " + unbindXid);
+ LOGGER.warn("xid in change during RPC from {} to {}, xidInterceptorType from {} to {} ", rpcXid, unbindXid, rpcXidInterceptorType, unbindInterceptorType);
if (unbindXid != null) {
RootContext.bind(unbindXid);
- LOGGER.warn("bind [" + unbindXid + "] back to RootContext");
+ RootContext.bindInterceptorType(unbindInterceptorType);
+ LOGGER.warn("bind [{}] interceptorType[{}] back to RootContext", unbindXid, unbindInterceptorType);
}
}
}
}
}
+
+ /**
+ * get rpc xid
+ * @return
+ */
+ private String getRpcXid() {
+ String rpcXid = RpcContext.getContext().getAttachment(RootContext.KEY_XID);
+ if (rpcXid == null) {
+ rpcXid = RpcContext.getContext().getAttachment(RootContext.KEY_XID.toLowerCase());
+ }
+ return rpcXid;
+ }
+
}
diff --git a/integration/dubbo/src/main/java/io/seata/integration/dubbo/TransactionPropagationFilter.java b/integration/dubbo/src/main/java/io/seata/integration/dubbo/TransactionPropagationFilter.java
index 76de6a5cb958411994697843d8c4ba46a828e5f3..8a40fc625011755888650adcc064e5f9db5e46c9 100644
--- a/integration/dubbo/src/main/java/io/seata/integration/dubbo/TransactionPropagationFilter.java
+++ b/integration/dubbo/src/main/java/io/seata/integration/dubbo/TransactionPropagationFilter.java
@@ -40,39 +40,58 @@ public class TransactionPropagationFilter implements Filter {
@Override
public Result invoke(Invoker<?> invoker, Invocation invocation) throws RpcException {
String xid = RootContext.getXID();
- String rpcXid = RpcContext.getContext().getAttachment(RootContext.KEY_XID);
+ String xidInterceptorType = RootContext.getXIDInterceptorType();
+
+ String rpcXid = getRpcXid();
+ String rpcXidInterceptorType = RpcContext.getContext().getAttachment(RootContext.KEY_XID_INTERCEPTOR_TYPE);
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("xid in RootContext[" + xid + "] xid in RpcContext[" + rpcXid + "]");
+ LOGGER.debug("xid in RootContext[{}] xid in RpcContext[{}]", xid, rpcXid);
}
boolean bind = false;
if (xid != null) {
RpcContext.getContext().setAttachment(RootContext.KEY_XID, xid);
+ RpcContext.getContext().setAttachment(RootContext.KEY_XID_INTERCEPTOR_TYPE, xidInterceptorType);
} else {
if (rpcXid != null) {
RootContext.bind(rpcXid);
+ RootContext.bindInterceptorType(rpcXidInterceptorType);
bind = true;
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("bind[" + rpcXid + "] to RootContext");
+ LOGGER.debug("bind[{}] interceptorType[{}] to RootContext", rpcXid, rpcXidInterceptorType);
}
}
}
try {
return invoker.invoke(invocation);
-
} finally {
if (bind) {
+ String unbindInterceptorType = RootContext.unbindInterceptorType();
String unbindXid = RootContext.unbind();
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("unbind[" + unbindXid + "] from RootContext");
+ LOGGER.debug("unbind[{}] interceptorType[{}] from RootContext", unbindXid, unbindInterceptorType);
}
if (!rpcXid.equalsIgnoreCase(unbindXid)) {
- LOGGER.warn("xid in change during RPC from " + rpcXid + " to " + unbindXid);
+ LOGGER.warn("xid in change during RPC from {} to {}, xidInterceptorType from {} to {} ", rpcXid, unbindXid, rpcXidInterceptorType, unbindInterceptorType);
if (unbindXid != null) {
RootContext.bind(unbindXid);
- LOGGER.warn("bind [" + unbindXid + "] back to RootContext");
+ RootContext.bindInterceptorType(unbindInterceptorType);
+ LOGGER.warn("bind [{}] interceptorType[{}] back to RootContext", unbindXid, unbindInterceptorType);
}
}
}
}
}
+
+ /**
+ * get rpc xid
+ * @return
+ */
+ private String getRpcXid() {
+ String rpcXid = RpcContext.getContext().getAttachment(RootContext.KEY_XID);
+ if (rpcXid == null) {
+ rpcXid = RpcContext.getContext().getAttachment(RootContext.KEY_XID.toLowerCase());
+ }
+ return rpcXid;
+ }
+
}
diff --git a/integration/grpc/pom.xml b/integration/grpc/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..7ea760053ab96ca992744ecb41d93c9e5f19c0a7
--- /dev/null
+++ b/integration/grpc/pom.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 1999-2019 Seata.io Group.
+ ~
+ ~ Licensed 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.
+ -->
+<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>seata-parent</artifactId>
+ <groupId>io.seata</groupId>
+ <version>${revision}</version>
+ <relativePath>../../pom.xml</relativePath>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>seata-grpc</artifactId>
+ <packaging>jar</packaging>
+ <name>seata-grpc ${project.version}</name>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>seata-tm</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-testing</artifactId>
+ <scope>test</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.xolstice.maven.plugins</groupId>
+ <artifactId>protobuf-maven-plugin</artifactId>
+ <configuration>
+ <protocArtifact>com.google.protobuf:protoc:3.3.0:exe:${os.detected.classifier}</protocArtifact>
+ <pluginId>grpc-java</pluginId>
+ <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.8.0:exe:${os.detected.classifier}</pluginArtifact>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-compile</goal>
+ <goal>test-compile-custom</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
diff --git a/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/GrpcHeaderKey.java b/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/GrpcHeaderKey.java
new file mode 100644
index 0000000000000000000000000000000000000000..06670fd78cc2c33951671d783d02fd5c23bac051
--- /dev/null
+++ b/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/GrpcHeaderKey.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.integration.grpc.interceptor;
+
+import io.grpc.Metadata;
+import io.seata.core.context.RootContext;
+
+/**
+ * @author eddyxu1213@126.com
+ */
+public class GrpcHeaderKey {
+
+ public static final Metadata.Key<String> HEADER_KEY = Metadata.Key.of(RootContext.KEY_XID, Metadata.ASCII_STRING_MARSHALLER);
+
+ public static final Metadata.Key<String> HEADER_KEY_LOWERCASE = Metadata.Key.of(RootContext.KEY_XID.toLowerCase(), Metadata.ASCII_STRING_MARSHALLER);
+
+}
diff --git a/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/client/ClientTransactionInterceptor.java b/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/client/ClientTransactionInterceptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..be9cbd33969c7afe45daee786ffa32643a15a4e4
--- /dev/null
+++ b/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/client/ClientTransactionInterceptor.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.integration.grpc.interceptor.client;
+
+import io.grpc.CallOptions;
+import io.grpc.Channel;
+import io.grpc.ClientCall;
+import io.grpc.ClientInterceptor;
+import io.grpc.ForwardingClientCall;
+import io.grpc.ForwardingClientCallListener;
+import io.grpc.Metadata;
+import io.grpc.MethodDescriptor;
+import io.seata.common.util.StringUtils;
+import io.seata.core.context.RootContext;
+import io.seata.integration.grpc.interceptor.GrpcHeaderKey;
+
+/**
+ * @author eddyxu1213@126.com
+ */
+public class ClientTransactionInterceptor implements ClientInterceptor {
+
+ @Override
+ public <ReqT, RespT> ClientCall<ReqT, RespT> interceptCall(
+ MethodDescriptor<ReqT, RespT> method,
+ CallOptions callOptions,
+ Channel next) {
+
+ String xid = RootContext.getXID();
+ return new ForwardingClientCall.SimpleForwardingClientCall<ReqT, RespT>(next.newCall(method, callOptions)) {
+
+ @Override
+ public void start(Listener<RespT> responseListener, Metadata headers) {
+ if (StringUtils.isNotBlank(xid)) {
+ headers.put(GrpcHeaderKey.HEADER_KEY, xid);
+ }
+ super.start(new ForwardingClientCallListener.SimpleForwardingClientCallListener<RespT>(responseListener) {
+ @Override
+ public void onHeaders(Metadata headers) {
+ super.onHeaders(headers);
+ }
+ }, headers);
+ }
+ };
+ }
+}
diff --git a/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/server/ServerListenerProxy.java b/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/server/ServerListenerProxy.java
new file mode 100644
index 0000000000000000000000000000000000000000..03d838487f6a8803334b5d17fded3ced402155d0
--- /dev/null
+++ b/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/server/ServerListenerProxy.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.integration.grpc.interceptor.server;
+
+import io.grpc.ServerCall;
+import io.seata.common.util.StringUtils;
+import io.seata.core.context.RootContext;
+
+import java.util.Objects;
+
+/**
+ * @author eddyxu1213@126.com
+ */
+public class ServerListenerProxy<ReqT> extends ServerCall.Listener<ReqT> {
+
+ private ServerCall.Listener<ReqT> target;
+ private String xid;
+
+ public ServerListenerProxy(String xid, ServerCall.Listener<ReqT> target) {
+ super();
+ Objects.requireNonNull(target);
+ this.target = target;
+ this.xid = xid;
+ }
+
+ @Override
+ public void onMessage(ReqT message) {
+ target.onMessage(message);
+ }
+
+ @Override
+ public void onHalfClose() {
+ if (StringUtils.isNotBlank(xid)) {
+ RootContext.bind(xid);
+ }
+ target.onHalfClose();
+ }
+
+ @Override
+ public void onCancel() {
+ if (StringUtils.isNotBlank(xid) && RootContext.inGlobalTransaction()) {
+ RootContext.unbind();
+ }
+ target.onCancel();
+ }
+
+ @Override
+ public void onComplete() {
+ if (StringUtils.isNotBlank(xid) && RootContext.inGlobalTransaction()) {
+ RootContext.unbind();
+ }
+ target.onComplete();
+ }
+
+ @Override
+ public void onReady() {
+ target.onReady();
+ }
+}
diff --git a/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/server/ServerTransactionInterceptor.java b/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/server/ServerTransactionInterceptor.java
new file mode 100644
index 0000000000000000000000000000000000000000..3c7865828135159d8b08e07dd3c46a68846ebd3b
--- /dev/null
+++ b/integration/grpc/src/main/java/io/seata/integration/grpc/interceptor/server/ServerTransactionInterceptor.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.integration.grpc.interceptor.server;
+
+import io.grpc.Metadata;
+import io.grpc.ServerCall;
+import io.grpc.ServerCallHandler;
+import io.grpc.ServerInterceptor;
+import io.seata.integration.grpc.interceptor.GrpcHeaderKey;
+
+/**
+ * @author eddyxu1213@126.com
+ */
+public class ServerTransactionInterceptor implements ServerInterceptor {
+
+ @Override
+ public <ReqT, RespT> ServerCall.Listener<ReqT> interceptCall(
+ ServerCall<ReqT, RespT> serverCall,
+ Metadata metadata,
+ ServerCallHandler<ReqT, RespT> serverCallHandler) {
+ String xid = getRpcXid(metadata);
+ return new ServerListenerProxy<>(xid, serverCallHandler.startCall(serverCall, metadata));
+ }
+
+ /**
+ * get rpc xid
+ * @param metadata
+ * @return
+ */
+ private String getRpcXid(Metadata metadata) {
+ String rpcXid = metadata.get(GrpcHeaderKey.HEADER_KEY);
+ if (rpcXid == null) {
+ rpcXid = metadata.get(GrpcHeaderKey.HEADER_KEY_LOWERCASE);
+ }
+ return rpcXid;
+ }
+
+}
diff --git a/integration/grpc/src/test/java/io/seata/integration/grpc/interceptor/GrpcTest.java b/integration/grpc/src/test/java/io/seata/integration/grpc/interceptor/GrpcTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4a3fb7f8f82301086c0bb3d5b71cf66e061dff5c
--- /dev/null
+++ b/integration/grpc/src/test/java/io/seata/integration/grpc/interceptor/GrpcTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.integration.grpc.interceptor;
+
+import com.google.common.util.concurrent.ListenableFuture;
+import io.grpc.ClientInterceptors;
+import io.grpc.ManagedChannel;
+import io.grpc.Metadata;
+import io.grpc.ServerInterceptor;
+import io.grpc.ServerInterceptors;
+import io.grpc.inprocess.InProcessChannelBuilder;
+import io.grpc.inprocess.InProcessServerBuilder;
+import io.grpc.stub.StreamObserver;
+import io.grpc.testing.GrpcCleanupRule;
+import io.seata.core.context.RootContext;
+import io.seata.integration.grpc.interceptor.client.ClientTransactionInterceptor;
+import io.seata.integration.grpc.interceptor.proto.ContextRpcGrpc;
+import io.seata.integration.grpc.interceptor.proto.Request;
+import io.seata.integration.grpc.interceptor.proto.Response;
+import io.seata.integration.grpc.interceptor.server.ServerTransactionInterceptor;
+import org.junit.Rule;
+import org.junit.Test;
+import org.mockito.ArgumentCaptor;
+import org.mockito.ArgumentMatchers;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadFactory;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.AdditionalAnswers.delegatesTo;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+
+/**
+ * @author eddyxu1213@126.com
+ */
+public class GrpcTest {
+
+ @Rule
+ public final GrpcCleanupRule grpcCleanup = new GrpcCleanupRule();
+ private final ServerInterceptor mockServerInterceptor = mock(ServerInterceptor.class, delegatesTo(new ServerTransactionInterceptor()));
+
+
+ @Test
+ public void clientHeaderDeliveredToServer() throws Exception {
+
+ String serverName = InProcessServerBuilder.generateName();
+ CountDownLatch countDownLatch = new CountDownLatch(1);
+ String[] context = {null};
+
+ //executor
+ Executor executorService = new ThreadPoolExecutor(2, 2, 1, TimeUnit.HOURS, new LinkedBlockingQueue<>(), new ThreadFactory() {
+ @Override
+ public Thread newThread(Runnable r) {
+ return new Thread(r, "contextText-" + System.currentTimeMillis());
+ }
+ });
+
+ //server
+ grpcCleanup.register(InProcessServerBuilder.forName(serverName).executor(executorService)
+ .addService(ServerInterceptors.intercept(new ContextRpcGrpc.ContextRpcImplBase() {
+ @Override
+ public void contextRpc(Request request, StreamObserver<Response> responseObserver) {
+ context[0] = RootContext.getXID();
+ countDownLatch.countDown();
+ responseObserver.onNext(Response.newBuilder().setGreet("hello! " + request.getName()).build());
+ responseObserver.onCompleted();
+ }
+ }, mockServerInterceptor))
+ .build().start());
+
+ //client
+ ManagedChannel channel = grpcCleanup.register(InProcessChannelBuilder.forName(serverName).executor(executorService).build());
+ ContextRpcGrpc.ContextRpcFutureStub stub = ContextRpcGrpc.newFutureStub(
+ ClientInterceptors.intercept(channel, new ClientTransactionInterceptor()));
+ RootContext.bind("test_context");
+ ListenableFuture<Response> future = stub.contextRpc(Request.newBuilder().setName("seata").build());
+ assertEquals("hello! seata", future.get().getGreet());
+
+ ArgumentCaptor<Metadata> metadataCaptor = ArgumentCaptor.forClass(Metadata.class);
+ verify(mockServerInterceptor).interceptCall(ArgumentMatchers.any(), metadataCaptor.capture(), ArgumentMatchers.any());
+ assertEquals("test_context", metadataCaptor.getValue().get(GrpcHeaderKey.HEADER_KEY));
+
+ countDownLatch.await();
+ assertEquals("test_context", context[0]);
+ }
+}
diff --git a/integration/grpc/src/test/proto/contextTest.proto b/integration/grpc/src/test/proto/contextTest.proto
new file mode 100644
index 0000000000000000000000000000000000000000..8e2f0d88b5acb891a2fd2c37e7535be4c982f145
--- /dev/null
+++ b/integration/grpc/src/test/proto/contextTest.proto
@@ -0,0 +1,34 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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.
+ */
+syntax = "proto3";
+
+option java_multiple_files = true;
+option java_package = "io.seata.integration.grpc.interceptor.proto";
+option java_outer_classname = "ContextRpcTest";
+
+service ContextRpc {
+ rpc ContextRpc (Request) returns (Response) {
+ }
+}
+
+message Request {
+ string name = 1;
+
+}
+
+message Response {
+ string greet = 1;
+}
diff --git a/integration/motan/src/main/java/io/seata/integration/motan/MotanTransactionFilter.java b/integration/motan/src/main/java/io/seata/integration/motan/MotanTransactionFilter.java
index 29eb01957f350179ac8ef02efb6b4462658a55b0..4b0d34d3956f6b668e9bcaa65faedf5f4a3e7853 100644
--- a/integration/motan/src/main/java/io/seata/integration/motan/MotanTransactionFilter.java
+++ b/integration/motan/src/main/java/io/seata/integration/motan/MotanTransactionFilter.java
@@ -28,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * @author jimin.jm@alibaba-inc.com
+ * @author slievrly
*/
@Spi(scope = Scope.SINGLETON)
@Activation(key = {MotanConstants.NODE_TYPE_SERVICE, MotanConstants.NODE_TYPE_REFERER}, sequence = 100)
@@ -39,7 +39,7 @@ public class MotanTransactionFilter implements Filter {
@Override
public Response filter(final Caller<?> caller, final Request request) {
String currentXid = RootContext.getXID();
- String requestXid = request.getAttachments().get(RootContext.KEY_XID);
+ String requestXid = getRpcXid(request);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("xid in RootContext [" + currentXid + "] xid in Request [" + requestXid + "]");
}
@@ -72,4 +72,18 @@ public class MotanTransactionFilter implements Filter {
}
}
}
+
+ /**
+ * get rpc xid
+ * @param request
+ * @return
+ */
+ private String getRpcXid(Request request) {
+ String rpcXid = request.getAttachments().get(RootContext.KEY_XID);
+ if (rpcXid == null) {
+ rpcXid = request.getAttachments().get(RootContext.KEY_XID.toLowerCase());
+ }
+ return rpcXid;
+ }
+
}
diff --git a/integration/motan/src/test/java/io/seata/integration/motan/MotanTransactionFilterTest.java b/integration/motan/src/test/java/io/seata/integration/motan/MotanTransactionFilterTest.java
index 72ea2843b1282e47f4ead5c34a024781057dd0b5..ef0544223e1d2172244ceb9f1c7dc3783b8de41f 100644
--- a/integration/motan/src/test/java/io/seata/integration/motan/MotanTransactionFilterTest.java
+++ b/integration/motan/src/test/java/io/seata/integration/motan/MotanTransactionFilterTest.java
@@ -24,8 +24,7 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
/**
- * @author jimin.jm@alibaba-inc.com
- * @date 2019/05/27
+ * @author slievrly
*/
class MotanTransactionFilterTest {
@@ -79,4 +78,4 @@ class MotanTransactionFilterTest {
XIDService service = refererConfig.getRef();
Assertions.assertEquals(service.getXid(), XID);
}
-}
\ No newline at end of file
+}
diff --git a/integration/motan/src/test/java/io/seata/integration/motan/XIDService.java b/integration/motan/src/test/java/io/seata/integration/motan/XIDService.java
index f4e6c92a20c7d18b6535cf50879baaf711b8d179..7afea1257d8ec82186778b398156069e867c14ba 100644
--- a/integration/motan/src/test/java/io/seata/integration/motan/XIDService.java
+++ b/integration/motan/src/test/java/io/seata/integration/motan/XIDService.java
@@ -16,8 +16,7 @@
package io.seata.integration.motan;
/**
- * @author jimin.jm@alibaba-inc.com
- * @date 2019/05/27
+ * @author slievrly
*/
public interface XIDService {
String getXid();
diff --git a/integration/motan/src/test/java/io/seata/integration/motan/XIDServiceImpl.java b/integration/motan/src/test/java/io/seata/integration/motan/XIDServiceImpl.java
index f7ae1709cf34497ff5835cc6977890a5008eac26..0758af2658e9c21585e79b58c727181c67b5072c 100644
--- a/integration/motan/src/test/java/io/seata/integration/motan/XIDServiceImpl.java
+++ b/integration/motan/src/test/java/io/seata/integration/motan/XIDServiceImpl.java
@@ -18,8 +18,7 @@ package io.seata.integration.motan;
import io.seata.core.context.RootContext;
/**
- * @author jimin.jm@alibaba-inc.com
- * @date 2019/05/27
+ * @author slievrly
*/
public class XIDServiceImpl implements XIDService {
diff --git a/integration/sofa-rpc/src/main/java/io/seata/integration/sofa/rpc/TransactionContextConsumerFilter.java b/integration/sofa-rpc/src/main/java/io/seata/integration/sofa/rpc/TransactionContextConsumerFilter.java
index 678dfecddc99e1eeca8af8c612e4d97263796623..14631243bd157bd1e303c3c550051946323aa01d 100644
--- a/integration/sofa-rpc/src/main/java/io/seata/integration/sofa/rpc/TransactionContextConsumerFilter.java
+++ b/integration/sofa-rpc/src/main/java/io/seata/integration/sofa/rpc/TransactionContextConsumerFilter.java
@@ -45,7 +45,7 @@ public class TransactionContextConsumerFilter extends Filter {
@Override
public SofaResponse invoke(FilterInvoker filterInvoker, SofaRequest sofaRequest) throws SofaRpcException {
String xid = RootContext.getXID();
- String rpcXid = (String) RpcInternalContext.getContext().getAttachment(RootContext.KEY_XID);
+ String rpcXid = getRpcXid();
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("xid in RootContext[" + xid + "] xid in RpcContext[" + rpcXid + "]");
}
@@ -83,4 +83,17 @@ public class TransactionContextConsumerFilter extends Filter {
}
}
}
+
+ /**
+ * get rpc xid
+ * @return
+ */
+ private String getRpcXid() {
+ String rpcXid = (String) RpcInternalContext.getContext().getAttachment(RootContext.KEY_XID);
+ if (rpcXid == null) {
+ rpcXid = (String) RpcInternalContext.getContext().getAttachment(RootContext.KEY_XID.toLowerCase());
+ }
+ return rpcXid;
+ }
+
}
diff --git a/integration/sofa-rpc/src/main/java/io/seata/integration/sofa/rpc/TransactionContextProviderFilter.java b/integration/sofa-rpc/src/main/java/io/seata/integration/sofa/rpc/TransactionContextProviderFilter.java
index 02a9b36bc2e4af9ca1946b3209e0acbaf8b41702..15bbed97c9c633b05fa39fe9b182df3fdb2afa63 100644
--- a/integration/sofa-rpc/src/main/java/io/seata/integration/sofa/rpc/TransactionContextProviderFilter.java
+++ b/integration/sofa-rpc/src/main/java/io/seata/integration/sofa/rpc/TransactionContextProviderFilter.java
@@ -45,7 +45,7 @@ public class TransactionContextProviderFilter extends Filter {
@Override
public SofaResponse invoke(FilterInvoker filterInvoker, SofaRequest sofaRequest) throws SofaRpcException {
String xid = RootContext.getXID();
- String rpcXid = (String) sofaRequest.getRequestProp(RootContext.KEY_XID);
+ String rpcXid = getRpcXid(sofaRequest);
if (LOGGER.isDebugEnabled()) {
LOGGER.debug("xid in RootContext[" + xid + "] xid in RpcContext[" + rpcXid + "]");
}
@@ -83,4 +83,17 @@ public class TransactionContextProviderFilter extends Filter {
}
}
}
+
+ /**
+ * get rpc xid
+ * @return
+ */
+ private String getRpcXid(SofaRequest sofaRequest) {
+ String rpcXid = (String) sofaRequest.getRequestProp(RootContext.KEY_XID);
+ if (rpcXid == null) {
+ rpcXid = (String) sofaRequest.getRequestProp(RootContext.KEY_XID.toLowerCase());
+ }
+ return rpcXid;
+ }
+
}
diff --git a/metrics/seata-metrics-core/src/main/java/io/seata/metrics/exporter/ExporterFactory.java b/metrics/seata-metrics-core/src/main/java/io/seata/metrics/exporter/ExporterFactory.java
index 57ebaefe43308776d0c70041c7b192cf2211d3b6..e2eea293f7a83109eb283166bd3ed27e7cd3a518 100644
--- a/metrics/seata-metrics-core/src/main/java/io/seata/metrics/exporter/ExporterFactory.java
+++ b/metrics/seata-metrics-core/src/main/java/io/seata/metrics/exporter/ExporterFactory.java
@@ -47,7 +47,7 @@ public class ExporterFactory {
exporters.add(
EnhancedServiceLoader.load(Exporter.class, Objects.requireNonNull(exporterType).name()));
} catch (Exception exx) {
- LOGGER.error("not support metrics exporter type: " + exporterTypeName, exx);
+ LOGGER.error("not support metrics exporter type: {}",exporterTypeName, exx);
}
}
}
diff --git a/pom.xml b/pom.xml
index fbc188d32cb6d42e310f48ff8b90d2d40ae5e714..50dbd75311dd4db86df355ac05e63dde4ecc6eff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
<module>integration/dubbo-alibaba</module>
<module>integration/sofa-rpc</module>
<module>integration/motan</module>
+ <module>integration/grpc</module>
<module>rm</module>
<module>rm-datasource</module>
<module>server</module>
@@ -43,6 +44,8 @@
<module>tm</module>
<module>metrics</module>
<module>codec</module>
+ <module>seata-spring-boot-starter</module>
+ <module>compressor</module>
<module>saga</module>
</modules>
<packaging>pom</packaging>
@@ -86,7 +89,7 @@
<properties>
<!-- seata version -->
- <revision>0.9.0</revision>
+ <revision>1.0.0</revision>
<!-- Compiler settings properties -->
<maven.compiler.source>1.8</maven.compiler.source>
@@ -113,6 +116,9 @@
<assertj-core.version>3.12.2</assertj-core.version>
<junit-platform-launcher.version>1.4.2</junit-platform-launcher.version>
+ <!-- for docker image-->
+ <image.publish.skip>true</image.publish.skip>
+ <image.tags>latest</image.tags>
</properties>
<!--test-->
@@ -232,7 +238,10 @@
<url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
</repository>
</distributionManagement>
-
+ <properties>
+ <image.publish.skip>false</image.publish.skip>
+ <image.tags>${project.version},latest</image.tags>
+ </properties>
</profile>
<profile>
<id>licenseCheck</id>
@@ -269,6 +278,13 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>image</id>
+ <properties>
+ <image.publish.skip>false</image.publish.skip>
+ <image.tags>latest</image.tags>
+ </properties>
+ </profile>
</profiles>
<build>
@@ -451,9 +467,10 @@
<configLocation>${user.dir}/style/seata_checkstyle.xml</configLocation>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
- <failsOnError>false</failsOnError>
+ <failsOnError>true</failsOnError>
<failOnViolation>false</failOnViolation>
- <excludes>**/generated/**</excludes>
+ <excludes>**/generated/**/*</excludes>
+ <excludes>io/seata/integration/grpc/interceptor/</excludes>
</configuration>
<goals>
<goal>check</goal>
diff --git a/rm-datasource/src/main/java/io/seata/rm/GlobalLockTemplate.java b/rm-datasource/src/main/java/io/seata/rm/GlobalLockTemplate.java
index 658c5b415aef878b9bec7b3377300574eb256f4b..2ecaf5aa2f99ef59ae2b8c11f46c7f3551ea3690 100644
--- a/rm-datasource/src/main/java/io/seata/rm/GlobalLockTemplate.java
+++ b/rm-datasource/src/main/java/io/seata/rm/GlobalLockTemplate.java
@@ -24,7 +24,6 @@ import io.seata.core.context.RootContext;
*
* @param <T>
* @author deyou
- * @date 2019.03.07
*/
public class GlobalLockTemplate<T> {
diff --git a/rm-datasource/src/main/java/io/seata/rm/RMHandlerAT.java b/rm-datasource/src/main/java/io/seata/rm/RMHandlerAT.java
index 55c742ef2d2b721d7565dc4f2aaedee5886245d6..5b7b1f9f7fcaa73b2d7573bf24c52e37cfa9dafe 100644
--- a/rm-datasource/src/main/java/io/seata/rm/RMHandlerAT.java
+++ b/rm-datasource/src/main/java/io/seata/rm/RMHandlerAT.java
@@ -68,7 +68,7 @@ public class RMHandlerAT extends AbstractRMHandler {
}
} while (deleteRows == LIMIT_ROWS);
} catch (Exception e) {
- LOGGER.error("Failed to delete expired undo_log，error:{}", e.getMessage(), e);
+ LOGGER.error("Failed to delete expired undo_log, error:{}", e.getMessage(), e);
} finally {
if (conn != null) {
try {
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/AbstractConnectionProxy.java b/rm-datasource/src/main/java/io/seata/rm/datasource/AbstractConnectionProxy.java
index ea6f9cddf6194d7da676ba1cdccc8d105ba2a232..7d88ae748577e5493a26fe93054005e9bae24fa1 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/AbstractConnectionProxy.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/AbstractConnectionProxy.java
@@ -106,13 +106,17 @@ public abstract class AbstractConnectionProxy implements Connection {
public PreparedStatement prepareStatement(String sql) throws SQLException {
String dbType = getDbType();
// support oracle 10.2+
- PreparedStatement targetPreparedStatement;
- SQLRecognizer sqlRecognizer = SQLVisitorFactory.get(sql, dbType);
- if (sqlRecognizer != null && sqlRecognizer.getSQLType() == SQLType.INSERT) {
- final String tableName = sqlRecognizer.getTableName();
- TableMeta tableMeta = TableMetaCacheFactory.getTableMetaCache(getDataSourceProxy()).getTableMeta(getDataSourceProxy(), tableName);
- targetPreparedStatement = getTargetConnection().prepareStatement(sql, new String[]{ tableMeta.getPkName() });
- } else {
+ PreparedStatement targetPreparedStatement = null;
+ if (RootContext.inGlobalTransaction()) {
+ SQLRecognizer sqlRecognizer = SQLVisitorFactory.get(sql, dbType);
+ if (sqlRecognizer != null && sqlRecognizer.getSQLType() == SQLType.INSERT) {
+ String tableName = ColumnUtils.delEscape(sqlRecognizer.getTableName(), dbType);
+ TableMeta tableMeta = TableMetaCacheFactory.getTableMetaCache(getDataSourceProxy()).getTableMeta(getTargetConnection(),
+ tableName,getDataSourceProxy().getResourceId());
+ targetPreparedStatement = getTargetConnection().prepareStatement(sql, new String[]{tableMeta.getPkName()});
+ }
+ }
+ if (targetPreparedStatement == null) {
targetPreparedStatement = getTargetConnection().prepareStatement(sql);
}
return new PreparedStatementProxy(this, targetPreparedStatement, sql);
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/AsyncWorker.java b/rm-datasource/src/main/java/io/seata/rm/datasource/AsyncWorker.java
index ebe9713460b7d621f33d08f203d24d0885088376..b6c83eb83bc119ddafced71eabe666ba4a78ae26 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/AsyncWorker.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/AsyncWorker.java
@@ -69,7 +69,8 @@ public class AsyncWorker implements ResourceManagerInbound {
* @param resourceId the resource id
* @param applicationData the application data
*/
- public Phase2Context(BranchType branchType, String xid, long branchId, String resourceId, String applicationData) {
+ public Phase2Context(BranchType branchType, String xid, long branchId, String resourceId,
+ String applicationData) {
this.xid = xid;
this.branchId = branchId;
this.resourceId = resourceId;
@@ -101,17 +102,19 @@ public class AsyncWorker implements ResourceManagerInbound {
}
private static int ASYNC_COMMIT_BUFFER_LIMIT = ConfigurationFactory.getInstance().getInt(
- CLIENT_ASYNC_COMMIT_BUFFER_LIMIT, 10000);
-
- private static final BlockingQueue<Phase2Context> ASYNC_COMMIT_BUFFER = new LinkedBlockingQueue<>(ASYNC_COMMIT_BUFFER_LIMIT);
+ CLIENT_ASYNC_COMMIT_BUFFER_LIMIT, 10000);
+ private static final BlockingQueue<Phase2Context> ASYNC_COMMIT_BUFFER = new LinkedBlockingQueue<>(
+ ASYNC_COMMIT_BUFFER_LIMIT);
private static ScheduledExecutorService timerExecutor;
@Override
- public BranchStatus branchCommit(BranchType branchType, String xid, long branchId, String resourceId, String applicationData) throws TransactionException {
+ public BranchStatus branchCommit(BranchType branchType, String xid, long branchId, String resourceId,
+ String applicationData) throws TransactionException {
if (!ASYNC_COMMIT_BUFFER.offer(new Phase2Context(branchType, xid, branchId, resourceId, applicationData))) {
- LOGGER.warn("Async commit buffer is FULL. Rejected branch [" + branchId + "/" + xid + "] will be handled by housekeeping later.");
+ LOGGER.warn("Async commit buffer is FULL. Rejected branch [" + branchId + "/" + xid
+ + "] will be handled by housekeeping later.");
}
return BranchStatus.PhaseTwo_Committed;
}
@@ -121,8 +124,7 @@ public class AsyncWorker implements ResourceManagerInbound {
*/
public synchronized void init() {
LOGGER.info("Async Commit Buffer Limit: " + ASYNC_COMMIT_BUFFER_LIMIT);
- timerExecutor = new ScheduledThreadPoolExecutor(1,
- new NamedThreadFactory("AsyncWorker", 1, true));
+ timerExecutor = new ScheduledThreadPoolExecutor(1, new NamedThreadFactory("AsyncWorker", 1, true));
timerExecutor.scheduleAtFixedRate(new Runnable() {
@Override
public void run() {
@@ -160,7 +162,8 @@ public class AsyncWorker implements ResourceManagerInbound {
DataSourceProxy dataSourceProxy;
try {
try {
- DataSourceManager resourceManager = (DataSourceManager) DefaultResourceManager.get().getResourceManager(BranchType.AT);
+ DataSourceManager resourceManager = (DataSourceManager)DefaultResourceManager.get()
+ .getResourceManager(BranchType.AT);
dataSourceProxy = resourceManager.get(entry.getKey());
if (dataSourceProxy == null) {
throw new ShouldNeverHappenException("Failed to find resource on " + entry.getKey());
@@ -177,9 +180,10 @@ public class AsyncWorker implements ResourceManagerInbound {
xids.add(commitContext.xid);
branchIds.add(commitContext.branchId);
int maxSize = xids.size() > branchIds.size() ? xids.size() : branchIds.size();
- if(maxSize == UNDOLOG_DELETE_LIMIT_SIZE){
+ if (maxSize == UNDOLOG_DELETE_LIMIT_SIZE) {
try {
- UndoLogManagerFactory.getUndoLogManager(dataSourceProxy.getDbType()).batchDeleteUndoLog(xids, branchIds, conn);
+ UndoLogManagerFactory.getUndoLogManager(dataSourceProxy.getDbType()).batchDeleteUndoLog(
+ xids, branchIds, conn);
} catch (Exception ex) {
LOGGER.warn("Failed to batch delete undo log [" + branchIds + "/" + xids + "]", ex);
}
@@ -193,8 +197,9 @@ public class AsyncWorker implements ResourceManagerInbound {
}
try {
- UndoLogManagerFactory.getUndoLogManager(dataSourceProxy.getDbType()).batchDeleteUndoLog(xids, branchIds, conn);
- }catch (Exception ex) {
+ UndoLogManagerFactory.getUndoLogManager(dataSourceProxy.getDbType()).batchDeleteUndoLog(xids,
+ branchIds, conn);
+ } catch (Exception ex) {
LOGGER.warn("Failed to batch delete undo log [" + branchIds + "/" + xids + "]", ex);
}
@@ -211,7 +216,8 @@ public class AsyncWorker implements ResourceManagerInbound {
}
@Override
- public BranchStatus branchRollback(BranchType branchType, String xid, long branchId, String resourceId, String applicationData) throws TransactionException {
+ public BranchStatus branchRollback(BranchType branchType, String xid, long branchId, String resourceId,
+ String applicationData) throws TransactionException {
throw new NotSupportYetException();
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/ColumnUtils.java b/rm-datasource/src/main/java/io/seata/rm/datasource/ColumnUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..991e2d60661c236b9cf70863f60dc04fa128e533
--- /dev/null
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/ColumnUtils.java
@@ -0,0 +1,166 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource;
+
+import com.alibaba.druid.util.JdbcConstants;
+import io.seata.common.util.CollectionUtils;
+import io.seata.common.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * column utils
+ * @author jsbxyyx
+ */
+public final class ColumnUtils {
+
+ /**
+ * The escape
+ */
+ public enum Escape {
+ /** standard escape */
+ STANDARD('"'),
+ /** mysql series escape */
+ MYSQL('`')
+ ;
+ public final char value;
+ Escape(char value) {
+ this.value = value;
+ }
+ }
+
+ /**
+ * del escape by db type
+ * @param cols the cols
+ * @param dbType the db type
+ * @return
+ */
+ public static List<String> delEscape(List<String> cols, String dbType) {
+ // sql standard
+ // https://db.apache.org/derby/docs/10.1/ref/crefsqlj1003454.html
+ // https://docs.oracle.com/javadb/10.8.3.0/ref/crefsqlj1003454.html
+ // https://www.informit.com/articles/article.aspx?p=2036581&seqNum=2
+ List<String> newCols = delEscape(cols, Escape.STANDARD);
+ if (isMysqlSeries(dbType)) {
+ newCols = delEscape(newCols, Escape.MYSQL);
+ }
+ return newCols;
+ }
+
+ /**
+ * del escape
+ * @param cols the cols
+ * @param escape the escape
+ * @return delete the column list element left and right escape.
+ */
+ public static List<String> delEscape(List<String> cols, Escape escape) {
+ if (CollectionUtils.isEmpty(cols)) {
+ return cols;
+ }
+ List<String> newCols = new ArrayList<>(cols.size());
+ for (int i = 0, len = cols.size(); i < len; i++) {
+ String col = cols.get(i);
+ col = delEscape(col, escape);
+ newCols.add(col);
+ }
+ return newCols;
+ }
+
+ /**
+ * del escape by db type
+ * @param colName the column name
+ * @param dbType the db type
+ * @return
+ */
+ public static String delEscape(String colName, String dbType) {
+ String newColName = delEscape(colName, Escape.STANDARD);
+ if (isMysqlSeries(dbType)) {
+ newColName = delEscape(newColName, Escape.MYSQL);
+ }
+ return newColName;
+ }
+
+ /**
+ * del escape by escape
+ * @param colName the column name
+ * @param escape the escape
+ * @return
+ */
+ public static String delEscape(String colName, Escape escape) {
+ if (colName == null || colName.isEmpty()) {
+ return colName;
+ }
+ if (colName.charAt(0) == escape.value && colName.charAt(colName.length() - 1) == escape.value) {
+ return colName.substring(1, colName.length() - 1);
+ }
+ return colName;
+ }
+
+ /**
+ * add escape by db type
+ * @param cols the column name list
+ * @param dbType the db type
+ * @return
+ */
+ public static List<String> addEscape(List<String> cols, String dbType) {
+ if (CollectionUtils.isEmpty(cols)) {
+ return cols;
+ }
+ List<String> newCols = new ArrayList<>(cols.size());
+ for (int i = 0, len = cols.size(); i < len; i++) {
+ String col = cols.get(i);
+ col = addEscape(col, dbType);
+ newCols.add(col);
+ }
+ return newCols;
+ }
+
+ /**
+ * add escape by db type
+ * @param colName the column name
+ * @param dbType the db type
+ * @return the colName left and right add escape
+ */
+ public static String addEscape(String colName, String dbType) {
+ if (isMysqlSeries(dbType)) {
+ return addEscape(colName, ColumnUtils.Escape.MYSQL);
+ }
+ return addEscape(colName, ColumnUtils.Escape.STANDARD);
+ }
+
+ /**
+ * add escape
+ * @param colName the column name
+ * @param escape the escape
+ * @return
+ */
+ public static String addEscape(String colName, Escape escape) {
+ if (colName == null || colName.isEmpty()) {
+ return colName;
+ }
+ if (colName.charAt(0) == escape.value && colName.charAt(colName.length() - 1) == escape.value) {
+ return colName;
+ }
+ return String.format("%s%s%s", escape.value, colName, escape.value);
+ }
+
+ private static boolean isMysqlSeries(String dbType) {
+ return StringUtils.equalsIgnoreCase(dbType, JdbcConstants.MYSQL) ||
+ StringUtils.equalsIgnoreCase(dbType, JdbcConstants.H2) ||
+ StringUtils.equalsIgnoreCase(dbType, JdbcConstants.MARIADB);
+ }
+}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/ConnectionContext.java b/rm-datasource/src/main/java/io/seata/rm/datasource/ConnectionContext.java
index bc454d35bb0effbd702aee91aea195f8065ff935..54cc4e520faadf3c47a368ad58f1b822e4adf9dc 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/ConnectionContext.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/ConnectionContext.java
@@ -33,7 +33,10 @@ public class ConnectionContext {
private String xid;
private Long branchId;
private boolean isGlobalLockRequire;
- //table and primary key should not be duplicated
+
+ /**
+ * Table and primary key should not be duplicated.
+ */
private Set<String> lockKeysBuffer = new HashSet<>();
private List<SQLUndoLog> sqlUndoItemsBuffer = new ArrayList<>();
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/ConnectionProxy.java b/rm-datasource/src/main/java/io/seata/rm/datasource/ConnectionProxy.java
index 46125ac81b58dabad8e3287d0d4b0a955cb33e4c..2cdc7a8de55cfd7d286b3b1435c5c07ce19ca4bd 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/ConnectionProxy.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/ConnectionProxy.java
@@ -50,6 +50,9 @@ public class ConnectionProxy extends AbstractConnectionProxy {
private static final int REPORT_RETRY_COUNT = ConfigurationFactory.getInstance().getInt(
ConfigurationKeys.CLIENT_REPORT_RETRY_COUNT, DEFAULT_REPORT_RETRY_COUNT);
+ public static final boolean IS_REPORT_SUCCESS_ENABLE = ConfigurationFactory.getInstance().getBoolean(
+ ConfigurationKeys.CLIENT_REPORT_SUCCESS_ENABLE, true);
+
private final static LockRetryPolicy LOCK_RETRY_POLICY = new LockRetryPolicy();
/**
@@ -220,7 +223,9 @@ public class ConnectionProxy extends AbstractConnectionProxy {
report(false);
throw new SQLException(ex);
}
- report(true);
+ if (IS_REPORT_SUCCESS_ENABLE) {
+ report(true);
+ }
context.reset();
}
@@ -243,7 +248,7 @@ public class ConnectionProxy extends AbstractConnectionProxy {
@Override
public void setAutoCommit(boolean autoCommit) throws SQLException {
- if ((autoCommit) && !getAutoCommit()) {
+ if (autoCommit && !getAutoCommit()) {
// change autocommit from false to true, we should commit() first according to JDBC spec.
doCommit();
}
@@ -255,7 +260,7 @@ public class ConnectionProxy extends AbstractConnectionProxy {
while (retry > 0) {
try {
DefaultResourceManager.get().branchReport(BranchType.AT, context.getXid(), context.getBranchId(),
- (commitDone ? BranchStatus.PhaseOne_Done : BranchStatus.PhaseOne_Failed), null);
+ commitDone ? BranchStatus.PhaseOne_Done : BranchStatus.PhaseOne_Failed, null);
return;
} catch (Throwable ex) {
LOGGER.error("Failed to report [" + context.getBranchId() + "/" + context.getXid() + "] commit done ["
@@ -270,8 +275,8 @@ public class ConnectionProxy extends AbstractConnectionProxy {
}
public static class LockRetryPolicy {
- protected final static boolean LOCK_RETRY_POLICY_BRANCH_ROLLBACK_ON_CONFLICT =
- ConfigurationFactory.getInstance().getBoolean(ConfigurationKeys.CLIENT_LOCK_RETRY_POLICY_BRANCH_ROLLBACK_ON_CONFLICT, true);
+ protected final static boolean LOCK_RETRY_POLICY_BRANCH_ROLLBACK_ON_CONFLICT = ConfigurationFactory
+ .getInstance().getBoolean(ConfigurationKeys.CLIENT_LOCK_RETRY_POLICY_BRANCH_ROLLBACK_ON_CONFLICT, true);
public <T> T execute(Callable<T> callable) throws Exception {
if (LOCK_RETRY_POLICY_BRANCH_ROLLBACK_ON_CONFLICT) {
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceManager.java b/rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceManager.java
index 4c2920fca2228dbcdad313dc70cd55f0e57cfef2..e023b5a330d4135dd167e4d59fbd2b2270cc0782 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceManager.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceManager.java
@@ -30,6 +30,7 @@ import io.seata.core.context.RootContext;
import io.seata.core.exception.RmTransactionException;
import io.seata.core.exception.TransactionException;
import io.seata.core.exception.TransactionExceptionCode;
+import io.seata.core.logger.StackTraceLogger;
import io.seata.core.model.BranchStatus;
import io.seata.core.model.BranchType;
import io.seata.core.model.Resource;
@@ -145,9 +146,6 @@ public class DataSourceManager extends AbstractResourceManager implements Initia
public void registerResource(Resource resource) {
DataSourceProxy dataSourceProxy = (DataSourceProxy)resource;
dataSourceCache.put(dataSourceProxy.getResourceId(), dataSourceProxy);
- synchronized (RESOURCE_LOCK) {
- RESOURCE_LOCK.notifyAll();
- }
super.registerResource(dataSourceProxy);
}
@@ -182,9 +180,10 @@ public class DataSourceManager extends AbstractResourceManager implements Initia
try {
UndoLogManagerFactory.getUndoLogManager(dataSourceProxy.getDbType()).undo(dataSourceProxy, xid, branchId);
} catch (TransactionException te) {
- if (LOGGER.isInfoEnabled()) {
- LOGGER.info("branchRollback failed reason [{}]", te.getMessage());
- }
+ StackTraceLogger.info(LOGGER, te,
+ "[stacktrace]branchRollback failed. branchType:[{}], xid:[{}], branchId:[{}], resourceId:[{}], applicationData:[{}]. stacktrace:[{}]",
+ new Object[]{branchType, xid, branchId, resourceId, applicationData, te.getMessage()},
+ "branchRollback failed reason [{}]", new Object[]{te.getMessage()});
if (te.getCode() == TransactionExceptionCode.BranchRollbackFailed_Unretriable) {
return BranchStatus.PhaseTwo_RollbackFailed_Unretryable;
} else {
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceProxy.java b/rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceProxy.java
index b60231bed85c0aac123eccbb88ead6170667fdbb..546acd72611f324fd5f46bb54fee26dd7db0165d 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceProxy.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/DataSourceProxy.java
@@ -15,6 +15,13 @@
*/
package io.seata.rm.datasource;
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
import com.alibaba.druid.util.JdbcUtils;
import io.seata.common.thread.NamedThreadFactory;
import io.seata.config.ConfigurationFactory;
@@ -23,15 +30,6 @@ import io.seata.core.model.BranchType;
import io.seata.core.model.Resource;
import io.seata.rm.DefaultResourceManager;
import io.seata.rm.datasource.sql.struct.TableMetaCacheFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
/**
* The type Data source proxy.
@@ -40,8 +38,6 @@ import java.util.concurrent.TimeUnit;
*/
public class DataSourceProxy extends AbstractDataSourceProxy implements Resource {
- private static final Logger LOGGER = LoggerFactory.getLogger(DataSourceProxy.class);
-
private String resourceGroupId;
private static final String DEFAULT_RESOURCE_GROUP_ID = "DEFAULT";
@@ -53,14 +49,16 @@ public class DataSourceProxy extends AbstractDataSourceProxy implements Resource
/**
* Enable the table meta checker
*/
- private static boolean ENABLE_TABLE_META_CHECKER_ENABLE = ConfigurationFactory.getInstance().getBoolean(ConfigurationKeys.CLIENT_TABLE_META_CHECK_ENABLE, true);
+ private static boolean ENABLE_TABLE_META_CHECKER_ENABLE = ConfigurationFactory.getInstance().getBoolean(
+ ConfigurationKeys.CLIENT_TABLE_META_CHECK_ENABLE, false);
/**
* Table meta checker interval
*/
private static final long TABLE_META_CHECKER_INTERVAL = 60000L;
- private final ScheduledExecutorService tableMetaExcutor = new ScheduledThreadPoolExecutor(1, new NamedThreadFactory("tableMetaChecker", 1, true));
+ private final ScheduledExecutorService tableMetaExcutor = new ScheduledThreadPoolExecutor(1,
+ new NamedThreadFactory("tableMetaChecker", 1, true));
/**
* Instantiates a new Data source proxy.
@@ -91,9 +89,13 @@ public class DataSourceProxy extends AbstractDataSourceProxy implements Resource
throw new IllegalStateException("can not init dataSource", e);
}
DefaultResourceManager.get().registerResource(this);
- if(ENABLE_TABLE_META_CHECKER_ENABLE){
+ if (ENABLE_TABLE_META_CHECKER_ENABLE) {
tableMetaExcutor.scheduleAtFixedRate(() -> {
- TableMetaCacheFactory.getTableMetaCache(DataSourceProxy.this.getDbType()).refresh(DataSourceProxy.this);
+ try (Connection connection = dataSource.getConnection()) {
+ TableMetaCacheFactory.getTableMetaCache(DataSourceProxy.this.getDbType())
+ .refresh(connection, DataSourceProxy.this.getResourceId());
+ } catch (Exception e) {
+ }
}, 0, TABLE_META_CHECKER_INTERVAL, TimeUnit.MILLISECONDS);
}
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
index 28208db4455543a7d78515b1caabaed0c1be580d..0f3aa50f059f520aa2f161a9107226862d8b0e9b 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/BaseTransactionalExecutor.java
@@ -15,9 +15,18 @@
*/
package io.seata.rm.datasource.exec;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringJoiner;
+
import io.seata.common.util.CollectionUtils;
import io.seata.common.util.StringUtils;
import io.seata.core.context.RootContext;
+import io.seata.rm.datasource.ColumnUtils;
import io.seata.rm.datasource.ConnectionProxy;
import io.seata.rm.datasource.ParametersHolder;
import io.seata.rm.datasource.StatementProxy;
@@ -30,14 +39,6 @@ import io.seata.rm.datasource.sql.struct.TableMetaCacheFactory;
import io.seata.rm.datasource.sql.struct.TableRecords;
import io.seata.rm.datasource.undo.SQLUndoLog;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Statement;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.StringJoiner;
-
/**
* The type Base transactional executor.
*
@@ -111,9 +112,9 @@ public abstract class BaseTransactionalExecutor<T, S extends Statement> implemen
* @throws SQLException the sql exception
*/
protected String buildWhereConditionByPKs(List<Field> pkRows) throws SQLException {
- StringJoiner whereConditionAppender = new StringJoiner(" OR ");
+ StringJoiner whereConditionAppender = new StringJoiner(",", getColumnNameInSQL(pkRows.get(0).getName()) + " in (", ")");
for (Field field : pkRows) {
- whereConditionAppender.add(getColumnNameInSQL(field.getName()) + " = ?");
+ whereConditionAppender.add("?");
}
return whereConditionAppender.toString();
@@ -188,10 +189,33 @@ public abstract class BaseTransactionalExecutor<T, S extends Statement> implemen
}
ConnectionProxy connectionProxy = statementProxy.getConnectionProxy();
tableMeta = TableMetaCacheFactory.getTableMetaCache(connectionProxy.getDbType())
- .getTableMeta(connectionProxy.getDataSourceProxy(), tableName);
+ .getTableMeta(connectionProxy.getTargetConnection(), tableName,connectionProxy.getDataSourceProxy().getResourceId());
return tableMeta;
}
+ /**
+ * the columns contains table meta pk
+ * @param columns the column name list
+ * @return true: contains pk false: not contains pk
+ */
+ protected boolean containsPK(List<String> columns) {
+ if (columns == null || columns.isEmpty()) {
+ return false;
+ }
+ List<String> newColumns = ColumnUtils.delEscape(columns, getDbType());
+ return getTableMeta().containsPK(newColumns);
+ }
+
+ /**
+ * compare column name and primary key name
+ * @param columnName the primary key column name
+ * @return true: equal false: not equal
+ */
+ protected boolean equalsPK(String columnName) {
+ String newColumnName = ColumnUtils.delEscape(columnName, getDbType());
+ return StringUtils.equalsIgnoreCase(getTableMeta().getPkName(), newColumnName);
+ }
+
/**
* prepare undo log.
*
@@ -224,14 +248,16 @@ public abstract class BaseTransactionalExecutor<T, S extends Statement> implemen
if (rowsIncludingPK.size() == 0) {
return null;
}
+
StringBuilder sb = new StringBuilder();
sb.append(rowsIncludingPK.getTableMeta().getTableName());
sb.append(":");
int filedSequence = 0;
- for (Field field : rowsIncludingPK.pkRows()) {
+ List<Field> pkRows = rowsIncludingPK.pkRows();
+ for (Field field : pkRows) {
sb.append(field.getValue());
filedSequence++;
- if (filedSequence < rowsIncludingPK.pkRows().size()) {
+ if (filedSequence < pkRows.size()) {
sb.append(",");
}
}
@@ -320,9 +346,10 @@ public abstract class BaseTransactionalExecutor<T, S extends Statement> implemen
protected TableRecords buildTableRecords(List<Object> pkValues) throws SQLException {
TableRecords afterImage;
String pk = getTableMeta().getPkName();
- StringJoiner pkValuesJoiner = new StringJoiner(" OR ", "SELECT * FROM " + getTableMeta().getTableName() + " WHERE ", "");
+ StringJoiner pkValuesJoiner = new StringJoiner(" , ",
+ "SELECT * FROM " + getFromTableInSQL() + " WHERE " + pk + " in (", ")");
for (Object pkValue : pkValues) {
- pkValuesJoiner.add(pk + "=?");
+ pkValuesJoiner.add("?");
}
PreparedStatement ps = null;
ResultSet rs = null;
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/DeleteExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/DeleteExecutor.java
index fe91c97a1fe2243d1f56b6949eff2fe86176275b..3b2272e852f573316bd6e3bca0540c62bb7f9474 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/DeleteExecutor.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/DeleteExecutor.java
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.StringJoiner;
-import com.alibaba.druid.util.JdbcConstants;
import io.seata.rm.datasource.StatementProxy;
import io.seata.rm.datasource.sql.SQLDeleteRecognizer;
import io.seata.rm.datasource.sql.SQLRecognizer;
@@ -63,11 +62,11 @@ public class DeleteExecutor<T, S extends Statement> extends AbstractDMLBaseExecu
}
private String buildBeforeImageSQL(SQLDeleteRecognizer visitor, TableMeta tableMeta, ArrayList<List<Object>> paramAppenderList) {
- KeywordChecker keywordChecker = KeywordCheckerFactory.getKeywordChecker(JdbcConstants.MYSQL);
+ KeywordChecker keywordChecker = KeywordCheckerFactory.getKeywordChecker(getDbType());
String whereCondition = buildWhereCondition(visitor, paramAppenderList);
- StringBuilder suffix = new StringBuilder(" FROM " + keywordChecker.checkAndReplace(getFromTableInSQL()));
+ StringBuilder suffix = new StringBuilder(" FROM ").append(getFromTableInSQL());
if (StringUtils.isNotBlank(whereCondition)) {
- suffix.append(" WHERE " + whereCondition);
+ suffix.append(" WHERE ").append(whereCondition);
}
suffix.append(" FOR UPDATE");
StringJoiner selectSQLAppender = new StringJoiner(", ", "SELECT ", suffix.toString());
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/InsertExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/InsertExecutor.java
index 1010f99e91f6c2b37d90272c09670cfd2ba235fb..0bd22b2538f85687e87eb1b15f2f8a794fb4804a 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/InsertExecutor.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/InsertExecutor.java
@@ -26,6 +26,7 @@ import java.util.stream.Collectors;
import com.alibaba.druid.util.JdbcConstants;
import io.seata.common.exception.NotSupportYetException;
import io.seata.common.exception.ShouldNeverHappenException;
+import io.seata.common.util.CollectionUtils;
import io.seata.common.util.StringUtils;
import io.seata.rm.datasource.PreparedStatementProxy;
import io.seata.rm.datasource.StatementProxy;
@@ -35,7 +36,6 @@ import io.seata.rm.datasource.sql.struct.ColumnMeta;
import io.seata.rm.datasource.sql.struct.Null;
import io.seata.rm.datasource.sql.struct.SqlMethodExpr;
import io.seata.rm.datasource.sql.struct.SqlSequenceExpr;
-import io.seata.rm.datasource.sql.struct.TableMeta;
import io.seata.rm.datasource.sql.struct.TableRecords;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -46,7 +46,6 @@ import org.slf4j.LoggerFactory;
* @param <T> the type parameter
* @param <S> the type parameter
* @author yuanguoyao
- * @date 2019-03-21 21:30:02
*/
public class InsertExecutor<T, S extends Statement> extends AbstractDMLBaseExecutor<T, S> {
@@ -90,8 +89,10 @@ public class InsertExecutor<T, S extends Statement> extends AbstractDMLBaseExecu
protected boolean containsPK() {
SQLInsertRecognizer recognizer = (SQLInsertRecognizer) sqlRecognizer;
List<String> insertColumns = recognizer.getInsertColumns();
- TableMeta tmeta = getTableMeta();
- return tmeta.containsPK(insertColumns);
+ if (CollectionUtils.isEmpty(insertColumns)) {
+ return false;
+ }
+ return containsPK(insertColumns);
}
protected boolean containsColumns() {
@@ -104,6 +105,9 @@ public class InsertExecutor<T, S extends Statement> extends AbstractDMLBaseExecu
// insert values including PK
SQLInsertRecognizer recognizer = (SQLInsertRecognizer) sqlRecognizer;
final int pkIndex = getPkIndex();
+ if (pkIndex == -1) {
+ throw new ShouldNeverHappenException("pkIndex is " + pkIndex);
+ }
List<Object> pkValues = null;
if (statementProxy instanceof PreparedStatementProxy) {
PreparedStatementProxy preparedStatementProxy = (PreparedStatementProxy) statementProxy;
@@ -126,6 +130,11 @@ public class InsertExecutor<T, S extends Statement> extends AbstractDMLBaseExecu
pkValues = new ArrayList<>(rowSize);
for (int i = 0; i < rowSize; i++) {
List<Object> row = insertRows.get(i);
+ // oracle insert sql statement specify RETURN_GENERATED_KEYS will append :rowid on sql end
+ // insert parameter count will than the actual +1
+ if (row.isEmpty()) {
+ continue;
+ }
Object pkValue = row.get(pkIndex);
int currentRowPlaceholderNum = -1;
for (Object r : row) {
@@ -216,13 +225,12 @@ public class InsertExecutor<T, S extends Statement> extends AbstractDMLBaseExecu
*/
protected int getPkIndex() {
SQLInsertRecognizer recognizer = (SQLInsertRecognizer) sqlRecognizer;
- String pkName = getTableMeta().getPkName();
List<String> insertColumns = recognizer.getInsertColumns();
- if (insertColumns != null && !insertColumns.isEmpty()) {
+ if (CollectionUtils.isNotEmpty(insertColumns)) {
final int insertColumnsSize = insertColumns.size();
int pkIndex = -1;
for (int paramIdx = 0; paramIdx < insertColumnsSize; paramIdx++) {
- if (insertColumns.get(paramIdx).equalsIgnoreCase(pkName)) {
+ if (equalsPK(insertColumns.get(paramIdx))) {
pkIndex = paramIdx;
break;
}
@@ -233,7 +241,7 @@ public class InsertExecutor<T, S extends Statement> extends AbstractDMLBaseExecu
Map<String, ColumnMeta> allColumns = getTableMeta().getAllColumns();
for (Map.Entry<String, ColumnMeta> entry : allColumns.entrySet()) {
pkIndex++;
- if (entry.getValue().getColumnName().equalsIgnoreCase(pkName)) {
+ if (equalsPK(entry.getValue().getColumnName())) {
break;
}
}
@@ -306,6 +314,11 @@ public class InsertExecutor<T, S extends Statement> extends AbstractDMLBaseExecu
Object v = genKeys.getObject(1);
pkValues.add(v);
}
+ try {
+ genKeys.beforeFirst();
+ } catch (SQLException e) {
+ LOGGER.warn("Fail to reset ResultSet cursor. can not get primary key value");
+ }
return pkValues;
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/SelectForUpdateExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/SelectForUpdateExecutor.java
index 0b11c2b912d074f3a7d8786e533e8188fbaad2cd..c0a69c8487fe07e4c87f28621e8407db6c8aa1e6 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/SelectForUpdateExecutor.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/SelectForUpdateExecutor.java
@@ -16,8 +16,10 @@
package io.seata.rm.datasource.exec;
import java.sql.Connection;
+import java.sql.DatabaseMetaData;
import java.sql.Savepoint;
import java.sql.Statement;
+import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
@@ -27,16 +29,19 @@ import io.seata.rm.datasource.StatementProxy;
import io.seata.rm.datasource.sql.SQLRecognizer;
import io.seata.rm.datasource.sql.SQLSelectRecognizer;
import io.seata.rm.datasource.sql.struct.TableRecords;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The type Select for update executor.
*
- * @author sharajava
- *
* @param <S> the type parameter
+ * @author sharajava
*/
public class SelectForUpdateExecutor<T, S extends Statement> extends BaseTransactionalExecutor<T, S> {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SelectForUpdateExecutor.class);
+
/**
* Instantiates a new Select for update executor.
*
@@ -52,6 +57,7 @@ public class SelectForUpdateExecutor<T, S extends Statement> extends BaseTransac
@Override
public T doExecute(Object... args) throws Throwable {
Connection conn = statementProxy.getConnection();
+ DatabaseMetaData dbmd = conn.getMetaData();
T rs = null;
Savepoint sp = null;
LockRetryController lockRetryController = new LockRetryController();
@@ -60,9 +66,21 @@ public class SelectForUpdateExecutor<T, S extends Statement> extends BaseTransac
String selectPKSQL = buildSelectSQL(paramAppenderList);
try {
if (originalAutoCommit) {
+ /*
+ * In order to hold the local db lock during global lock checking
+ * set auto commit value to false first if original auto commit was true
+ */
conn.setAutoCommit(false);
+ } else if (dbmd.supportsSavepoints()) {
+ /*
+ * In order to release the local db lock when global lock conflict
+ * create a save point if original auto commit was false, then use the save point here to release db
+ * lock during global lock checking if necessary
+ */
+ sp = conn.setSavepoint();
+ } else {
+ throw new SQLException("not support savepoint. please check your db version");
}
- sp = conn.setSavepoint();
while (true) {
try {
@@ -90,13 +108,23 @@ public class SelectForUpdateExecutor<T, S extends Statement> extends BaseTransac
}
break;
} catch (LockConflictException lce) {
- conn.rollback(sp);
+ if (sp != null) {
+ conn.rollback(sp);
+ } else {
+ conn.rollback();
+ }
lockRetryController.sleep(lce);
}
}
} finally {
if (sp != null) {
- conn.releaseSavepoint(sp);
+ try {
+ conn.releaseSavepoint(sp);
+ } catch (SQLException e) {
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("{} does not support release save point, but this is not a error.", getDbType());
+ }
+ }
}
if (originalAutoCommit) {
conn.setAutoCommit(true);
@@ -105,14 +133,14 @@ public class SelectForUpdateExecutor<T, S extends Statement> extends BaseTransac
return rs;
}
- private String buildSelectSQL(ArrayList<List<Object>> paramAppenderList){
+ private String buildSelectSQL(ArrayList<List<Object>> paramAppenderList) {
SQLSelectRecognizer recognizer = (SQLSelectRecognizer)sqlRecognizer;
StringBuilder selectSQLAppender = new StringBuilder("SELECT ");
selectSQLAppender.append(getColumnNameInSQL(getTableMeta().getPkName()));
- selectSQLAppender.append(" FROM " + getFromTableInSQL());
+ selectSQLAppender.append(" FROM ").append(getFromTableInSQL());
String whereCondition = buildWhereCondition(recognizer, paramAppenderList);
if (StringUtils.isNotBlank(whereCondition)) {
- selectSQLAppender.append(" WHERE " + whereCondition);
+ selectSQLAppender.append(" WHERE ").append(whereCondition);
}
selectSQLAppender.append(" FOR UPDATE");
return selectSQLAppender.toString();
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java
index 105d22f9c4a43813b8304c0b0e7d3df14dea5fce..27ab288d73ffdd28ba55d1a3bba342a37946642f 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/exec/UpdateExecutor.java
@@ -68,12 +68,12 @@ public class UpdateExecutor<T, S extends Statement> extends AbstractDMLBaseExecu
List<String> updateColumns = recognizer.getUpdateColumns();
StringBuilder prefix = new StringBuilder("SELECT ");
if (!tableMeta.containsPK(updateColumns)) {
- prefix.append(getColumnNameInSQL(tableMeta.getPkName()) + ", ");
+ prefix.append(getColumnNameInSQL(tableMeta.getEscapePkName(getDbType()))).append(", ");
}
- StringBuilder suffix = new StringBuilder(" FROM " + getFromTableInSQL());
+ StringBuilder suffix = new StringBuilder(" FROM ").append(getFromTableInSQL());
String whereCondition = buildWhereCondition(recognizer, paramAppenderList);
if (StringUtils.isNotBlank(whereCondition)) {
- suffix.append(" WHERE " + whereCondition);
+ suffix.append(" WHERE ").append(whereCondition);
}
suffix.append(" FOR UPDATE");
StringJoiner selectSQLJoin = new StringJoiner(", ", prefix.toString(), suffix.toString());
@@ -118,9 +118,9 @@ public class UpdateExecutor<T, S extends Statement> extends AbstractDMLBaseExecu
SQLUpdateRecognizer recognizer = (SQLUpdateRecognizer)sqlRecognizer;
List<String> updateColumns = recognizer.getUpdateColumns();
StringBuilder prefix = new StringBuilder("SELECT ");
- if (!tableMeta.containsPK(updateColumns)) {
+ if (!containsPK(updateColumns)) {
// PK should be included.
- prefix.append(getColumnNameInSQL(tableMeta.getPkName()) + ", ");
+ prefix.append(getColumnNameInSQL(tableMeta.getEscapePkName(getDbType()))).append(", ");
}
String suffix = " FROM " + getFromTableInSQL() + " WHERE " + buildWhereConditionByPKs(beforeImage.pkRows());
StringJoiner selectSQLJoiner = new StringJoiner(", ", prefix.toString(), suffix);
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLOperateRecognizerHolder.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLOperateRecognizerHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..02643f0e9597c0a386d2fb976842f51740112ca4
--- /dev/null
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLOperateRecognizerHolder.java
@@ -0,0 +1,70 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.sql;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+
+/**
+ * The interface SQLOperateRecognizerHolder
+ *
+ * @author: Zhibei Hao
+ */
+public interface SQLOperateRecognizerHolder {
+
+ /**
+ * Get delete recognizer
+ *
+ * @param sql the sql
+ * @param ast the ast
+ * @return the delete recognizer
+ */
+ SQLRecognizer getDeleteRecognizer(String sql, SQLStatement ast);
+
+ /**
+ * Get insert recognizer
+ *
+ * @param sql the sql
+ * @param ast the ast
+ * @return the insert recognizer
+ */
+ SQLRecognizer getInsertRecognizer(String sql, SQLStatement ast);
+
+ /**
+ * Get update recognizer
+ *
+ * @param sql the sql
+ * @param ast the ast
+ * @return the update recognizer
+ */
+ SQLRecognizer getUpdateRecognizer(String sql, SQLStatement ast);
+
+ /**
+ * Get SelectForUpdate recognizer
+ *
+ * @param sql the sql
+ * @param ast the ast
+ * @return the SelectForUpdate recognizer
+ */
+ SQLRecognizer getSelectForUpdateRecognizer(String sql, SQLStatement ast);
+
+ /**
+ * Get the SQL type of the current SQLOperateRecognizerHolder
+ *
+ * @return the db type string
+ */
+ String getDbType();
+
+}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLOperateRecognizerHolderFactory.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLOperateRecognizerHolderFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..655d9c891cea3197c8a83e0831121660811368be
--- /dev/null
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLOperateRecognizerHolderFactory.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.sql;
+
+import io.seata.common.loader.EnhancedServiceLoader;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The SQLOperateRecognizerHolderFactory
+ *
+ * @author: Zhibei Hao
+ */
+public class SQLOperateRecognizerHolderFactory {
+
+ private static volatile Map<String, SQLOperateRecognizerHolder> recognizerHolderMap;
+
+ /**
+ * get SQLOperateRecognizer by db type
+ *
+ * @param dbType the db type
+ * @return the SQLOperateRecognizer
+ */
+ public static SQLOperateRecognizerHolder getSQLRecognizerHolder(String dbType) {
+
+ if (recognizerHolderMap == null) {
+ synchronized (SQLOperateRecognizerHolderFactory.class) {
+ if (recognizerHolderMap == null) {
+ Map<String, SQLOperateRecognizerHolder> initializedMap = new HashMap<>();
+ List<SQLOperateRecognizerHolder> holderList = EnhancedServiceLoader.loadAll(
+ SQLOperateRecognizerHolder.class);
+ for (SQLOperateRecognizerHolder holder : holderList) {
+ initializedMap.put(holder.getDbType().toLowerCase(), holder);
+ }
+ recognizerHolderMap = initializedMap;
+ }
+ }
+ }
+ if (recognizerHolderMap.containsKey(dbType)) {
+ return recognizerHolderMap.get(dbType);
+ }
+ throw new UnsupportedOperationException(MessageFormat.format("now not support {0}", dbType));
+ }
+}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLVisitorFactory.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLVisitorFactory.java
index 633f3a9864bc2f5b4a1b577b4310cb43381a4952..046bddc7acaedb14e42da5fefe0400c5da159947 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLVisitorFactory.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/SQLVisitorFactory.java
@@ -21,15 +21,6 @@ import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
-import com.alibaba.druid.util.JdbcConstants;
-import io.seata.rm.datasource.sql.druid.MySQLDeleteRecognizer;
-import io.seata.rm.datasource.sql.druid.MySQLInsertRecognizer;
-import io.seata.rm.datasource.sql.druid.MySQLSelectForUpdateRecognizer;
-import io.seata.rm.datasource.sql.druid.MySQLUpdateRecognizer;
-import io.seata.rm.datasource.sql.druid.oracle.OracleDeleteRecognizer;
-import io.seata.rm.datasource.sql.druid.oracle.OracleInsertRecognizer;
-import io.seata.rm.datasource.sql.druid.oracle.OracleSelectForUpdateRecognizer;
-import io.seata.rm.datasource.sql.druid.oracle.OracleUpdateRecognizer;
import java.util.List;
/**
@@ -53,32 +44,16 @@ public class SQLVisitorFactory {
}
SQLRecognizer recognizer = null;
SQLStatement ast = asts.get(0);
- if (JdbcConstants.MYSQL.equalsIgnoreCase(dbType)) {
- if (ast instanceof SQLInsertStatement) {
- recognizer = new MySQLInsertRecognizer(sql, ast);
- } else if (ast instanceof SQLUpdateStatement) {
- recognizer = new MySQLUpdateRecognizer(sql, ast);
- } else if (ast instanceof SQLDeleteStatement) {
- recognizer = new MySQLDeleteRecognizer(sql, ast);
- } else if (ast instanceof SQLSelectStatement) {
- if (((SQLSelectStatement) ast).getSelect().getFirstQueryBlock().isForUpdate()) {
- recognizer = new MySQLSelectForUpdateRecognizer(sql, ast);
- }
- }
- } else if (JdbcConstants.ORACLE.equalsIgnoreCase(dbType)) {
- if (ast instanceof SQLInsertStatement) {
- recognizer = new OracleInsertRecognizer(sql, ast);
- } else if (ast instanceof SQLUpdateStatement) {
- recognizer = new OracleUpdateRecognizer(sql, ast);
- } else if (ast instanceof SQLDeleteStatement) {
- recognizer = new OracleDeleteRecognizer(sql, ast);
- } else if (ast instanceof SQLSelectStatement) {
- if (((SQLSelectStatement) ast).getSelect().getQueryBlock().isForUpdate()) {
- recognizer = new OracleSelectForUpdateRecognizer(sql, ast);
- }
- }
- }else {
- throw new UnsupportedOperationException("Just support MySQL and Oracle by now!");
+ SQLOperateRecognizerHolder recognizerHolder =
+ SQLOperateRecognizerHolderFactory.getSQLRecognizerHolder(dbType.toLowerCase());
+ if (ast instanceof SQLInsertStatement) {
+ recognizer = recognizerHolder.getInsertRecognizer(sql, ast);
+ } else if (ast instanceof SQLUpdateStatement) {
+ recognizer = recognizerHolder.getUpdateRecognizer(sql, ast);
+ } else if (ast instanceof SQLDeleteStatement) {
+ recognizer = recognizerHolder.getDeleteRecognizer(sql, ast);
+ } else if (ast instanceof SQLSelectStatement) {
+ recognizer = recognizerHolder.getSelectForUpdateRecognizer(sql, ast);
}
return recognizer;
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/BaseMySQLRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/BaseMySQLRecognizer.java
index d7bbdc7ed208d1675756688a2872c543b3302837..0b16ae76d42d5b6434ccd60c131eacf8d403bfb1 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/BaseMySQLRecognizer.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/BaseMySQLRecognizer.java
@@ -15,33 +15,34 @@
*/
package io.seata.rm.datasource.sql.druid;
-import java.util.ArrayList;
-import java.util.List;
-
import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr;
-import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
-import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
-
+import io.seata.common.util.StringUtils;
import io.seata.rm.datasource.ParametersHolder;
+import io.seata.rm.datasource.sql.struct.Null;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
/**
* @author will
- * @date 2019/9/26
*/
public abstract class BaseMySQLRecognizer extends BaseRecognizer {
/**
* Instantiates a new mysql base recognizer
+ *
* @param originalSql the original sql
*/
- public BaseMySQLRecognizer(String originalSql){
+ public BaseMySQLRecognizer(String originalSql) {
super(originalSql);
}
- public MySqlOutputVisitor createOutputVisitor(final ParametersHolder parametersHolder, final ArrayList<List<Object>> paramAppenderList, final StringBuilder sb) {
+ public MySqlOutputVisitor createOutputVisitor(final ParametersHolder parametersHolder,
+ final ArrayList<List<Object>> paramAppenderList,
+ final StringBuilder sb) {
MySqlOutputVisitor visitor = new MySqlOutputVisitor(sb) {
@Override
@@ -52,7 +53,8 @@ public abstract class BaseMySQLRecognizer extends BaseRecognizer {
oneParamValues.stream().forEach(t -> paramAppenderList.add(new ArrayList<>()));
}
for (int i = 0; i < oneParamValues.size(); i++) {
- paramAppenderList.get(i).add(oneParamValues.get(i));
+ Object o = oneParamValues.get(i);
+ paramAppenderList.get(i).add(o instanceof Null ? null : o);
}
}
@@ -62,40 +64,26 @@ public abstract class BaseMySQLRecognizer extends BaseRecognizer {
return visitor;
}
- public String getWhereCondition(SQLExpr where, final ParametersHolder parametersHolder, final ArrayList<List<Object>> paramAppenderList) {
- if (where == null) {
- return "";
+ public String getWhereCondition(SQLExpr where, final ParametersHolder parametersHolder,
+ final ArrayList<List<Object>> paramAppenderList) {
+ if (Objects.isNull(where)) {
+ return StringUtils.EMPTY;
}
+
StringBuilder sb = new StringBuilder();
- MySqlOutputVisitor visitor = createOutputVisitor(parametersHolder, paramAppenderList, sb);
- if (where instanceof SQLBinaryOpExpr) {
- visitor.visit((SQLBinaryOpExpr) where);
- } else if (where instanceof SQLInListExpr) {
- visitor.visit((SQLInListExpr) where);
- } else if (where instanceof SQLBetweenExpr) {
- visitor.visit((SQLBetweenExpr) where);
- } else {
- throw new IllegalArgumentException("unexpected WHERE expr: " + where.getClass().getSimpleName());
- }
+
+ executeVisit(where, createOutputVisitor(parametersHolder, paramAppenderList, sb));
return sb.toString();
}
public String getWhereCondition(SQLExpr where) {
- if (where == null) {
- return "";
+ if (Objects.isNull(where)) {
+ return StringUtils.EMPTY;
}
StringBuilder sb = new StringBuilder();
- MySqlOutputVisitor visitor = new MySqlOutputVisitor(sb);
- if (where instanceof SQLBinaryOpExpr) {
- visitor.visit((SQLBinaryOpExpr) where);
- } else if (where instanceof SQLInListExpr) {
- visitor.visit((SQLInListExpr) where);
- } else if (where instanceof SQLBetweenExpr) {
- visitor.visit((SQLBetweenExpr) where);
- } else {
- throw new IllegalArgumentException("unexpected WHERE expr: " + where.getClass().getSimpleName());
- }
+
+ executeVisit(where, new MySqlOutputVisitor(sb));
return sb.toString();
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/BaseRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/BaseRecognizer.java
index cab1399691f558129d18e6a9dede8463f65ac1af..1764ccd31c990f449e2b66d3b8d1c0c0e1ea091b 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/BaseRecognizer.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/BaseRecognizer.java
@@ -15,6 +15,13 @@
*/
package io.seata.rm.datasource.sql.druid;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
+import com.alibaba.druid.sql.ast.expr.SQLExistsExpr;
+import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
import io.seata.rm.datasource.sql.SQLRecognizer;
/**
@@ -50,6 +57,20 @@ public abstract class BaseRecognizer implements SQLRecognizer {
}
+ public void executeVisit(SQLExpr where, SQLASTVisitor visitor) {
+ if (where instanceof SQLBinaryOpExpr) {
+ visitor.visit((SQLBinaryOpExpr) where);
+ } else if (where instanceof SQLInListExpr) {
+ visitor.visit((SQLInListExpr) where);
+ } else if (where instanceof SQLBetweenExpr) {
+ visitor.visit((SQLBetweenExpr) where);
+ } else if (where instanceof SQLExistsExpr) {
+ visitor.visit((SQLExistsExpr) where);
+ } else {
+ throw new IllegalArgumentException("unexpected WHERE expr: " + where.getClass().getSimpleName());
+ }
+ }
+
@Override
public String getOriginalSQL() {
return originalSQL;
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLDeleteRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLDeleteRecognizer.java
index 9173115f4b6886861afb507730c5ee23fab0a8ca..9ff898d52188a93c33d0b0f5418b11699bbe00d9 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLDeleteRecognizer.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLDeleteRecognizer.java
@@ -23,6 +23,7 @@ import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlDeleteStatement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
+
import io.seata.rm.datasource.ParametersHolder;
import io.seata.rm.datasource.sql.SQLDeleteRecognizer;
import io.seata.rm.datasource.sql.SQLType;
@@ -44,7 +45,7 @@ public class MySQLDeleteRecognizer extends BaseMySQLRecognizer implements SQLDel
*/
public MySQLDeleteRecognizer(String originalSQL, SQLStatement ast) {
super(originalSQL);
- this.ast = (MySqlDeleteStatement) ast;
+ this.ast = (MySqlDeleteStatement)ast;
}
@Override
@@ -68,12 +69,13 @@ public class MySQLDeleteRecognizer extends BaseMySQLRecognizer implements SQLDel
return false;
}
};
- visitor.visit((SQLExprTableSource) ast.getTableSource());
+ visitor.visit((SQLExprTableSource)ast.getTableSource());
return sb.toString();
}
@Override
- public String getWhereCondition(final ParametersHolder parametersHolder, final ArrayList<List<Object>> paramAppenderList) {
+ public String getWhereCondition(final ParametersHolder parametersHolder,
+ final ArrayList<List<Object>> paramAppenderList) {
SQLExpr where = ast.getWhere();
return super.getWhereCondition(where, parametersHolder, paramAppenderList);
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLInsertRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLInsertRecognizer.java
index 4c9273fe2122ec902f55539706e60a28bb5f8b2c..31de88eb04971297bd4054a825cc45cf6857bd2f 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLInsertRecognizer.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLInsertRecognizer.java
@@ -29,6 +29,7 @@ import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlInsertStatement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
+
import io.seata.rm.datasource.sql.SQLInsertRecognizer;
import io.seata.rm.datasource.sql.SQLParsingException;
import io.seata.rm.datasource.sql.SQLType;
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLSelectForUpdateRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLSelectForUpdateRecognizer.java
index 3487c2685f339c963fab6f2a90f55f6fc68d5c83..37e0faac1e697aa0311cc3de541793766496a761 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLSelectForUpdateRecognizer.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLSelectForUpdateRecognizer.java
@@ -26,6 +26,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.ast.statement.SQLTableSource;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
+
import io.seata.rm.datasource.ParametersHolder;
import io.seata.rm.datasource.sql.SQLParsingException;
import io.seata.rm.datasource.sql.SQLSelectRecognizer;
@@ -48,7 +49,7 @@ public class MySQLSelectForUpdateRecognizer extends BaseMySQLRecognizer implemen
*/
public MySQLSelectForUpdateRecognizer(String originalSQL, SQLStatement ast) {
super(originalSQL);
- this.ast = (SQLSelectStatement) ast;
+ this.ast = (SQLSelectStatement)ast;
}
@Override
@@ -57,7 +58,8 @@ public class MySQLSelectForUpdateRecognizer extends BaseMySQLRecognizer implemen
}
@Override
- public String getWhereCondition(final ParametersHolder parametersHolder, final ArrayList<List<Object>> paramAppenderList) {
+ public String getWhereCondition(final ParametersHolder parametersHolder,
+ final ArrayList<List<Object>> paramAppenderList) {
SQLSelectQueryBlock selectQueryBlock = getSelect();
SQLExpr where = selectQueryBlock.getWhere();
return super.getWhereCondition(where, parametersHolder, paramAppenderList);
@@ -102,7 +104,7 @@ public class MySQLSelectForUpdateRecognizer extends BaseMySQLRecognizer implemen
return false;
}
};
- visitor.visit((SQLExprTableSource) tableSource);
+ visitor.visit((SQLExprTableSource)tableSource);
return sb.toString();
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLUpdateRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLUpdateRecognizer.java
index 1983315e471ae2da67a5fb54d9b571460a7d407a..b89fabadbb0a72f759f49792a82fb57d57260016 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLUpdateRecognizer.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySQLUpdateRecognizer.java
@@ -28,6 +28,7 @@ import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
+
import io.seata.rm.datasource.ParametersHolder;
import io.seata.rm.datasource.sql.SQLParsingException;
import io.seata.rm.datasource.sql.SQLType;
@@ -50,7 +51,7 @@ public class MySQLUpdateRecognizer extends BaseMySQLRecognizer implements SQLUpd
*/
public MySQLUpdateRecognizer(String originalSQL, SQLStatement ast) {
super(originalSQL);
- this.ast = (MySqlUpdateStatement) ast;
+ this.ast = (MySqlUpdateStatement)ast;
}
@Override
@@ -65,12 +66,12 @@ public class MySQLUpdateRecognizer extends BaseMySQLRecognizer implements SQLUpd
for (SQLUpdateSetItem updateSetItem : updateSetItems) {
SQLExpr expr = updateSetItem.getColumn();
if (expr instanceof SQLIdentifierExpr) {
- list.add(((SQLIdentifierExpr) expr).getName());
+ list.add(((SQLIdentifierExpr)expr).getName());
} else if (expr instanceof SQLPropertyExpr) {
// This is alias case, like UPDATE xxx_tbl a SET a.name = ? WHERE a.id = ?
- SQLExpr owner = ((SQLPropertyExpr) expr).getOwner();
+ SQLExpr owner = ((SQLPropertyExpr)expr).getOwner();
if (owner instanceof SQLIdentifierExpr) {
- list.add((((SQLIdentifierExpr) owner).getName() + "." + ((SQLPropertyExpr) expr).getName()));
+ list.add(((SQLIdentifierExpr)owner).getName() + "." + ((SQLPropertyExpr)expr).getName());
}
} else {
throw new SQLParsingException("Unknown SQLExpr: " + expr.getClass() + " " + expr);
@@ -86,7 +87,7 @@ public class MySQLUpdateRecognizer extends BaseMySQLRecognizer implements SQLUpd
for (SQLUpdateSetItem updateSetItem : updateSetItems) {
SQLExpr expr = updateSetItem.getValue();
if (expr instanceof SQLValuableExpr) {
- list.add(((SQLValuableExpr) expr).getValue());
+ list.add(((SQLValuableExpr)expr).getValue());
} else if (expr instanceof SQLVariantRefExpr) {
list.add(new VMarker());
} else {
@@ -97,7 +98,8 @@ public class MySQLUpdateRecognizer extends BaseMySQLRecognizer implements SQLUpd
}
@Override
- public String getWhereCondition(final ParametersHolder parametersHolder, final ArrayList<List<Object>> paramAppenderList) {
+ public String getWhereCondition(final ParametersHolder parametersHolder,
+ final ArrayList<List<Object>> paramAppenderList) {
SQLExpr where = ast.getWhere();
return super.getWhereCondition(where, parametersHolder, paramAppenderList);
}
@@ -124,7 +126,7 @@ public class MySQLUpdateRecognizer extends BaseMySQLRecognizer implements SQLUpd
return false;
}
};
- SQLExprTableSource tableSource = (SQLExprTableSource) ast.getTableSource();
+ SQLExprTableSource tableSource = (SQLExprTableSource)ast.getTableSource();
visitor.visit(tableSource);
return sb.toString();
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySqlOperateRecognizerHolder.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySqlOperateRecognizerHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..823fd3b147c6e1bc5f78fc53d79acf786db6db04
--- /dev/null
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/MySqlOperateRecognizerHolder.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.sql.druid;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
+
+import io.seata.rm.datasource.sql.SQLOperateRecognizerHolder;
+import io.seata.rm.datasource.sql.SQLRecognizer;
+
+/**
+ * The class MySqlOperateRecognizerHolder
+ *
+ * @author: Zhibei Hao
+ */
+public class MySqlOperateRecognizerHolder implements SQLOperateRecognizerHolder {
+ private static final String MYSQL = "mysql";
+
+ @Override
+ public SQLRecognizer getDeleteRecognizer(String sql, SQLStatement ast) {
+ return new MySQLDeleteRecognizer(sql, ast);
+ }
+
+ @Override
+ public SQLRecognizer getInsertRecognizer(String sql, SQLStatement ast) {
+ return new MySQLInsertRecognizer(sql, ast);
+ }
+
+ @Override
+ public SQLRecognizer getUpdateRecognizer(String sql, SQLStatement ast) {
+ return new MySQLUpdateRecognizer(sql, ast);
+ }
+
+ @Override
+ public SQLRecognizer getSelectForUpdateRecognizer(String sql, SQLStatement ast) {
+ if (((SQLSelectStatement) ast).getSelect().getFirstQueryBlock().isForUpdate()) {
+ return new MySQLSelectForUpdateRecognizer(sql, ast);
+ }
+ return null;
+ }
+
+ @Override
+ public String getDbType() {
+ return MYSQL;
+ }
+}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/BaseOracleRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/BaseOracleRecognizer.java
index 1c82ea080cf2bfab23b28a50c1a2934a1dbfce75..e2c2ce95e986e3391e18a499698f50e2340e6b94 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/BaseOracleRecognizer.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/BaseOracleRecognizer.java
@@ -17,32 +17,34 @@ package io.seata.rm.datasource.sql.druid.oracle;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr;
-import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
-import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor;
+import io.seata.common.util.StringUtils;
import io.seata.rm.datasource.ParametersHolder;
import io.seata.rm.datasource.sql.druid.BaseRecognizer;
+import io.seata.rm.datasource.sql.struct.Null;
/**
* @author will
- * @date 2019/9/26
*/
public abstract class BaseOracleRecognizer extends BaseRecognizer {
/**
* Instantiates a new oracle base recognizer
+ *
* @param originalSql the original sql
*/
- public BaseOracleRecognizer(String originalSql){
+ public BaseOracleRecognizer(String originalSql) {
super(originalSql);
}
- public OracleOutputVisitor createOutputVisitor(final ParametersHolder parametersHolder, final ArrayList<List<Object>> paramAppenderList, final StringBuilder sb) {
+ public OracleOutputVisitor createOutputVisitor(final ParametersHolder parametersHolder,
+ final ArrayList<List<Object>> paramAppenderList,
+ final StringBuilder sb) {
OracleOutputVisitor visitor = new OracleOutputVisitor(sb) {
@Override
@@ -53,7 +55,8 @@ public abstract class BaseOracleRecognizer extends BaseRecognizer {
oneParamValues.stream().forEach(t -> paramAppenderList.add(new ArrayList<>()));
}
for (int i = 0; i < oneParamValues.size(); i++) {
- paramAppenderList.get(i).add(oneParamValues.get(i));
+ Object o = oneParamValues.get(i);
+ paramAppenderList.get(i).add(o instanceof Null ? null : o);
}
}
@@ -64,39 +67,22 @@ public abstract class BaseOracleRecognizer extends BaseRecognizer {
}
public String getWhereCondition(SQLExpr where, final ParametersHolder parametersHolder, final ArrayList<List<Object>> paramAppenderList) {
- if (where == null) {
- return "";
+ if (Objects.isNull(where)) {
+ return StringUtils.EMPTY;
}
+
StringBuilder sb = new StringBuilder();
- OracleOutputVisitor visitor = createOutputVisitor(parametersHolder, paramAppenderList, sb);
- if (where instanceof SQLBinaryOpExpr) {
- visitor.visit((SQLBinaryOpExpr) where);
- } else if (where instanceof SQLInListExpr) {
- visitor.visit((SQLInListExpr) where);
- } else if (where instanceof SQLBetweenExpr) {
- visitor.visit((SQLBetweenExpr) where);
- } else {
- throw new IllegalArgumentException("unexpected WHERE expr: " + where.getClass().getSimpleName());
- }
+ executeVisit(where, createOutputVisitor(parametersHolder, paramAppenderList, sb));
return sb.toString();
}
public String getWhereCondition(SQLExpr where) {
- if (where == null) {
- return "";
+ if (Objects.isNull(where)) {
+ return StringUtils.EMPTY;
}
StringBuilder sb = new StringBuilder();
- OracleOutputVisitor visitor = new OracleOutputVisitor(sb);
- if (where instanceof SQLBinaryOpExpr) {
- visitor.visit((SQLBinaryOpExpr) where);
- } else if (where instanceof SQLInListExpr) {
- visitor.visit((SQLInListExpr) where);
- } else if (where instanceof SQLBetweenExpr) {
- visitor.visit((SQLBetweenExpr) where);
- } else {
- throw new IllegalArgumentException("unexpected WHERE expr: " + where.getClass().getSimpleName());
- }
+ executeVisit(where, new OracleOutputVisitor(sb));
return sb.toString();
}
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleDeleteRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleDeleteRecognizer.java
index 1fe5621460e04c8ce2e9013594dfb57d2169c7e2..5206abce923b93ac4b9d1321528806e876c440fd 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleDeleteRecognizer.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleDeleteRecognizer.java
@@ -20,6 +20,7 @@ import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleDeleteStatement;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor;
+
import io.seata.rm.datasource.ParametersHolder;
import io.seata.rm.datasource.sql.SQLDeleteRecognizer;
import io.seata.rm.datasource.sql.SQLType;
@@ -31,7 +32,6 @@ import java.util.List;
* The type oracle delete recognizer.
*
* @author ccg
- * @date 2019/3/25
*/
public class OracleDeleteRecognizer extends BaseOracleRecognizer implements SQLDeleteRecognizer {
@@ -45,7 +45,7 @@ public class OracleDeleteRecognizer extends BaseOracleRecognizer implements SQLD
*/
public OracleDeleteRecognizer(String originalSQL, SQLStatement ast) {
super(originalSQL);
- this.ast = (OracleDeleteStatement) ast;
+ this.ast = (OracleDeleteStatement)ast;
}
@Override
@@ -69,12 +69,13 @@ public class OracleDeleteRecognizer extends BaseOracleRecognizer implements SQLD
return false;
}
};
- visitor.visit((SQLExprTableSource) ast.getTableSource());
+ visitor.visit((SQLExprTableSource)ast.getTableSource());
return sb.toString();
}
@Override
- public String getWhereCondition(final ParametersHolder parametersHolder, final ArrayList<List<Object>> paramAppenderList) {
+ public String getWhereCondition(final ParametersHolder parametersHolder,
+ final ArrayList<List<Object>> paramAppenderList) {
SQLExpr where = ast.getWhere();
return super.getWhereCondition(where, parametersHolder, paramAppenderList);
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleInsertRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleInsertRecognizer.java
index a9b3b98ff7d81d451cc94861b55b98aa901de5fb..21eede00954c368096bbf2dc95af096d42741fb5 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleInsertRecognizer.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleInsertRecognizer.java
@@ -15,6 +15,9 @@
*/
package io.seata.rm.datasource.sql.druid.oracle;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
@@ -27,21 +30,18 @@ import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.ast.statement.SQLInsertStatement;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleInsertStatement;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor;
+
import io.seata.rm.datasource.sql.SQLInsertRecognizer;
import io.seata.rm.datasource.sql.SQLParsingException;
import io.seata.rm.datasource.sql.SQLType;
-import io.seata.rm.datasource.sql.druid.BaseRecognizer;
import io.seata.rm.datasource.sql.struct.Null;
import io.seata.rm.datasource.sql.struct.SqlMethodExpr;
import io.seata.rm.datasource.sql.struct.SqlSequenceExpr;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* The type oracle insert recognizer.
+ *
* @author ccg
- * @date 2019/3/25
*/
public class OracleInsertRecognizer extends BaseOracleRecognizer implements SQLInsertRecognizer {
@@ -55,7 +55,7 @@ public class OracleInsertRecognizer extends BaseOracleRecognizer implements SQLI
*/
public OracleInsertRecognizer(String originalSQL, SQLStatement ast) {
super(originalSQL);
- this.ast = (OracleInsertStatement) ast;
+ this.ast = (OracleInsertStatement)ast;
}
@Override
@@ -119,7 +119,7 @@ public class OracleInsertRecognizer extends BaseOracleRecognizer implements SQLI
} else if (expr instanceof SQLMethodInvokeExpr) {
row.add(new SqlMethodExpr());
} else if (expr instanceof SQLSequenceExpr) {
- SQLSequenceExpr sequenceExpr = ((SQLSequenceExpr) expr);
+ SQLSequenceExpr sequenceExpr = (SQLSequenceExpr)expr;
String sequence = sequenceExpr.getSequence().getSimpleName();
String function = sequenceExpr.getFunction().name;
row.add(new SqlSequenceExpr(sequence, function));
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleOperateRecognizerHolder.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleOperateRecognizerHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..ddabc3ca84cf0f7ebccfcb8697b05259bee7a67b
--- /dev/null
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleOperateRecognizerHolder.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.sql.druid.oracle;
+
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
+
+import io.seata.rm.datasource.sql.SQLOperateRecognizerHolder;
+import io.seata.rm.datasource.sql.SQLRecognizer;
+
+/**
+ * The Type OracleOperateRecognizerHolder
+ *
+ * @author: Zhibei Hao
+ */
+public class OracleOperateRecognizerHolder implements SQLOperateRecognizerHolder {
+ private static final String ORACLE = "oracle";
+
+ @Override
+ public SQLRecognizer getDeleteRecognizer(String sql, SQLStatement ast) {
+ return new OracleDeleteRecognizer(sql, ast);
+ }
+
+ @Override
+ public SQLRecognizer getInsertRecognizer(String sql, SQLStatement ast) {
+ return new OracleInsertRecognizer(sql, ast);
+ }
+
+ @Override
+ public SQLRecognizer getUpdateRecognizer(String sql, SQLStatement ast) {
+ return new OracleUpdateRecognizer(sql, ast);
+ }
+
+ @Override
+ public SQLRecognizer getSelectForUpdateRecognizer(String sql, SQLStatement ast) {
+ if (((SQLSelectStatement) ast).getSelect().getFirstQueryBlock().isForUpdate()) {
+ return new OracleSelectForUpdateRecognizer(sql, ast);
+ }
+ return null;
+ }
+
+ @Override
+ public String getDbType() {
+ return ORACLE;
+ }
+}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleSelectForUpdateRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleSelectForUpdateRecognizer.java
index 8241a1299a0ed619c52e07c0eed5a41119163647..9f773bed78c9afd353c57a3233b42366adb16bb3 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleSelectForUpdateRecognizer.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleSelectForUpdateRecognizer.java
@@ -23,6 +23,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.ast.statement.SQLTableSource;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor;
+
import io.seata.rm.datasource.ParametersHolder;
import io.seata.rm.datasource.sql.SQLParsingException;
import io.seata.rm.datasource.sql.SQLSelectRecognizer;
@@ -35,7 +36,6 @@ import java.util.List;
* The type oracle select for update recognizer.
*
* @author ccg
- * @date 2019/3/25
*/
public class OracleSelectForUpdateRecognizer extends BaseOracleRecognizer implements SQLSelectRecognizer {
@@ -50,7 +50,7 @@ public class OracleSelectForUpdateRecognizer extends BaseOracleRecognizer implem
*/
public OracleSelectForUpdateRecognizer(String originalSQL, SQLStatement ast) {
super(originalSQL);
- this.ast = (SQLSelectStatement) ast;
+ this.ast = (SQLSelectStatement)ast;
}
@Override
@@ -59,7 +59,8 @@ public class OracleSelectForUpdateRecognizer extends BaseOracleRecognizer implem
}
@Override
- public String getWhereCondition(final ParametersHolder parametersHolder, final ArrayList<List<Object>> paramAppenderList) {
+ public String getWhereCondition(final ParametersHolder parametersHolder,
+ final ArrayList<List<Object>> paramAppenderList) {
SQLSelectQueryBlock selectQueryBlock = getSelect();
SQLExpr where = selectQueryBlock.getWhere();
return super.getWhereCondition(where, parametersHolder, paramAppenderList);
@@ -104,7 +105,7 @@ public class OracleSelectForUpdateRecognizer extends BaseOracleRecognizer implem
return false;
}
};
- visitor.visit((SQLExprTableSource) tableSource);
+ visitor.visit((SQLExprTableSource)tableSource);
return sb.toString();
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleUpdateRecognizer.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleUpdateRecognizer.java
index 7c5d2afb9c1329499f67a4e2a4a2d92eff384b7c..c30ba4afaaafede7ea1d220aa23d7fd5d0502ffa 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleUpdateRecognizer.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/druid/oracle/OracleUpdateRecognizer.java
@@ -15,6 +15,9 @@
*/
package io.seata.rm.datasource.sql.druid.oracle;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
@@ -25,19 +28,16 @@ import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleUpdateStatement;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleOutputVisitor;
+
import io.seata.rm.datasource.ParametersHolder;
import io.seata.rm.datasource.sql.SQLParsingException;
import io.seata.rm.datasource.sql.SQLType;
import io.seata.rm.datasource.sql.SQLUpdateRecognizer;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* The type oracle update recognizer.
*
* @author ccg
- * @date 2019/3/25
*/
public class OracleUpdateRecognizer extends BaseOracleRecognizer implements SQLUpdateRecognizer {
@@ -51,7 +51,7 @@ public class OracleUpdateRecognizer extends BaseOracleRecognizer implements SQLU
*/
public OracleUpdateRecognizer(String originalSQL, SQLStatement ast) {
super(originalSQL);
- this.ast = (OracleUpdateStatement) ast;
+ this.ast = (OracleUpdateStatement)ast;
}
@Override
@@ -66,12 +66,12 @@ public class OracleUpdateRecognizer extends BaseOracleRecognizer implements SQLU
for (SQLUpdateSetItem updateSetItem : updateSetItems) {
SQLExpr expr = updateSetItem.getColumn();
if (expr instanceof SQLIdentifierExpr) {
- list.add(((SQLIdentifierExpr) expr).getName());
+ list.add(((SQLIdentifierExpr)expr).getName());
} else if (expr instanceof SQLPropertyExpr) {
// This is alias case, like UPDATE xxx_tbl a SET a.name = ? WHERE a.id = ?
- SQLExpr owner = ((SQLPropertyExpr) expr).getOwner();
+ SQLExpr owner = ((SQLPropertyExpr)expr).getOwner();
if (owner instanceof SQLIdentifierExpr) {
- list.add((((SQLIdentifierExpr) owner).getName() + "." + ((SQLPropertyExpr) expr).getName()));
+ list.add(((SQLIdentifierExpr)owner).getName() + "." + ((SQLPropertyExpr)expr).getName());
}
} else {
throw new SQLParsingException("Unknown SQLExpr: " + expr.getClass() + " " + expr);
@@ -87,7 +87,7 @@ public class OracleUpdateRecognizer extends BaseOracleRecognizer implements SQLU
for (SQLUpdateSetItem updateSetItem : updateSetItems) {
SQLExpr expr = updateSetItem.getValue();
if (expr instanceof SQLValuableExpr) {
- list.add(((SQLValuableExpr) expr).getValue());
+ list.add(((SQLValuableExpr)expr).getValue());
} else if (expr instanceof SQLVariantRefExpr) {
list.add(new VMarker());
} else {
@@ -98,7 +98,8 @@ public class OracleUpdateRecognizer extends BaseOracleRecognizer implements SQLU
}
@Override
- public String getWhereCondition(final ParametersHolder parametersHolder, final ArrayList<List<Object>> paramAppenderList) {
+ public String getWhereCondition(final ParametersHolder parametersHolder,
+ final ArrayList<List<Object>> paramAppenderList) {
SQLExpr where = ast.getWhere();
return super.getWhereCondition(where, parametersHolder, paramAppenderList);
}
@@ -125,7 +126,7 @@ public class OracleUpdateRecognizer extends BaseOracleRecognizer implements SQLU
return false;
}
};
- SQLExprTableSource tableSource = (SQLExprTableSource) ast.getTableSource();
+ SQLExprTableSource tableSource = (SQLExprTableSource)ast.getTableSource();
visitor.visit(tableSource);
return sb.toString();
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/ColumnMeta.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/ColumnMeta.java
index 05c1f6e6439a8c5341727f38c267b66c62bbf7e8..4540abc423e3650775e111660796a34b4c1e6444 100755
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/ColumnMeta.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/ColumnMeta.java
@@ -108,6 +108,14 @@ public class ColumnMeta {
this.tableSchemaName = tableSchemaName;
}
+ /**
+ * Gets table schema name
+ * @return
+ */
+ protected String getTableSchemaName() {
+ return tableSchemaName;
+ }
+
/**
* Sets table name.
*
@@ -117,6 +125,15 @@ public class ColumnMeta {
this.tableName = tableName;
}
+
+ /**
+ * Gets table name
+ * @return
+ */
+ protected String getTableName() {
+ return tableName;
+ }
+
/**
* Gets column name.
*
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/IndexMeta.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/IndexMeta.java
index 227eb223c7153fa6c4c5c9744726329d7e53977d..6d1618c25524706435e5e4cf3af12a664209d3a9 100755
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/IndexMeta.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/IndexMeta.java
@@ -206,15 +206,6 @@ public class IndexMeta {
this.indextype = indextype;
}
- /**
- * Gets indexvalue.
- *
- * @return the indexvalue
- */
- public List<ColumnMeta> getIndexvalue() {
- return values;
- }
-
@Override
public boolean equals(Object o) {
if (this == o) {
@@ -223,7 +214,7 @@ public class IndexMeta {
if (!(o instanceof IndexMeta)) {
return false;
}
- IndexMeta indexMeta = (IndexMeta) o;
+ IndexMeta indexMeta = (IndexMeta)o;
if (!ArrayUtils.isEquals(indexMeta.values, this.values)) {
return false;
}
@@ -245,7 +236,7 @@ public class IndexMeta {
if (!Objects.equals(indexMeta.ascOrDesc, this.ascOrDesc)) {
return false;
}
- if (!Objects.equals(indexMeta.ordinalPosition, this.ordinalPosition)){
+ if (!Objects.equals(indexMeta.ordinalPosition, this.ordinalPosition)) {
return false;
}
return true;
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMeta.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMeta.java
index c6e5983627d0fa1b4de993d0fc2db3317321524d..b5ee6ff11dd696a139f4fbfc2ed6d8c33bd394ef 100755
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMeta.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMeta.java
@@ -25,6 +25,7 @@ import java.util.Objects;
import io.seata.common.exception.NotSupportYetException;
import io.seata.common.util.CollectionUtils;
+import io.seata.rm.datasource.ColumnUtils;
/**
* The type Table meta.
@@ -34,7 +35,13 @@ import io.seata.common.util.CollectionUtils;
public class TableMeta {
private String tableName;
+ /**
+ * key: column name
+ */
private Map<String, ColumnMeta> allColumns = new LinkedHashMap<String, ColumnMeta>();
+ /**
+ * key: index name
+ */
private Map<String, IndexMeta> allIndexes = new LinkedHashMap<String, IndexMeta>();
/**
@@ -62,15 +69,7 @@ public class TableMeta {
* @return the column meta
*/
public ColumnMeta getColumnMeta(String colName) {
- ColumnMeta col = allColumns.get(colName);
- if (col == null) {
- if (colName.charAt(0) == '`') {
- col = allColumns.get(colName.substring(1, colName.length() - 1));
- } else {
- col = allColumns.get("`" + colName + "`");
- }
- }
- return col;
+ return allColumns.get(colName);
}
/**
@@ -124,7 +123,10 @@ public class TableMeta {
}
if (pk.size() > 1) {
- throw new NotSupportYetException("Multi PK");
+ throw new NotSupportYetException(String.format("%s contains multi PK, but current not support.", tableName));
+ }
+ if (pk.size() < 1) {
+ throw new NotSupportYetException(String.format("%s needs to contain the primary key.", tableName));
}
return pk;
@@ -153,6 +155,15 @@ public class TableMeta {
return getPrimaryKeyOnlyName().get(0);
}
+ /**
+ * Gets add escape pk name.
+ * @param dbType
+ * @return
+ */
+ public String getEscapePkName(String dbType) {
+ return ColumnUtils.addEscape(getPkName(), dbType);
+ }
+
/**
* Contains pk boolean.
*
@@ -176,81 +187,6 @@ public class TableMeta {
}
}
- /**
- * Gets create table sql.
- *
- * @return the create table sql
- */
- public String getCreateTableSQL() {
- StringBuilder sb = new StringBuilder("CREATE TABLE");
- sb.append(String.format(" `%s` ", getTableName()));
- sb.append("(");
-
- boolean flag = true;
- Map<String, ColumnMeta> allColumns = getAllColumns();
- for (Entry<String, ColumnMeta> entry : allColumns.entrySet()) {
- if (flag) {
- flag = false;
- } else {
- sb.append(",");
- }
-
- ColumnMeta col = entry.getValue();
- sb.append(String.format(" `%s` ", col.getColumnName()));
- sb.append(col.getDataTypeName());
- if (col.getColumnSize() > 0) {
- sb.append(String.format("(%d)", col.getColumnSize()));
- }
-
- if (col.getColumnDef() != null && col.getColumnDef().length() > 0) {
- sb.append(String.format(" default '%s'", col.getColumnDef()));
- }
-
- if (col.getIsNullAble() != null && col.getIsNullAble().length() > 0) {
- sb.append(" ");
- sb.append(col.getIsNullAble());
- }
- }
-
- Map<String, IndexMeta> allIndexes = getAllIndexes();
- for (Entry<String, IndexMeta> entry : allIndexes.entrySet()) {
- sb.append(", ");
-
- IndexMeta index = entry.getValue();
- switch (index.getIndextype()) {
- case FullText:
- break;
- case Normal:
- sb.append(String.format("KEY `%s`", index.getIndexName()));
- break;
- case PRIMARY:
- sb.append("PRIMARY KEY");
- break;
- case Unique:
- sb.append(String.format("UNIQUE KEY `%s`", index.getIndexName()));
- break;
- default:
- break;
- }
-
- sb.append(" (");
- boolean f = true;
- for (ColumnMeta c : index.getValues()) {
- if (f) {
- f = false;
- } else {
- sb.append(",");
- }
-
- sb.append(String.format("`%s`", c.getColumnName()));
- }
- sb.append(")");
- }
- sb.append(")");
-
- return sb.toString();
- }
-
@Override
public boolean equals(Object o) {
if (this == o) {
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCache.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCache.java
index 273a1cf7c77f1b1c6696b4c6ff9e7f9538ca44fd..e0185e3231aab75899eb935938ec6cbf635354dd 100755
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCache.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCache.java
@@ -15,7 +15,7 @@
*/
package io.seata.rm.datasource.sql.struct;
-import io.seata.rm.datasource.DataSourceProxy;
+import java.sql.Connection;
/**
* The type Table meta cache.
@@ -28,17 +28,19 @@ public interface TableMetaCache {
/**
* Gets table meta.
*
- * @param dataSourceProxy the druid data source
+ * @param connection
* @param tableName the table name
+ * @param resourceId
* @return the table meta
*/
- TableMeta getTableMeta(DataSourceProxy dataSourceProxy, String tableName);
+ TableMeta getTableMeta(Connection connection, String tableName, String resourceId);
/**
* Clear the table meta cache
*
- * @param dataSourceProxy
+ * @param connection
+ * @param resourceId
*/
- void refresh(DataSourceProxy dataSourceProxy);
+ void refresh(Connection connection, String resourceId);
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCacheFactory.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCacheFactory.java
index c02f63e4ea2a06a3902386c8e81a90d732343ca2..f75b37ccbeae11030a378e76703077bb80f0e9d1 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCacheFactory.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableMetaCacheFactory.java
@@ -23,7 +23,6 @@ import io.seata.rm.datasource.sql.struct.cache.OracleTableMetaCache;
/**
* @author guoyao
- * @date 2019-10-11
*/
public class TableMetaCacheFactory {
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableRecords.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableRecords.java
index b0ad53c1844fcf6ea6b85694f8c97d6c43a8a283..13303be926fb34726f6d4758b3850585dc7affd4 100755
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableRecords.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/TableRecords.java
@@ -15,8 +15,6 @@
*/
package io.seata.rm.datasource.sql.struct;
-import io.seata.common.exception.ShouldNeverHappenException;
-
import java.sql.Blob;
import java.sql.Clob;
import java.sql.JDBCType;
@@ -29,6 +27,8 @@ import java.util.List;
import javax.sql.rowset.serial.SerialBlob;
import javax.sql.rowset.serial.SerialClob;
+import io.seata.common.exception.ShouldNeverHappenException;
+
/**
* The type Table records.
*
@@ -198,7 +198,7 @@ public class TableRecords {
} else if (col.getDataType() == JDBCType.CLOB.getVendorTypeNumber()) {
Clob clob = resultSet.getClob(i);
- if (clob != null){
+ if (clob != null) {
field.setValue(new SerialClob(clob));
}
} else {
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/AbstractTableMetaCache.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/AbstractTableMetaCache.java
index a3e0e02b7a23a82f82f454bf150f32987f0774df..a50a395119a69e02a53b4ce386595dad31d8f769 100755
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/AbstractTableMetaCache.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/AbstractTableMetaCache.java
@@ -15,23 +15,22 @@
*/
package io.seata.rm.datasource.sql.struct.cache;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import io.seata.common.exception.ShouldNeverHappenException;
import io.seata.common.util.StringUtils;
import io.seata.core.context.RootContext;
-import io.seata.rm.datasource.DataSourceProxy;
import io.seata.rm.datasource.sql.struct.TableMeta;
import io.seata.rm.datasource.sql.struct.TableMetaCache;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.sql.DataSource;
-import java.sql.SQLException;
-import java.util.Map;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
-
/**
* The type Table meta cache.
*
@@ -50,16 +49,16 @@ public abstract class AbstractTableMetaCache implements TableMetaCache {
@Override
- public TableMeta getTableMeta(final DataSourceProxy dataSourceProxy, final String tableName) {
+ public TableMeta getTableMeta(final Connection connection, final String tableName, String resourceId) {
if (StringUtils.isNullOrEmpty(tableName)) {
throw new IllegalArgumentException("TableMeta cannot be fetched without tableName");
}
TableMeta tmeta;
- final String key = getCacheKey(dataSourceProxy, tableName);
+ final String key = getCacheKey(connection, tableName, resourceId);
tmeta = TABLE_META_CACHE.get(key, mappingFunction -> {
try {
- return fetchSchema(dataSourceProxy.getTargetDataSource(), tableName);
+ return fetchSchema(connection, tableName);
} catch (SQLException e) {
LOGGER.error("get cache error:{}", e.getMessage(), e);
return null;
@@ -68,7 +67,7 @@ public abstract class AbstractTableMetaCache implements TableMetaCache {
if (tmeta == null) {
try {
- tmeta = fetchSchema(dataSourceProxy.getTargetDataSource(), tableName);
+ tmeta = fetchSchema(connection, tableName);
} catch (SQLException e) {
LOGGER.error("get table meta error:{}", e.getMessage(), e);
}
@@ -81,13 +80,13 @@ public abstract class AbstractTableMetaCache implements TableMetaCache {
}
@Override
- public void refresh(final DataSourceProxy dataSourceProxy) {
+ public void refresh(final Connection connection, String resourceId) {
ConcurrentMap<String, TableMeta> tableMetaMap = TABLE_META_CACHE.asMap();
for (Map.Entry<String, TableMeta> entry : tableMetaMap.entrySet()) {
- String key = getCacheKey(dataSourceProxy, entry.getValue().getTableName());
+ String key = getCacheKey(connection, entry.getValue().getTableName(), resourceId);
if (entry.getKey().equals(key)) {
try {
- TableMeta tableMeta = fetchSchema(dataSourceProxy, entry.getValue().getTableName());
+ TableMeta tableMeta = fetchSchema(connection, entry.getValue().getTableName());
if (!tableMeta.equals(entry.getValue())) {
TABLE_META_CACHE.put(entry.getKey(), tableMeta);
LOGGER.info("table meta change was found, update table meta cache automatically.");
@@ -103,22 +102,21 @@ public abstract class AbstractTableMetaCache implements TableMetaCache {
/**
* generate cache key
*
- * @param dataSourceProxy
+ * @param connection
* @param tableName
+ * @param resourceId
* @return
*/
- private String getCacheKey(DataSourceProxy dataSourceProxy, String tableName) {
- return dataSourceProxy.getResourceId() + "." + tableName;
- }
+ protected abstract String getCacheKey(Connection connection, String tableName, String resourceId);
/**
* get scheme from datasource and tableName
*
- * @param dataSource
+ * @param connection
* @param tableName
* @return
* @throws SQLException
*/
- protected abstract TableMeta fetchSchema(DataSource dataSource, String tableName) throws SQLException;
+ protected abstract TableMeta fetchSchema(Connection connection, String tableName) throws SQLException;
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/MysqlTableMetaCache.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/MysqlTableMetaCache.java
index d67598369c72abadcf29dbe820037db34b31a966..99a35a561bc015a2c8654ae58d74a40ab5be13a6 100755
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/MysqlTableMetaCache.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/MysqlTableMetaCache.java
@@ -15,6 +15,13 @@
*/
package io.seata.rm.datasource.sql.struct.cache;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
+import java.sql.Statement;
+
import com.alibaba.druid.util.JdbcConstants;
import io.seata.common.exception.ShouldNeverHappenException;
import io.seata.rm.datasource.sql.struct.ColumnMeta;
@@ -24,14 +31,8 @@ import io.seata.rm.datasource.sql.struct.TableMeta;
import io.seata.rm.datasource.sql.struct.TableMetaCache;
import io.seata.rm.datasource.undo.KeywordChecker;
import io.seata.rm.datasource.undo.KeywordCheckerFactory;
-
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Statement;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The type Table meta cache.
@@ -40,6 +41,8 @@ import java.sql.Statement;
*/
public class MysqlTableMetaCache extends AbstractTableMetaCache {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MysqlTableMetaCache.class);
+
private static KeywordChecker keywordChecker = KeywordCheckerFactory.getKeywordChecker(JdbcConstants.MYSQL);
private static volatile TableMetaCache tableMetaCache = null;
@@ -64,21 +67,50 @@ public class MysqlTableMetaCache extends AbstractTableMetaCache {
}
@Override
- protected TableMeta fetchSchema(DataSource dataSource, String tableName) throws SQLException {
- Connection conn = null;
+ protected String getCacheKey(Connection connection, String tableName, String resourceId) {
+ StringBuilder cacheKey = new StringBuilder(resourceId);
+ cacheKey.append(".");
+ //remove single quote and separate it to catalogName and tableName
+ String[] tableNameWithCatalog = tableName.replace("`", "").split("\\.");
+ String defaultTableName = tableNameWithCatalog.length > 1 ? tableNameWithCatalog[1] : tableNameWithCatalog[0];
+
+ DatabaseMetaData databaseMetaData = null;
+ try {
+ databaseMetaData = connection.getMetaData();
+ } catch (SQLException e) {
+ LOGGER.error("Could not get connection, use default cache key", e.getMessage(), e);
+ return cacheKey.append(defaultTableName).toString();
+ }
+
+ try {
+ //prevent duplicated cache key
+ if (databaseMetaData.supportsMixedCaseIdentifiers()) {
+ cacheKey.append(defaultTableName);
+ } else {
+ cacheKey.append(defaultTableName.toLowerCase());
+ }
+ } catch (SQLException e) {
+ LOGGER.error("Could not get supportsMixedCaseIdentifiers in connection metadata, use default cache key", e.getMessage(), e);
+ return cacheKey.append(defaultTableName).toString();
+ }
+
+ return cacheKey.toString();
+ }
+
+ @Override
+ protected TableMeta fetchSchema(Connection connection, String tableName) throws SQLException {
Statement stmt = null;
ResultSet rs = null;
try {
- conn = dataSource.getConnection();
- stmt = conn.createStatement();
+ stmt = connection.createStatement();
StringBuilder builder = new StringBuilder("SELECT * FROM ");
builder.append(keywordChecker.checkAndReplace(tableName));
builder.append(" LIMIT 1");
rs = stmt.executeQuery(builder.toString());
ResultSetMetaData rsmd = rs.getMetaData();
- DatabaseMetaData dbmd = conn.getMetaData();
+ DatabaseMetaData dbmd = connection.getMetaData();
- return resultSetMetaToSchema(rsmd, dbmd, tableName);
+ return resultSetMetaToSchema(rsmd, dbmd);
} catch (Exception e) {
if (e instanceof SQLException) {
throw e;
@@ -92,20 +124,34 @@ public class MysqlTableMetaCache extends AbstractTableMetaCache {
if (stmt != null) {
stmt.close();
}
- if (conn != null) {
- conn.close();
- }
}
}
- private TableMeta resultSetMetaToSchema(ResultSetMetaData rsmd, DatabaseMetaData dbmd, String tableName)
+ private TableMeta resultSetMetaToSchema(ResultSetMetaData rsmd, DatabaseMetaData dbmd)
throws SQLException {
+ //always "" for mysql
String schemaName = rsmd.getSchemaName(1);
String catalogName = rsmd.getCatalogName(1);
+ /*
+ * use ResultSetMetaData to get the pure table name
+ * can avoid the problem below
+ *
+ * select * from account_tbl
+ * select * from account_TBL
+ * select * from `account_tbl`
+ * select * from account.account_tbl
+ */
+ String tableName = rsmd.getTableName(1);
TableMeta tm = new TableMeta();
tm.setTableName(tableName);
+ /*
+ * here has two different type to get the data
+ * make sure the table name was right
+ * 1. show full columns from xxx from xxx(normal)
+ * 2. select xxx from xxx where catalog_name like ? and table_name like ?(informationSchema=true)
+ */
ResultSet rsColumns = dbmd.getColumns(catalogName, schemaName, tableName, "%");
ResultSet rsIndex = dbmd.getIndexInfo(catalogName, schemaName, tableName, false, true);
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/OracleTableMetaCache.java b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/OracleTableMetaCache.java
index a772599787501d6c9466901c2a015e7af3b79fac..b534714a33b394547e779ef2cb5f1b0ebc04be28 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/OracleTableMetaCache.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/sql/struct/cache/OracleTableMetaCache.java
@@ -15,6 +15,11 @@
*/
package io.seata.rm.datasource.sql.struct.cache;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
import io.seata.common.exception.ShouldNeverHappenException;
import io.seata.common.util.StringUtils;
import io.seata.rm.datasource.sql.struct.ColumnMeta;
@@ -23,12 +28,6 @@ import io.seata.rm.datasource.sql.struct.IndexType;
import io.seata.rm.datasource.sql.struct.TableMeta;
import io.seata.rm.datasource.sql.struct.TableMetaCache;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-
/**
* The type Table meta cache.
*
@@ -58,13 +57,31 @@ public class OracleTableMetaCache extends AbstractTableMetaCache {
}
@Override
- protected TableMeta fetchSchema(DataSource dataSource, String tableName) throws SQLException {
- Connection conn = null;
+ protected String getCacheKey(Connection connection, String tableName, String resourceId) {
+ StringBuilder cacheKey = new StringBuilder(resourceId);
+ cacheKey.append(".");
+
+ //separate it to schemaName and tableName
+ String[] tableNameWithSchema = tableName.split("\\.");
+ String defaultTableName = tableNameWithSchema.length > 1 ? tableNameWithSchema[1] : tableNameWithSchema[0];
+
+ //oracle does not implement supportsMixedCaseIdentifiers in DatabaseMetadata
+ if (defaultTableName.contains("\"")) {
+ cacheKey.append(defaultTableName.replace("\"", ""));
+ } else {
+ // oracle default store in upper case
+ cacheKey.append(defaultTableName.toUpperCase());
+ }
+
+ return cacheKey.toString();
+ }
+
+ @Override
+ protected TableMeta fetchSchema(Connection connection, String tableName) throws SQLException {
java.sql.Statement stmt = null;
try {
- conn = dataSource.getConnection();
- stmt = conn.createStatement();
- DatabaseMetaData dbmd = conn.getMetaData();
+ stmt = connection.createStatement();
+ DatabaseMetaData dbmd = connection.getMetaData();
return resultSetMetaToSchema(dbmd, tableName);
} catch (Exception e) {
if (e instanceof SQLException) {
@@ -76,9 +93,6 @@ public class OracleTableMetaCache extends AbstractTableMetaCache {
if (stmt != null) {
stmt.close();
}
- if (conn != null) {
- conn.close();
- }
}
}
@@ -88,10 +102,10 @@ public class OracleTableMetaCache extends AbstractTableMetaCache {
String[] schemaTable = tableName.split("\\.");
String schemaName = schemaTable.length > 1 ? schemaTable[0] : dbmd.getUserName();
tableName = schemaTable.length > 1 ? schemaTable[1] : tableName;
- if(tableName.contains("\"")){
+ if (tableName.contains("\"")) {
tableName = tableName.replace("\"", "");
schemaName = schemaName.replace("\"", "");
- }else{
+ } else {
tableName = tableName.toUpperCase();
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/AbstractUndoExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/AbstractUndoExecutor.java
index 9ae760db92736cdda13fc36eb69397ee1ff98093..ec5be0acb97c43b2dffba27c8dc2ab66ad50719e 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/AbstractUndoExecutor.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/AbstractUndoExecutor.java
@@ -15,11 +15,14 @@
*/
package io.seata.rm.datasource.undo;
+import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.fastjson.JSON;
+import io.seata.common.util.IOUtil;
import io.seata.common.util.StringUtils;
import io.seata.config.ConfigurationFactory;
import io.seata.core.constants.ConfigurationKeys;
import io.seata.core.model.Result;
+import io.seata.rm.datasource.ColumnUtils;
import io.seata.rm.datasource.DataCompareUtils;
import io.seata.rm.datasource.sql.struct.Field;
import io.seata.rm.datasource.sql.struct.KeyType;
@@ -167,6 +170,8 @@ public abstract class AbstractUndoExecutor {
} else {
undoPST.setObject(undoIndex, null);
}
+ } else if (undoValue.getType() == JDBCType.OTHER.getVendorTypeNumber()) {
+ undoPST.setObject(undoIndex, undoValue.getValue());
} else {
undoPST.setObject(undoIndex, undoValue.getValue(), undoValue.getType());
}
@@ -267,8 +272,9 @@ public abstract class AbstractUndoExecutor {
replace.append("?,");
}
// build check sql
- String checkSQL = String.format(CHECK_SQL_TEMPLATE, sqlUndoLog.getTableName(), pkName,
- replace.substring(0, replace.length() - 1));
+ String dbType = getDbType(conn);
+ String checkSQL = String.format(CHECK_SQL_TEMPLATE, ColumnUtils.addEscape(sqlUndoLog.getTableName(), dbType),
+ tableMeta.getEscapePkName(dbType), replace.substring(0, replace.length() - 1));
PreparedStatement statement = null;
ResultSet checkSet = null;
@@ -281,18 +287,7 @@ public abstract class AbstractUndoExecutor {
checkSet = statement.executeQuery();
currentRecords = TableRecords.buildRecords(tableMeta, checkSet);
} finally {
- if (checkSet != null) {
- try {
- checkSet.close();
- } catch (Exception e) {
- }
- }
- if (statement != null) {
- try {
- statement.close();
- } catch (Exception e) {
- }
- }
+ IOUtil.close(checkSet, statement);
}
return currentRecords;
}
@@ -319,4 +314,15 @@ public abstract class AbstractUndoExecutor {
}
return pkValues;
}
+
+ /**
+ * Get db type
+ * @param conn the connection
+ * @return the db type
+ * @throws SQLException
+ */
+ protected String getDbType(Connection conn) throws SQLException {
+ return JdbcUtils.getDbType(conn.getMetaData().getURL(), null);
+ }
+
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/AbstractUndoLogManager.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/AbstractUndoLogManager.java
index 87c53e4af4cf42b11f49d2b5585b3061a3e29070..f6739a1aeba88d7f2400f8cabae92e117986a9f3 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/AbstractUndoLogManager.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/AbstractUndoLogManager.java
@@ -47,7 +47,6 @@ import static io.seata.core.exception.TransactionExceptionCode.BranchRollbackFai
/**
* @author jsbxyyx
- * @date 2019/09/07
*/
public abstract class AbstractUndoLogManager implements UndoLogManager {
@@ -75,14 +74,15 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
}
}
- protected static final String UNDO_LOG_TABLE_NAME = ConfigurationFactory.getInstance()
- .getConfig(ConfigurationKeys.TRANSACTION_UNDO_LOG_TABLE, ConfigurationKeys.TRANSACTION_UNDO_LOG_DEFAULT_TABLE);
+ protected static final String UNDO_LOG_TABLE_NAME = ConfigurationFactory.getInstance().getConfig(
+ ConfigurationKeys.TRANSACTION_UNDO_LOG_TABLE, ConfigurationKeys.TRANSACTION_UNDO_LOG_DEFAULT_TABLE);
- protected static final String SELECT_UNDO_LOG_SQL = "SELECT * FROM " + UNDO_LOG_TABLE_NAME +
- " WHERE " + ClientTableColumnsName.UNDO_LOG_BRANCH_XID + " = ? AND " + ClientTableColumnsName.UNDO_LOG_XID + " = ? FOR UPDATE";
+ protected static final String SELECT_UNDO_LOG_SQL = "SELECT * FROM " + UNDO_LOG_TABLE_NAME + " WHERE "
+ + ClientTableColumnsName.UNDO_LOG_BRANCH_XID + " = ? AND " + ClientTableColumnsName.UNDO_LOG_XID
+ + " = ? FOR UPDATE";
- protected static final String DELETE_UNDO_LOG_SQL = "DELETE FROM " + UNDO_LOG_TABLE_NAME +
- " WHERE " + ClientTableColumnsName.UNDO_LOG_BRANCH_XID + " = ? AND " + ClientTableColumnsName.UNDO_LOG_XID + " = ?";
+ protected static final String DELETE_UNDO_LOG_SQL = "DELETE FROM " + UNDO_LOG_TABLE_NAME + " WHERE "
+ + ClientTableColumnsName.UNDO_LOG_BRANCH_XID + " = ? AND " + ClientTableColumnsName.UNDO_LOG_XID + " = ?";
private static final ThreadLocal<String> SERIALIZER_LOCAL = new ThreadLocal<>();
@@ -100,6 +100,7 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
/**
* get db type
+ *
* @return the db type
*/
public abstract String getDbType();
@@ -124,7 +125,7 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
if (!(e instanceof SQLException)) {
e = new SQLException(e);
}
- throw (SQLException) e;
+ throw (SQLException)e;
} finally {
if (deletePST != null) {
deletePST.close();
@@ -152,20 +153,20 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
deletePST = conn.prepareStatement(batchDeleteSql);
int paramsIndex = 1;
for (Long branchId : branchIds) {
- deletePST.setLong(paramsIndex++,branchId);
+ deletePST.setLong(paramsIndex++, branchId);
}
- for (String xid: xids){
+ for (String xid : xids) {
deletePST.setString(paramsIndex++, xid);
}
int deleteRows = deletePST.executeUpdate();
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("batch delete undo log size " + deleteRows);
+ LOGGER.debug("batch delete undo log size {}", deleteRows);
}
- }catch (Exception e){
+ } catch (Exception e) {
if (!(e instanceof SQLException)) {
e = new SQLException(e);
}
- throw (SQLException) e;
+ throw (SQLException)e;
} finally {
if (deletePST != null) {
deletePST.close();
@@ -176,11 +177,10 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
protected static String toBatchDeleteUndoLogSql(int xidSize, int branchIdSize) {
StringBuilder sqlBuilder = new StringBuilder(64);
- sqlBuilder.append("DELETE FROM ")
- .append(UNDO_LOG_TABLE_NAME)
- .append(" WHERE " + ClientTableColumnsName.UNDO_LOG_BRANCH_XID + " IN ");
+ sqlBuilder.append("DELETE FROM ").append(UNDO_LOG_TABLE_NAME).append(" WHERE ").append(
+ ClientTableColumnsName.UNDO_LOG_BRANCH_XID).append(" IN ");
appendInParam(branchIdSize, sqlBuilder);
- sqlBuilder.append(" AND " + ClientTableColumnsName.UNDO_LOG_XID + " IN ");
+ sqlBuilder.append(" AND ").append(ClientTableColumnsName.UNDO_LOG_XID).append(" IN ");
appendInParam(xidSize, sqlBuilder);
return sqlBuilder.toString();
}
@@ -235,11 +235,10 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
}
insertUndoLogWithNormal(xid, branchID, buildContext(parser.getName()), undoLogContent,
- cp.getTargetConnection());
+ cp.getTargetConnection());
}
/**
- *
* Undo.
*
* @param dataSourceProxy the data source proxy
@@ -279,8 +278,7 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
int state = rs.getInt(ClientTableColumnsName.UNDO_LOG_LOG_STATUS);
if (!canUndo(state)) {
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("xid {} branch {}, ignore {} undo_log",
- xid, branchId, state);
+ LOGGER.info("xid {} branch {}, ignore {} undo_log", xid, branchId, state);
}
return;
}
@@ -291,8 +289,8 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
byte[] rollbackInfo = BlobUtils.blob2Bytes(b);
String serializer = context == null ? null : context.get(UndoLogConstants.SERIALIZER_KEY);
- UndoLogParser parser = serializer == null ? UndoLogParserFactory.getInstance() :
- UndoLogParserFactory.getInstance(serializer);
+ UndoLogParser parser = serializer == null ? UndoLogParserFactory.getInstance()
+ : UndoLogParserFactory.getInstance(serializer);
BranchUndoLog branchUndoLog = parser.decode(rollbackInfo);
try {
@@ -303,11 +301,11 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
Collections.reverse(sqlUndoLogs);
}
for (SQLUndoLog sqlUndoLog : sqlUndoLogs) {
- TableMeta tableMeta = TableMetaCacheFactory.getTableMetaCache(dataSourceProxy).getTableMeta(dataSourceProxy, sqlUndoLog.getTableName());
+ TableMeta tableMeta = TableMetaCacheFactory.getTableMetaCache(dataSourceProxy).getTableMeta(
+ conn, sqlUndoLog.getTableName(),dataSourceProxy.getResourceId());
sqlUndoLog.setTableMeta(tableMeta);
AbstractUndoExecutor undoExecutor = UndoExecutorFactory.getUndoExecutor(
- dataSourceProxy.getDbType(),
- sqlUndoLog);
+ dataSourceProxy.getDbType(), sqlUndoLog);
undoExecutor.executeOn(conn);
}
} finally {
@@ -329,15 +327,15 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
deleteUndoLog(xid, branchId, conn);
conn.commit();
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("xid {} branch {}, undo_log deleted with {}",
- xid, branchId, State.GlobalFinished.name());
+ LOGGER.info("xid {} branch {}, undo_log deleted with {}", xid, branchId,
+ State.GlobalFinished.name());
}
} else {
insertUndoLogWithGlobalFinished(xid, branchId, UndoLogParserFactory.getInstance(), conn);
conn.commit();
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("xid {} branch {}, undo_log added with {}",
- xid, branchId, State.GlobalFinished.name());
+ LOGGER.info("xid {} branch {}, undo_log added with {}", xid, branchId,
+ State.GlobalFinished.name());
}
}
@@ -345,8 +343,7 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
} catch (SQLIntegrityConstraintViolationException e) {
// Possible undo_log has been inserted into the database by other processes, retrying rollback undo_log
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("xid {} branch {}, undo_log inserted, retry rollback",
- xid, branchId);
+ LOGGER.info("xid {} branch {}, undo_log inserted, retry rollback", xid, branchId);
}
} catch (Throwable e) {
if (conn != null) {
@@ -356,8 +353,9 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
LOGGER.warn("Failed to close JDBC resource while undo ... ", rollbackEx);
}
}
- throw new BranchTransactionException(BranchRollbackFailed_Retriable,
- String.format("Branch session rollback failed and try again later xid = %s branchId = %s %s", xid, branchId, e.getMessage()), e);
+ throw new BranchTransactionException(BranchRollbackFailed_Retriable, String
+ .format("Branch session rollback failed and try again later xid = %s branchId = %s %s", xid,
+ branchId, e.getMessage()), e);
} finally {
try {
@@ -381,23 +379,27 @@ public abstract class AbstractUndoLogManager implements UndoLogManager {
}
/**
- * insert uodo log when global finished
- * @param xid the xid
- * @param branchId the branchId
+ * insert uodo log when global finished
+ *
+ * @param xid the xid
+ * @param branchId the branchId
* @param undoLogParser the undoLogParse
- * @param conn sql connection
+ * @param conn sql connection
* @throws SQLException
*/
- protected abstract void insertUndoLogWithGlobalFinished(String xid, long branchId, UndoLogParser undoLogParser, Connection conn) throws SQLException;
+ protected abstract void insertUndoLogWithGlobalFinished(String xid, long branchId, UndoLogParser undoLogParser,
+ Connection conn) throws SQLException;
/**
- * insert uodo log when normal
- * @param xid the xid
- * @param branchId the branchId
- * @param rollbackCtx the rollbackContext
+ * insert uodo log when normal
+ *
+ * @param xid the xid
+ * @param branchId the branchId
+ * @param rollbackCtx the rollbackContext
* @param undoLogContent the undoLogContent
- * @param conn sql connection
+ * @param conn sql connection
* @throws SQLException
*/
- protected abstract void insertUndoLogWithNormal(String xid, long branchId, String rollbackCtx, byte[] undoLogContent, Connection conn) throws SQLException;
+ protected abstract void insertUndoLogWithNormal(String xid, long branchId, String rollbackCtx,
+ byte[] undoLogContent, Connection conn) throws SQLException;
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/KeywordChecker.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/KeywordChecker.java
index a556a0b11f27ab241a11a79788acbfd2a3a1fc1f..c0066477b79319faa0517fcd3201a41ce765d821 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/KeywordChecker.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/KeywordChecker.java
@@ -19,7 +19,6 @@ package io.seata.rm.datasource.undo;
* The interface Keyword checker.
*
* @author Wu
- * @date 2019 /3/5 The interface Keyword checker
*/
public interface KeywordChecker {
/**
@@ -37,4 +36,11 @@ public interface KeywordChecker {
* @return string
*/
String checkAndReplace(String fieldOrTableName);
+
+ /**
+ * get the SQL type of the current KeywordChecker
+ *
+ * @return the SQL type string
+ */
+ String getDbType();
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/KeywordCheckerFactory.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/KeywordCheckerFactory.java
index 584c844f9c47d28e840b91e6524aa1a895c88b68..2de7d8611acfa62d69f36a390876c98dd0924cb8 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/KeywordCheckerFactory.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/KeywordCheckerFactory.java
@@ -15,19 +15,21 @@
*/
package io.seata.rm.datasource.undo;
-import com.alibaba.druid.util.JdbcConstants;
import io.seata.common.exception.NotSupportYetException;
-import io.seata.rm.datasource.undo.mysql.keyword.MySQLKeywordChecker;
-import io.seata.rm.datasource.undo.oracle.keyword.OracleKeywordChecker;
+import io.seata.common.loader.EnhancedServiceLoader;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* The type Keyword checker factory.
*
* @author Wu
- * @date 2019 /3/5 The Type keyword checker factory
*/
public class KeywordCheckerFactory {
+ private static volatile Map<String,KeywordChecker> keywordCheckerMap;
+
/**
* get keyword checker
*
@@ -35,13 +37,22 @@ public class KeywordCheckerFactory {
* @return keyword checker
*/
public static KeywordChecker getKeywordChecker(String dbType) {
- if (dbType.equals(JdbcConstants.MYSQL)) {
- return MySQLKeywordChecker.getInstance();
- } else if (dbType.equals(JdbcConstants.ORACLE)) {
- return OracleKeywordChecker.getInstance();
- } else {
- throw new NotSupportYetException(dbType);
+ if (keywordCheckerMap == null) {
+ synchronized (KeywordCheckerFactory.class) {
+ if (keywordCheckerMap == null) {
+ Map<String, KeywordChecker> initializedMap = new HashMap<>();
+ List<KeywordChecker> checkerList = EnhancedServiceLoader.loadAll(KeywordChecker.class);
+ for (KeywordChecker checker : checkerList) {
+ initializedMap.put(checker.getDbType(), checker);
+ }
+ keywordCheckerMap = initializedMap;
+ }
+ }
+ }
+ if (keywordCheckerMap.containsKey(dbType)) {
+ return keywordCheckerMap.get(dbType);
}
+ throw new NotSupportYetException(dbType);
}
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorFactory.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorFactory.java
index b1443909dd2e06fe30639e018f1d24a40f047f9c..26cddaa95f55949912daa9c4f3d5c884daafd639 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorFactory.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorFactory.java
@@ -16,14 +16,12 @@
package io.seata.rm.datasource.undo;
import com.alibaba.druid.util.JdbcConstants;
+
import io.seata.common.exception.NotSupportYetException;
import io.seata.common.exception.ShouldNeverHappenException;
-import io.seata.rm.datasource.undo.mysql.MySQLUndoDeleteExecutor;
-import io.seata.rm.datasource.undo.mysql.MySQLUndoInsertExecutor;
-import io.seata.rm.datasource.undo.mysql.MySQLUndoUpdateExecutor;
-import io.seata.rm.datasource.undo.oracle.OracleUndoDeleteExecutor;
-import io.seata.rm.datasource.undo.oracle.OracleUndoInsertExecutor;
-import io.seata.rm.datasource.undo.oracle.OracleUndoUpdateExecutor;
+
+import java.util.HashSet;
+import java.util.Set;
/**
* The type Undo executor factory.
@@ -32,6 +30,13 @@ import io.seata.rm.datasource.undo.oracle.OracleUndoUpdateExecutor;
*/
public class UndoExecutorFactory {
+ private static final Set<String> UNDO_LOG_SUPPORT_SET = new HashSet<>();
+
+ static {
+ UNDO_LOG_SUPPORT_SET.add(JdbcConstants.MYSQL);
+ UNDO_LOG_SUPPORT_SET.add(JdbcConstants.ORACLE);
+ }
+
/**
* Gets undo executor.
*
@@ -40,31 +45,24 @@ public class UndoExecutorFactory {
* @return the undo executor
*/
public static AbstractUndoExecutor getUndoExecutor(String dbType, SQLUndoLog sqlUndoLog) {
- if (!dbType.equalsIgnoreCase(JdbcConstants.MYSQL)&&!dbType.equalsIgnoreCase(JdbcConstants.ORACLE)) {
+ if (!UNDO_LOG_SUPPORT_SET.contains(dbType)) {
throw new NotSupportYetException(dbType);
}
- if(dbType.equalsIgnoreCase(JdbcConstants.ORACLE)) {
- switch (sqlUndoLog.getSqlType()) {
- case INSERT:
- return new OracleUndoInsertExecutor(sqlUndoLog);
- case UPDATE:
- return new OracleUndoUpdateExecutor(sqlUndoLog);
- case DELETE:
- return new OracleUndoDeleteExecutor(sqlUndoLog);
- default:
- throw new ShouldNeverHappenException();
- }
- } else {
- switch (sqlUndoLog.getSqlType()) {
- case INSERT:
- return new MySQLUndoInsertExecutor(sqlUndoLog);
- case UPDATE:
- return new MySQLUndoUpdateExecutor(sqlUndoLog);
- case DELETE:
- return new MySQLUndoDeleteExecutor(sqlUndoLog);
- default:
- throw new ShouldNeverHappenException();
- }
- }
+ AbstractUndoExecutor result = null;
+ UndoExecutorHolder holder = UndoExecutorHolderFactory.getUndoExecutorHolder(dbType.toLowerCase());
+ switch (sqlUndoLog.getSqlType()) {
+ case INSERT:
+ result = holder.getInsertExecutor(sqlUndoLog);
+ break;
+ case UPDATE:
+ result = holder.getUpdateExecutor(sqlUndoLog);
+ break;
+ case DELETE:
+ result = holder.getDeleteExecutor(sqlUndoLog);
+ break;
+ default:
+ throw new ShouldNeverHappenException();
+ }
+ return result;
}
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorHolder.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..092d9b4842293300dcb72c20b5a150ab337d1fb4
--- /dev/null
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorHolder.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.undo;
+
+/**
+ * The Type UndoExecutorHolder
+ *
+ * @author: Zhibei Hao
+ */
+public interface UndoExecutorHolder {
+
+ /**
+ * get the specific Insert UndoExecutor by sqlUndoLog
+ *
+ * @param sqlUndoLog the sqlUndoLog
+ * @return the specific UndoExecutor
+ */
+ AbstractUndoExecutor getInsertExecutor(SQLUndoLog sqlUndoLog);
+
+ /**
+ * get the specific Update UndoExecutor by sqlUndoLog
+ *
+ * @param sqlUndoLog the sqlUndoLog
+ * @return the specific UndoExecutor
+ */
+ AbstractUndoExecutor getUpdateExecutor(SQLUndoLog sqlUndoLog);
+
+ /**
+ * get the specific Delete UndoExecutor by sqlUndoLog
+ *
+ * @param sqlUndoLog the sqlUndoLog
+ * @return the specific UndoExecutor
+ */
+ AbstractUndoExecutor getDeleteExecutor(SQLUndoLog sqlUndoLog);
+
+ /**
+ * get the SQL type of the current UndoExecutorHolder
+ *
+ * @return the SQL type string
+ */
+ String getDbType();
+}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorHolderFactory.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorHolderFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..45db94bb0794440f836d69e989e2cc804c6f7948
--- /dev/null
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoExecutorHolderFactory.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.undo;
+
+import io.seata.common.loader.EnhancedServiceLoader;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * The Type UndoExecutorHolderFactory
+ *
+ * @author: Zhibei Hao
+ */
+public class UndoExecutorHolderFactory {
+ private static volatile Map<String, UndoExecutorHolder> executorHolderMap;
+
+ /**
+ * Get UndoExecutorHolder by db type
+ *
+ * @param dbType the db type
+ * @return the UndoExecutorGroup
+ */
+ public static UndoExecutorHolder getUndoExecutorHolder(String dbType) {
+
+ if (executorHolderMap == null) {
+ synchronized (UndoExecutorHolderFactory.class) {
+ if (executorHolderMap == null) {
+ Map<String, UndoExecutorHolder> initializedMap = new HashMap<>();
+ List<UndoExecutorHolder> holderList = EnhancedServiceLoader.loadAll(UndoExecutorHolder.class);
+ for (UndoExecutorHolder holder : holderList) {
+ initializedMap.put(holder.getDbType().toLowerCase(), holder);
+ }
+ executorHolderMap = initializedMap;
+ }
+ }
+ }
+ if (executorHolderMap.containsKey(dbType)) {
+ return executorHolderMap.get(dbType);
+ }
+ throw new UnsupportedOperationException(MessageFormat.format("now not support {0}", dbType));
+ }
+}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoLogManagerFactory.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoLogManagerFactory.java
index 851c8792bba0ce43b08ad4df78714a5ae62f77a6..c385b48650bd2eed823e100525d94434c8c25513 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoLogManagerFactory.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/UndoLogManagerFactory.java
@@ -25,7 +25,6 @@ import java.util.Map;
/**
* @author jsbxyyx
- * @date 2019/09/07
*/
public final class UndoLogManagerFactory {
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/MySQLUndoExecutorHolder.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/MySQLUndoExecutorHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..92e071c4155e28ad5562d9cc844b0b6dfd7fde59
--- /dev/null
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/MySQLUndoExecutorHolder.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.undo.mysql;
+
+import io.seata.rm.datasource.undo.AbstractUndoExecutor;
+import io.seata.rm.datasource.undo.SQLUndoLog;
+import io.seata.rm.datasource.undo.UndoExecutorHolder;
+
+/**
+ * The Type MySQLUndoExecutorHolder
+ *
+ * @author: Zhibei Hao
+ */
+public class MySQLUndoExecutorHolder implements UndoExecutorHolder {
+ private static final String MYSQL = "mysql";
+
+ @Override
+ public AbstractUndoExecutor getInsertExecutor(SQLUndoLog sqlUndoLog) {
+ return new MySQLUndoInsertExecutor(sqlUndoLog);
+ }
+
+ @Override
+ public AbstractUndoExecutor getUpdateExecutor(SQLUndoLog sqlUndoLog) {
+ return new MySQLUndoUpdateExecutor(sqlUndoLog);
+ }
+
+ @Override
+ public AbstractUndoExecutor getDeleteExecutor(SQLUndoLog sqlUndoLog) {
+ return new MySQLUndoDeleteExecutor(sqlUndoLog);
+ }
+
+ @Override
+ public String getDbType() {
+ return MYSQL;
+ }
+}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java
index 9d8d38e15f2c0ae3e59f0358436431313d7c52bc..065a8f808b31725df0782ddf73c8b9ec4bfdc7aa 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/MySQLUndoLogManager.java
@@ -30,7 +30,6 @@ import java.util.Date;
/**
* @author jsbxyyx
- * @date 2019/09/07
*/
public class MySQLUndoLogManager extends AbstractUndoLogManager {
@@ -64,7 +63,7 @@ public class MySQLUndoLogManager extends AbstractUndoLogManager {
deletePST.setInt(2, limitRows);
int deleteRows = deletePST.executeUpdate();
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("batch delete undo log size " + deleteRows);
+ LOGGER.debug("batch delete undo log size {}", deleteRows);
}
return deleteRows;
} catch (Exception e) {
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/keyword/MySQLKeywordChecker.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/keyword/MySQLKeywordChecker.java
index f6350066a8f7baf8d0a861f515cd9eae4d2b481b..b0b3b6ecd31164289446897020de5b8c08a52910 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/keyword/MySQLKeywordChecker.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/mysql/keyword/MySQLKeywordChecker.java
@@ -15,6 +15,7 @@
*/
package io.seata.rm.datasource.undo.mysql.keyword;
+import com.alibaba.druid.util.JdbcConstants;
import io.seata.rm.datasource.undo.KeywordChecker;
import java.util.Arrays;
@@ -25,32 +26,14 @@ import java.util.stream.Collectors;
* The type MySQL keyword checker.
*
* @author xingfudeshi@gmail.com
- * @date 2019/3/5 MySQL keyword checker
*/
public class MySQLKeywordChecker implements KeywordChecker {
- private static volatile KeywordChecker keywordChecker = null;
- private Set<String> keywordSet;
+ private static Set<String> keywordSet;
- private MySQLKeywordChecker() {
+ static {
keywordSet = Arrays.stream(MySQLKeyword.values()).map(MySQLKeyword::name).collect(Collectors.toSet());
}
- /**
- * get instance of type MySQL keyword checker
- *
- * @return instance
- */
- public static KeywordChecker getInstance() {
- if (keywordChecker == null) {
- synchronized (MySQLKeywordChecker.class) {
- if (keywordChecker == null) {
- keywordChecker = new MySQLKeywordChecker();
- }
- }
- }
- return keywordChecker;
- }
-
/**
* MySQL keyword
*/
@@ -1135,4 +1118,10 @@ public class MySQLKeywordChecker implements KeywordChecker {
return check(fieldOrTableName) ? "`" + fieldOrTableName + "`" : fieldOrTableName;
}
+ @Override
+ public String getDbType()
+ {
+ return JdbcConstants.MYSQL;
+ }
+
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoDeleteExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoDeleteExecutor.java
index 075633786adfdfd03e2aa62c2c7ebf96c9178ba3..e9fbe7bba259d48ac7c3d917f475f036fdd4b80d 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoDeleteExecutor.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoDeleteExecutor.java
@@ -15,26 +15,30 @@
*/
package io.seata.rm.datasource.undo.oracle;
-import com.alibaba.druid.util.JdbcConstants;
import io.seata.common.exception.ShouldNeverHappenException;
+import io.seata.rm.datasource.ColumnUtils;
import io.seata.rm.datasource.sql.struct.Field;
-import io.seata.rm.datasource.sql.struct.KeyType;
import io.seata.rm.datasource.sql.struct.Row;
import io.seata.rm.datasource.sql.struct.TableRecords;
import io.seata.rm.datasource.undo.AbstractUndoExecutor;
-import io.seata.rm.datasource.undo.KeywordChecker;
-import io.seata.rm.datasource.undo.KeywordCheckerFactory;
import io.seata.rm.datasource.undo.SQLUndoLog;
+import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
/**
* The type oracle undo delete executor.
+ *
* @author ccg
- * @date 2019/3/25
*/
public class OracleUndoDeleteExecutor extends AbstractUndoExecutor {
+ /**
+ * INSERT INTO a (x, y, z, pk) VALUES (?, ?, ?, ?)
+ */
+ private static final String INSERT_SQL_TEMPLATE = "INSERT INTO %s (%s) VALUES (%s)";
+
/**
* Instantiates a new oracle undo delete executor.
*
@@ -46,42 +50,25 @@ public class OracleUndoDeleteExecutor extends AbstractUndoExecutor {
@Override
protected String buildUndoSQL() {
- KeywordChecker keywordChecker= KeywordCheckerFactory.getKeywordChecker(JdbcConstants.ORACLE);
TableRecords beforeImage = sqlUndoLog.getBeforeImage();
List<Row> beforeImageRows = beforeImage.getRows();
if (beforeImageRows == null || beforeImageRows.size() == 0) {
throw new ShouldNeverHappenException("Invalid UNDO LOG");
}
Row row = beforeImageRows.get(0);
+ List<Field> fields = new ArrayList<>(row.nonPrimaryKeys());
+ Field pkField = row.primaryKeys().get(0);
+ // PK is at last one.
+ fields.add(pkField);
- StringBuilder insertColumns = new StringBuilder();
- StringBuilder insertValues = new StringBuilder();
- Field pkField = null;
- boolean first = true;
- for (Field field : row.getFields()) {
- if (field.getKeyType() == KeyType.PrimaryKey) {
- pkField = field;
- continue;
- } else {
- if (first) {
- first = false;
- } else {
- insertColumns.append(", ");
- insertValues.append(", ");
- }
- insertColumns.append(keywordChecker.checkAndReplace(field.getName()));
- insertValues.append("?");
- }
-
- }
- if (!first) {
- insertColumns.append(", ");
- insertValues.append(", ");
- }
- insertColumns.append(keywordChecker.checkAndReplace(pkField.getName()));
- insertValues.append("?");
+ String insertColumns = fields.stream()
+ .map(field -> ColumnUtils.addEscape(field.getName(), ColumnUtils.Escape.STANDARD))
+ .collect(Collectors.joining(", "));
+ String insertValues = fields.stream().map(field -> "?")
+ .collect(Collectors.joining(", "));
- return "INSERT INTO " + keywordChecker.checkAndReplace(sqlUndoLog.getTableName()) + "(" + insertColumns.toString() + ") VALUES (" + insertValues.toString() + ")";
+ return String.format(INSERT_SQL_TEMPLATE, ColumnUtils.addEscape(sqlUndoLog.getTableName(), ColumnUtils.Escape.STANDARD),
+ insertColumns, insertValues);
}
@Override
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoExecutorHolder.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoExecutorHolder.java
new file mode 100644
index 0000000000000000000000000000000000000000..7b7ec4104f27bf5c626367b999b7b474421c4bac
--- /dev/null
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoExecutorHolder.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.undo.oracle;
+
+import io.seata.rm.datasource.undo.AbstractUndoExecutor;
+import io.seata.rm.datasource.undo.SQLUndoLog;
+import io.seata.rm.datasource.undo.UndoExecutorHolder;
+
+/**
+ * The Type OracleUndoExecutorHolder
+ *
+ * @author: Zhibei Hao
+ */
+public class OracleUndoExecutorHolder implements UndoExecutorHolder {
+ private static final String ORACLE = "oracle";
+
+ @Override
+ public AbstractUndoExecutor getInsertExecutor(SQLUndoLog sqlUndoLog) {
+ return new OracleUndoInsertExecutor(sqlUndoLog);
+ }
+
+ @Override
+ public AbstractUndoExecutor getUpdateExecutor(SQLUndoLog sqlUndoLog) {
+ return new OracleUndoUpdateExecutor(sqlUndoLog);
+ }
+
+ @Override
+ public AbstractUndoExecutor getDeleteExecutor(SQLUndoLog sqlUndoLog) {
+ return new OracleUndoDeleteExecutor(sqlUndoLog);
+ }
+
+ @Override
+ public String getDbType() {
+ return ORACLE;
+ }
+}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoInsertExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoInsertExecutor.java
index 1060bd02dd62f45a3b18f865eb805faacdc54690..c980b41ddfea68ac370c06d01a89207e372b21f4 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoInsertExecutor.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoInsertExecutor.java
@@ -15,15 +15,12 @@
*/
package io.seata.rm.datasource.undo.oracle;
-import com.alibaba.druid.util.JdbcConstants;
import io.seata.common.exception.ShouldNeverHappenException;
+import io.seata.rm.datasource.ColumnUtils;
import io.seata.rm.datasource.sql.struct.Field;
-import io.seata.rm.datasource.sql.struct.KeyType;
import io.seata.rm.datasource.sql.struct.Row;
import io.seata.rm.datasource.sql.struct.TableRecords;
import io.seata.rm.datasource.undo.AbstractUndoExecutor;
-import io.seata.rm.datasource.undo.KeywordChecker;
-import io.seata.rm.datasource.undo.KeywordCheckerFactory;
import io.seata.rm.datasource.undo.SQLUndoLog;
import java.sql.PreparedStatement;
@@ -33,34 +30,32 @@ import java.util.List;
/**
* The type oralce undo insert executor.
+ *
* @author ccg
- * @date 2019/3/25
*/
public class OracleUndoInsertExecutor extends AbstractUndoExecutor {
+ /**
+ * DELETE FROM a WHERE pk = ?
+ */
+ private static final String DELETE_SQL_TEMPLATE = "DELETE FROM %s WHERE %s = ?";
+
@Override
protected String buildUndoSQL() {
- KeywordChecker keywordChecker= KeywordCheckerFactory.getKeywordChecker(JdbcConstants.ORACLE);
TableRecords afterImage = sqlUndoLog.getAfterImage();
List<Row> afterImageRows = afterImage.getRows();
if (afterImageRows == null || afterImageRows.size() == 0) {
throw new ShouldNeverHappenException("Invalid UNDO LOG");
}
Row row = afterImageRows.get(0);
- StringBuilder mainSQL = new StringBuilder("DELETE FROM ").append(keywordChecker.checkAndReplace(sqlUndoLog.getTableName()));
- StringBuilder where = new StringBuilder(" WHERE ");
- // For a row, there's only one primary key now
- for (Field field : row.getFields()) {
- if (field.getKeyType() == KeyType.PrimaryKey) {
- where.append(keywordChecker.checkAndReplace(field.getName())).append(" = ?");
- }
-
- }
- return mainSQL.append(where).toString();
+ Field pkField = row.primaryKeys().get(0);
+ return String.format(DELETE_SQL_TEMPLATE, ColumnUtils.addEscape(sqlUndoLog.getTableName(), ColumnUtils.Escape.STANDARD),
+ ColumnUtils.addEscape(pkField.getName(), ColumnUtils.Escape.STANDARD));
}
@Override
- protected void undoPrepare(PreparedStatement undoPST, ArrayList<Field> undoValues, Field pkValue) throws SQLException {
+ protected void undoPrepare(PreparedStatement undoPST, ArrayList<Field> undoValues, Field pkValue)
+ throws SQLException {
undoPST.setObject(1, pkValue.getValue(), pkValue.getType());
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoLogManager.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoLogManager.java
index 566ea4c0fa73df6b70c576a739b7188f40c3e787..adb2195a2a9eea746709021715e9514228f3672f 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoLogManager.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoLogManager.java
@@ -29,7 +29,6 @@ import java.util.Date;
/**
* @author jsbxyyx
- * @date 2019/09/07
*/
public class OracleUndoLogManager extends AbstractUndoLogManager {
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoUpdateExecutor.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoUpdateExecutor.java
index 6733d9bf2eb410675385278a9375ad02c10f6543..e226fa3d7633e13fd5b28a8ad97d5c37435b4f74 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoUpdateExecutor.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/OracleUndoUpdateExecutor.java
@@ -15,52 +15,45 @@
*/
package io.seata.rm.datasource.undo.oracle;
-import com.alibaba.druid.util.JdbcConstants;
import io.seata.common.exception.ShouldNeverHappenException;
+import io.seata.rm.datasource.ColumnUtils;
import io.seata.rm.datasource.sql.struct.Field;
-import io.seata.rm.datasource.sql.struct.KeyType;
import io.seata.rm.datasource.sql.struct.Row;
import io.seata.rm.datasource.sql.struct.TableRecords;
import io.seata.rm.datasource.undo.AbstractUndoExecutor;
-import io.seata.rm.datasource.undo.KeywordChecker;
-import io.seata.rm.datasource.undo.KeywordCheckerFactory;
import io.seata.rm.datasource.undo.SQLUndoLog;
import java.util.List;
+import java.util.stream.Collectors;
/**
* The type oracle undo update executor.
+ *
* @author ccg
- * @date 2019/3/25
*/
public class OracleUndoUpdateExecutor extends AbstractUndoExecutor {
+ /**
+ * UPDATE a SET x = ?, y = ?, z = ? WHERE pk = ?
+ */
+ private static final String UPDATE_SQL_TEMPLATE = "UPDATE %s SET %s WHERE %s = ?";
+
@Override
protected String buildUndoSQL() {
- KeywordChecker keywordChecker= KeywordCheckerFactory.getKeywordChecker(JdbcConstants.ORACLE);
TableRecords beforeImage = sqlUndoLog.getBeforeImage();
List<Row> beforeImageRows = beforeImage.getRows();
if (beforeImageRows == null || beforeImageRows.size() == 0) {
throw new ShouldNeverHappenException("Invalid UNDO LOG"); // TODO
}
- Row row = beforeImageRows.get(0);
- StringBuilder mainSQL = new StringBuilder("UPDATE ").append(keywordChecker.checkAndReplace(sqlUndoLog.getTableName())).append(" SET ");
- StringBuilder where = new StringBuilder(" WHERE ");
- boolean first = true;
- for (Field field : row.getFields()) {
- if (field.getKeyType() == KeyType.PrimaryKey) {
- where.append(keywordChecker.checkAndReplace(field.getName())).append(" = ?");
- } else {
- if (first) {
- first = false;
- } else {
- mainSQL.append(", ");
- }
- mainSQL.append(keywordChecker.checkAndReplace(field.getName())).append(" = ?");
- }
- }
- return mainSQL.append(where).toString();
+ Row row = beforeImageRows.get(0);
+ Field pkField = row.primaryKeys().get(0);
+ List<Field> nonPkFields = row.nonPrimaryKeys();
+ String updateColumns = nonPkFields.stream()
+ .map(field -> ColumnUtils.addEscape(field.getName(), ColumnUtils.Escape.STANDARD) + " = ?")
+ .collect(Collectors.joining(", "));
+ return String.format(UPDATE_SQL_TEMPLATE, ColumnUtils.addEscape(sqlUndoLog.getTableName(), ColumnUtils.Escape.STANDARD),
+ updateColumns, ColumnUtils.addEscape(pkField.getName(), ColumnUtils.Escape.STANDARD));
}
/**
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/keyword/OracleKeywordChecker.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/keyword/OracleKeywordChecker.java
index e431b57206f2f85d8013d084d858e874d469203b..c518b389b63ffb7eb7f512d1388082baedf3c290 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/keyword/OracleKeywordChecker.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/oracle/keyword/OracleKeywordChecker.java
@@ -15,6 +15,7 @@
*/
package io.seata.rm.datasource.undo.oracle.keyword;
+import com.alibaba.druid.util.JdbcConstants;
import io.seata.rm.datasource.undo.KeywordChecker;
import java.util.Arrays;
@@ -25,32 +26,14 @@ import java.util.stream.Collectors;
* The type oracle sql keyword checker.
*
* @author ccg
- * @date 2019/3/25 oracle keyword checker
*/
public class OracleKeywordChecker implements KeywordChecker {
- private static volatile KeywordChecker keywordChecker = null;
- private Set<String> keywordSet;
+ private static Set<String> keywordSet;
- private OracleKeywordChecker() {
+ static {
keywordSet = Arrays.stream(OracleKeyword.values()).map(OracleKeyword::name).collect(Collectors.toSet());
}
- /**
- * get instance of type oracle keyword checker
- *
- * @return instance
- */
- public static KeywordChecker getInstance() {
- if (keywordChecker == null) {
- synchronized (OracleKeywordChecker.class) {
- if (keywordChecker == null) {
- keywordChecker = new OracleKeywordChecker();
- }
- }
- }
- return keywordChecker;
- }
-
/**
* oracle keyword
*/
@@ -505,7 +488,6 @@ public class OracleKeywordChecker implements KeywordChecker {
}
}
-
@Override
public boolean check(String fieldOrTableName) {
if (keywordSet.contains(fieldOrTableName)) {
@@ -520,7 +502,13 @@ public class OracleKeywordChecker implements KeywordChecker {
@Override
public String checkAndReplace(String fieldOrTableName) {
- return check(fieldOrTableName)? fieldOrTableName :fieldOrTableName;
-// return check(fieldOrTableName)?"`" + fieldOrTableName + "`":fieldOrTableName;
+ return check(fieldOrTableName) ? fieldOrTableName : fieldOrTableName;
+ // return check(fieldOrTableName)?"`" + fieldOrTableName + "`":fieldOrTableName;
+ }
+
+ @Override
+ public String getDbType()
+ {
+ return JdbcConstants.ORACLE;
}
}
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/parser/JacksonUndoLogParser.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/parser/JacksonUndoLogParser.java
index 1c8c1fbf2141181145e454f5731d543e5e3e3aa6..f7386d7ad39eb803e0ebedb41189f8678d2793c6 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/parser/JacksonUndoLogParser.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/parser/JacksonUndoLogParser.java
@@ -37,8 +37,12 @@ import io.seata.common.Constants;
import io.seata.common.loader.LoadLevel;
import io.seata.rm.datasource.undo.BranchUndoLog;
import io.seata.rm.datasource.undo.UndoLogParser;
+
+import java.util.Arrays;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import java.io.IOException;
import java.sql.SQLException;
import java.sql.Timestamp;
@@ -130,7 +134,12 @@ public class JacksonUndoLogParser implements UndoLogParser {
@Override
public BranchUndoLog decode(byte[] bytes) {
try {
- BranchUndoLog branchUndoLog = MAPPER.readValue(bytes, BranchUndoLog.class);
+ BranchUndoLog branchUndoLog;
+ if (Arrays.equals(bytes, getDefaultContent())) {
+ branchUndoLog = new BranchUndoLog();
+ } else {
+ branchUndoLog = MAPPER.readValue(bytes, BranchUndoLog.class);
+ }
return branchUndoLog;
} catch (IOException e) {
LOGGER.error("json decode exception, {}", e.getMessage(), e);
@@ -145,8 +154,10 @@ public class JacksonUndoLogParser implements UndoLogParser {
private static class TimestampSerializer extends JsonSerializer<Timestamp> {
@Override
- public void serializeWithType(Timestamp timestamp, JsonGenerator gen, SerializerProvider serializers, TypeSerializer typeSerializer) throws IOException {
- WritableTypeId typeId = typeSerializer.writeTypePrefix(gen, typeSerializer.typeId(timestamp, JsonToken.START_ARRAY));
+ public void serializeWithType(Timestamp timestamp, JsonGenerator gen, SerializerProvider serializers,
+ TypeSerializer typeSerializer) throws IOException {
+ WritableTypeId typeId = typeSerializer.writeTypePrefix(gen,
+ typeSerializer.typeId(timestamp, JsonToken.START_ARRAY));
serialize(timestamp, gen, serializers);
gen.writeTypeSuffix(typeId);
}
@@ -171,7 +182,7 @@ public class JacksonUndoLogParser implements UndoLogParser {
@Override
public Timestamp deserialize(JsonParser p, DeserializationContext ctxt) {
- if(p.isExpectedStartArrayToken()){
+ if (p.isExpectedStartArrayToken()) {
ArrayNode arrayNode;
try {
arrayNode = p.getCodec().readTree(p);
@@ -195,7 +206,8 @@ public class JacksonUndoLogParser implements UndoLogParser {
@Override
public void serializeWithType(SerialBlob blob, JsonGenerator gen, SerializerProvider serializers,
TypeSerializer typeSer) throws IOException {
- WritableTypeId typeIdDef = typeSer.writeTypePrefix(gen, typeSer.typeId(blob, JsonToken.VALUE_EMBEDDED_OBJECT));
+ WritableTypeId typeIdDef = typeSer.writeTypePrefix(gen,
+ typeSer.typeId(blob, JsonToken.VALUE_EMBEDDED_OBJECT));
serialize(blob, gen, serializers);
typeSer.writeTypeSuffix(gen, typeIdDef);
}
@@ -203,7 +215,7 @@ public class JacksonUndoLogParser implements UndoLogParser {
@Override
public void serialize(SerialBlob blob, JsonGenerator gen, SerializerProvider serializers) throws IOException {
try {
- gen.writeBinary(blob.getBytes(1, (int) blob.length()));
+ gen.writeBinary(blob.getBytes(1, (int)blob.length()));
} catch (SerialException e) {
LOGGER.error("serialize java.sql.Blob error : {}", e.getMessage(), e);
}
@@ -216,8 +228,7 @@ public class JacksonUndoLogParser implements UndoLogParser {
private static class BlobDeserializer extends JsonDeserializer<SerialBlob> {
@Override
- public SerialBlob deserialize(JsonParser p, DeserializationContext ctxt)
- throws IOException {
+ public SerialBlob deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
try {
return new SerialBlob(p.getBinaryValue());
} catch (SQLException e) {
@@ -235,7 +246,8 @@ public class JacksonUndoLogParser implements UndoLogParser {
@Override
public void serializeWithType(SerialClob clob, JsonGenerator gen, SerializerProvider serializers,
TypeSerializer typeSer) throws IOException {
- WritableTypeId typeIdDef = typeSer.writeTypePrefix(gen, typeSer.typeId(clob, JsonToken.VALUE_EMBEDDED_OBJECT));
+ WritableTypeId typeIdDef = typeSer.writeTypePrefix(gen,
+ typeSer.typeId(clob, JsonToken.VALUE_EMBEDDED_OBJECT));
serialize(clob, gen, serializers);
typeSer.writeTypeSuffix(gen, typeIdDef);
}
@@ -243,7 +255,7 @@ public class JacksonUndoLogParser implements UndoLogParser {
@Override
public void serialize(SerialClob clob, JsonGenerator gen, SerializerProvider serializers) throws IOException {
try {
- gen.writeString(clob.getCharacterStream(), (int) clob.length());
+ gen.writeString(clob.getCharacterStream(), (int)clob.length());
} catch (SerialException e) {
LOGGER.error("serialize java.sql.Blob error : {}", e.getMessage(), e);
}
@@ -253,8 +265,7 @@ public class JacksonUndoLogParser implements UndoLogParser {
private static class ClobDeserializer extends JsonDeserializer<SerialClob> {
@Override
- public SerialClob deserialize(JsonParser p, DeserializationContext ctxt)
- throws IOException {
+ public SerialClob deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
try {
return new SerialClob(p.getValueAsString().toCharArray());
diff --git a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/parser/ProtostuffUndoLogParser.java b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/parser/ProtostuffUndoLogParser.java
index 8ff52b06a98bfb4834b9416611694ae0db714b08..5b4bda1e9eb6bf0d18115914a9f4c6c8575500c3 100644
--- a/rm-datasource/src/main/java/io/seata/rm/datasource/undo/parser/ProtostuffUndoLogParser.java
+++ b/rm-datasource/src/main/java/io/seata/rm/datasource/undo/parser/ProtostuffUndoLogParser.java
@@ -60,7 +60,7 @@ public class ProtostuffUndoLogParser implements UndoLogParser {
@Override
public byte[] getDefaultContent() {
- return new byte[0];
+ return encode(new BranchUndoLog());
}
@Override
diff --git a/rm-datasource/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.SQLOperateRecognizerHolder b/rm-datasource/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.SQLOperateRecognizerHolder
new file mode 100644
index 0000000000000000000000000000000000000000..5f62cb6bbec55bd4450a7766b2ce00575cb337a5
--- /dev/null
+++ b/rm-datasource/src/main/resources/META-INF/services/io.seata.rm.datasource.sql.SQLOperateRecognizerHolder
@@ -0,0 +1,2 @@
+io.seata.rm.datasource.sql.druid.MySqlOperateRecognizerHolder
+io.seata.rm.datasource.sql.druid.oracle.OracleOperateRecognizerHolder
\ No newline at end of file
diff --git a/rm-datasource/src/main/resources/META-INF/services/io.seata.rm.datasource.undo.KeywordChecker b/rm-datasource/src/main/resources/META-INF/services/io.seata.rm.datasource.undo.KeywordChecker
new file mode 100644
index 0000000000000000000000000000000000000000..2a6f6d3d133934c68ccece2108176c925bada0f3
--- /dev/null
+++ b/rm-datasource/src/main/resources/META-INF/services/io.seata.rm.datasource.undo.KeywordChecker
@@ -0,0 +1,2 @@
+io.seata.rm.datasource.undo.oracle.keyword.OracleKeywordChecker
+io.seata.rm.datasource.undo.mysql.keyword.MySQLKeywordChecker
\ No newline at end of file
diff --git a/rm-datasource/src/main/resources/META-INF/services/io.seata.rm.datasource.undo.UndoExecutorHolder b/rm-datasource/src/main/resources/META-INF/services/io.seata.rm.datasource.undo.UndoExecutorHolder
new file mode 100644
index 0000000000000000000000000000000000000000..5776891a4177ea230278d292108ff2ceb76588ad
--- /dev/null
+++ b/rm-datasource/src/main/resources/META-INF/services/io.seata.rm.datasource.undo.UndoExecutorHolder
@@ -0,0 +1,2 @@
+io.seata.rm.datasource.undo.mysql.MySQLUndoExecutorHolder
+io.seata.rm.datasource.undo.oracle.OracleUndoExecutorHolder
\ No newline at end of file
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/ColumnUtilsTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/ColumnUtilsTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3801558ae4721c915b2480c4c1cd651c2b1c3e14
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/ColumnUtilsTest.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource;
+
+import com.alibaba.druid.util.JdbcConstants;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author jsbxyyx
+ */
+public class ColumnUtilsTest {
+
+ @Test
+ public void test_delEscape_byEscape() throws Exception {
+ List<String> cols = new ArrayList<>();
+ cols.add("`id`");
+ cols.add("name");
+ cols = ColumnUtils.delEscape(cols, ColumnUtils.Escape.MYSQL);
+ Assertions.assertEquals("id", cols.get(0));
+ Assertions.assertEquals("name", cols.get(1));
+
+ List<String> cols2 = new ArrayList<>();
+ cols2.add("\"id\"");
+ cols2 = ColumnUtils.delEscape(cols2, ColumnUtils.Escape.STANDARD);
+ Assertions.assertEquals("id", cols2.get(0));
+
+ Assertions.assertNull(ColumnUtils.delEscape((String) null, ColumnUtils.Escape.MYSQL));
+ }
+
+ @Test
+ public void test_delEscape_byDbType() throws Exception {
+
+ List<String> cols3 = new ArrayList<>();
+ cols3.add("\"id\"");
+ cols3 = ColumnUtils.delEscape(cols3, JdbcConstants.ORACLE);
+ Assertions.assertEquals("id", cols3.get(0));
+
+ List<String> cols4 = new ArrayList<>();
+ cols4.add("`id`");
+ cols4 = ColumnUtils.delEscape(cols4, JdbcConstants.MYSQL);
+ Assertions.assertEquals("id", cols4.get(0));
+
+ Assertions.assertEquals("id", ColumnUtils.delEscape("`id`", JdbcConstants.MYSQL));
+ Assertions.assertEquals("id", ColumnUtils.delEscape("\"id\"", JdbcConstants.ORACLE));
+ }
+
+ @Test
+ public void test_addEscape_byEscape() throws Exception {
+ String col = "`id`";
+ String newCol = ColumnUtils.addEscape(col, ColumnUtils.Escape.MYSQL);
+ Assertions.assertEquals(col, newCol);
+
+ String col_s = "\"id\"";
+ String newCol_s = ColumnUtils.addEscape(col_s, ColumnUtils.Escape.STANDARD);
+ Assertions.assertEquals(col_s, newCol_s);
+
+ String col2 = "id";
+ String newCol2 = ColumnUtils.addEscape(col2, ColumnUtils.Escape.MYSQL);
+ Assertions.assertEquals("`" + col2 + "`", newCol2);
+
+ String col2_s = "id";
+ String newCol2_s = ColumnUtils.addEscape(col2_s, ColumnUtils.Escape.STANDARD);
+ Assertions.assertEquals("\"" + col2_s + "\"", newCol2_s);
+
+ String col3 = "";
+ String newCol3 = ColumnUtils.addEscape(col3, ColumnUtils.Escape.MYSQL);
+ Assertions.assertEquals(col3, newCol3);
+
+ Assertions.assertNull(ColumnUtils.addEscape(null, ColumnUtils.Escape.MYSQL));
+
+ }
+
+ @Test
+ public void test_addEscape_byDbType() throws Exception {
+ List<String> cols1 = new ArrayList<>();
+ cols1.add("id");
+ cols1 = ColumnUtils.addEscape(cols1, JdbcConstants.MYSQL);
+ Assertions.assertEquals("`id`", cols1.get(0));
+
+ List<String> cols2 = new ArrayList<>();
+ cols2.add("`id`");
+ cols2 = ColumnUtils.addEscape(cols2, JdbcConstants.MYSQL);
+ Assertions.assertEquals("`id`", cols2.get(0));
+
+ List<String> cols3 = new ArrayList<>();
+ cols3.add("id");
+ cols3 = ColumnUtils.addEscape(cols3, JdbcConstants.ORACLE);
+ Assertions.assertEquals("\"id\"", cols3.get(0));
+
+ List<String> cols4 = new ArrayList<>();
+ cols4.add("\"id\"");
+ cols4 = ColumnUtils.addEscape(cols4, JdbcConstants.ORACLE);
+ Assertions.assertEquals("\"id\"", cols4.get(0));
+
+ }
+
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/PreparedStatementProxyTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/PreparedStatementProxyTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3b136bf02b31b6126579c0a203c86848f7bed38a
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/PreparedStatementProxyTest.java
@@ -0,0 +1,360 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource;
+
+import java.io.ByteArrayInputStream;
+import java.io.CharArrayReader;
+import java.math.BigDecimal;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.sql.Date;
+import java.sql.JDBCType;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import java.sql.Time;
+import java.sql.Timestamp;
+import java.sql.Types;
+import java.sql.ResultSet;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Objects;
+
+import com.alibaba.druid.mock.MockArray;
+import com.alibaba.druid.mock.MockNClob;
+import com.alibaba.druid.mock.MockRef;
+import com.alibaba.druid.mock.MockSQLXML;
+import com.alibaba.druid.pool.DruidDataSource;
+
+import com.google.common.collect.Lists;
+import io.seata.rm.datasource.mock.MockBlob;
+import io.seata.rm.datasource.mock.MockClob;
+import io.seata.rm.datasource.mock.MockConnection;
+import io.seata.rm.datasource.mock.MockDriver;
+import io.seata.rm.datasource.sql.struct.Null;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author will
+ */
+public class PreparedStatementProxyTest {
+
+ private static List<String> returnValueColumnLabels = Lists.newArrayList("id", "name");
+
+ private static Object[][] returnValue = new Object[][] {
+ new Object[] {1, "Tom"},
+ new Object[] {2, "Jack"},
+ };
+
+ private static Object[][] columnMetas = new Object[][] {
+ new Object[] {"", "", "table_prepared_statement_proxy", "id", Types.INTEGER, "INTEGER", 64, 0, 10, 1, "", "", 0, 0, 64, 1, "NO", "YES"},
+ new Object[] {"", "", "table_prepared_statement_proxy", "name", Types.VARCHAR, "VARCHAR", 64, 0, 10, 0, "", "", 0, 0, 64, 2, "YES", "NO"},
+ };
+
+ private static Object[][] indexMetas = new Object[][] {
+ new Object[] {"PRIMARY", "id", false, "", 3, 1, "A", 34},
+ };
+
+ private static PreparedStatementProxy preparedStatementProxy;
+
+ private static TestUnusedConstructorPreparedStatementProxy unusedConstructorPreparedStatementProxy;
+
+ @BeforeAll
+ public static void init() throws SQLException {
+ MockDriver mockDriver = new MockDriver(returnValueColumnLabels, returnValue, columnMetas, indexMetas);
+ DruidDataSource dataSource = new DruidDataSource();
+ dataSource.setUrl("jdbc:mock:xxx");
+ dataSource.setDriver(mockDriver);
+
+ DataSourceProxy dataSourceProxy = new DataSourceProxy(dataSource);
+
+ ConnectionProxy connectionProxy = new ConnectionProxy(dataSourceProxy, dataSource.getConnection().getConnection());
+
+ String sql = "update from prepared_statement_proxy set name = ?";
+
+ PreparedStatement preparedStatement = mockDriver.createSeataMockPreparedStatement(
+ (MockConnection)connectionProxy.getTargetConnection(), sql);
+
+ preparedStatementProxy = new PreparedStatementProxy(connectionProxy, preparedStatement, sql);
+ unusedConstructorPreparedStatementProxy = new TestUnusedConstructorPreparedStatementProxy(connectionProxy, preparedStatement);
+ }
+
+ @Test
+ public void testPreparedStatementProxy() {
+ Assertions.assertNotNull(preparedStatementProxy);
+ Assertions.assertNotNull(unusedConstructorPreparedStatementProxy);
+ }
+
+ @Test
+ public void testExecute() throws SQLException {
+ Assertions.assertNotNull(preparedStatementProxy.execute());
+ }
+
+ @Test
+ public void testExecuteUpdate() throws SQLException {
+ Assertions.assertNotNull(preparedStatementProxy.executeUpdate());
+ }
+
+ @Test
+ public void testExecuteQuery() throws SQLException {
+ Assertions.assertNotNull(preparedStatementProxy.executeQuery());
+ }
+
+ @Test
+ public void testGetSetParamsByIndex() {
+ preparedStatementProxy.setParamByIndex(1, "xxx");
+ Assertions.assertEquals("xxx", preparedStatementProxy.getParamsByIndex(0).get(0));
+ }
+
+ @Test
+ public void testSetParam() throws SQLException, MalformedURLException {
+ preparedStatementProxy.clearParameters();
+ preparedStatementProxy.setNull(1, JDBCType.DECIMAL.getVendorTypeNumber());
+ Assertions.assertEquals(Null.get(), preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setNull(1, JDBCType.DECIMAL.getVendorTypeNumber(), "NULL");
+ Assertions.assertEquals(Null.get(), preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setBoolean(1, true);
+ Assertions.assertEquals(true, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setByte(1, (byte)0);
+ Assertions.assertEquals((byte)0, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setShort(1, (short)0);
+ Assertions.assertEquals((short)0, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setInt(1, 0);
+ Assertions.assertEquals(0, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setLong(1, 0L);
+ Assertions.assertEquals(0L, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setFloat(1, 0f);
+ Assertions.assertEquals(0f, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setDouble(1, 1.1);
+ Assertions.assertEquals(1.1, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setBigDecimal(1, new BigDecimal(0));
+ Assertions.assertEquals(new BigDecimal(0), preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setString(1, "x");
+ Assertions.assertEquals("x", preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setNString(1, "x");
+ Assertions.assertEquals("x", preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setBytes(1, "x".getBytes());
+ Assertions.assertTrue(Objects.deepEquals("x".getBytes(), preparedStatementProxy.getParamsByIndex(0).get(0)));
+ preparedStatementProxy.clearParameters();
+
+ Date date = new Date(System.currentTimeMillis());
+ preparedStatementProxy.setDate(1, date);
+ Assertions.assertEquals(date, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setDate(1, date, Calendar.getInstance());
+ Assertions.assertEquals(date, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ Time time = new Time(System.currentTimeMillis());
+ preparedStatementProxy.setTime(1, time);
+ Assertions.assertEquals(time, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setTime(1, time, Calendar.getInstance());
+ Assertions.assertEquals(time, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ Timestamp timestamp = new Timestamp(System.currentTimeMillis());
+ preparedStatementProxy.setTimestamp(1, timestamp);
+ Assertions.assertEquals(timestamp, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setTimestamp(1, timestamp, Calendar.getInstance());
+ Assertions.assertEquals(timestamp, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream("x".getBytes(), 0, 1);
+ preparedStatementProxy.setAsciiStream(1, byteArrayInputStream);
+ Assertions.assertEquals(byteArrayInputStream, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setAsciiStream(1, byteArrayInputStream, 1L);
+ Assertions.assertEquals(byteArrayInputStream, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setAsciiStream(1, byteArrayInputStream);
+ Assertions.assertEquals(byteArrayInputStream, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setUnicodeStream(1, byteArrayInputStream, 1);
+ Assertions.assertEquals(byteArrayInputStream, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setBinaryStream(1, byteArrayInputStream);
+ Assertions.assertEquals(byteArrayInputStream, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setBinaryStream(1, byteArrayInputStream, 1L);
+ Assertions.assertEquals(byteArrayInputStream, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setBinaryStream(1, byteArrayInputStream, 1);
+ Assertions.assertEquals(byteArrayInputStream, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setObject(1, 1, JDBCType.INTEGER.getVendorTypeNumber());
+ Assertions.assertEquals(1, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setObject(1, 1, JDBCType.INTEGER.getVendorTypeNumber(), 1);
+ Assertions.assertEquals(1, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setObject(1, 1);
+ Assertions.assertEquals(1, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ Assertions.assertDoesNotThrow(() -> {
+ preparedStatementProxy.addBatch();
+ });
+
+ CharArrayReader charArrayReader = new CharArrayReader("x".toCharArray());
+ preparedStatementProxy.setCharacterStream(1, charArrayReader, 1);
+ Assertions.assertEquals(charArrayReader, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setCharacterStream(1, charArrayReader, 1L);
+ Assertions.assertEquals(charArrayReader, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setCharacterStream(1, charArrayReader);
+ Assertions.assertEquals(charArrayReader, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setNCharacterStream(1, charArrayReader);
+ Assertions.assertEquals(charArrayReader, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setNCharacterStream(1, charArrayReader, 1L);
+ Assertions.assertEquals(charArrayReader, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ MockRef ref = new MockRef();
+ preparedStatementProxy.setRef(1, ref);
+ Assertions.assertEquals(ref, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ MockBlob blob = new MockBlob();
+ preparedStatementProxy.setBlob(1, blob);
+ Assertions.assertEquals(blob, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setBlob(1, byteArrayInputStream);
+ Assertions.assertEquals(byteArrayInputStream, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setBlob(1, byteArrayInputStream, 1L);
+ Assertions.assertEquals(byteArrayInputStream, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ MockClob clob = new MockClob();
+ preparedStatementProxy.setClob(1, clob);
+ Assertions.assertEquals(clob, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setClob(1, charArrayReader, 1L);
+ Assertions.assertEquals(charArrayReader, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setClob(1, charArrayReader);
+ Assertions.assertEquals(charArrayReader, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ MockNClob nclob = new MockNClob();
+ preparedStatementProxy.setNClob(1, nclob);
+ Assertions.assertEquals(nclob, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setNClob(1, charArrayReader, 1L);
+ Assertions.assertEquals(charArrayReader, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ preparedStatementProxy.setNClob(1, charArrayReader);
+ Assertions.assertEquals(charArrayReader, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ MockArray array = new MockArray();
+ preparedStatementProxy.setArray(1, array);
+ Assertions.assertEquals(array, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ Assertions.assertNotNull(preparedStatementProxy.getMetaData());
+ Assertions.assertNotNull(preparedStatementProxy.getParameterMetaData());
+
+ URL url = new URL("http", "", 8080, "");
+ preparedStatementProxy.setURL(1, url);
+ Assertions.assertEquals(url, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ MockSQLXML sqlxml = new MockSQLXML();
+ preparedStatementProxy.setSQLXML(1, sqlxml);
+ Assertions.assertEquals(sqlxml, preparedStatementProxy.getParamsByIndex(0).get(0));
+ preparedStatementProxy.clearParameters();
+
+ Assertions.assertNotNull(preparedStatementProxy.getParameters());
+ }
+
+ /**
+ * This class use for test the unused constructor in AbstractPreparedStatementProxy
+ */
+ private static class TestUnusedConstructorPreparedStatementProxy extends AbstractPreparedStatementProxy {
+
+ public TestUnusedConstructorPreparedStatementProxy(AbstractConnectionProxy connectionProxy, PreparedStatement targetStatement) throws SQLException {
+ super(connectionProxy, targetStatement);
+ }
+
+ @Override
+ public ResultSet executeQuery() throws SQLException {
+ return null;
+ }
+
+ @Override
+ public int executeUpdate() throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public boolean execute() throws SQLException {
+ return false;
+ }
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/StatementProxyTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/StatementProxyTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..68196b3244114b751114c222e46f42aff17defff
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/StatementProxyTest.java
@@ -0,0 +1,230 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource;
+
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.Statement;
+import java.sql.Types;
+import java.util.List;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.google.common.collect.Lists;
+import io.seata.rm.datasource.mock.MockConnection;
+import io.seata.rm.datasource.mock.MockDriver;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author will
+ */
+public class StatementProxyTest {
+
+ private static List<String> returnValueColumnLabels = Lists.newArrayList("id", "name");
+
+ private static Object[][] returnValue = new Object[][] {
+ new Object[] {1, "Tom"},
+ new Object[] {2, "Jack"},
+ };
+
+ private static Object[][] columnMetas = new Object[][] {
+ new Object[] {"", "", "table_statement_proxy", "id", Types.INTEGER, "INTEGER", 64, 0, 10, 1, "", "", 0, 0, 64,
+ 1, "NO", "YES"},
+ new Object[] {"", "", "table_statement_proxy", "name", Types.VARCHAR, "VARCHAR", 64, 0, 10, 0, "", "", 0, 0, 64,
+ 2, "YES", "NO"},
+ };
+
+ private static Object[][] indexMetas = new Object[][] {
+ new Object[] {"PRIMARY", "id", false, "", 3, 1, "A", 34},
+ };
+
+ private static StatementProxy statementProxy;
+
+ @BeforeAll
+ public static void init() throws SQLException {
+ MockDriver mockDriver = new MockDriver(returnValueColumnLabels, returnValue, columnMetas, indexMetas);
+ DruidDataSource dataSource = new DruidDataSource();
+ dataSource.setUrl("jdbc:mock:xxx");
+ dataSource.setDriver(mockDriver);
+
+ DataSourceProxy dataSourceProxy = new DataSourceProxy(dataSource);
+
+ ConnectionProxy connectionProxy = new ConnectionProxy(dataSourceProxy,
+ dataSource.getConnection().getConnection());
+
+ Statement statement = mockDriver.createMockStatement((MockConnection)connectionProxy.getTargetConnection());
+
+ statementProxy = new StatementProxy(connectionProxy, statement);
+ }
+
+ @Test
+ public void testStatementProxy() {
+ Assertions.assertNotNull(statementProxy);
+ }
+
+ @Test
+ public void testGetConnectionProxy() {
+ Assertions.assertNotNull(statementProxy.getConnectionProxy());
+ }
+
+ @Test
+ public void testExecute() throws SQLException {
+ String sql = "select * from table_statment_proxy";
+ Assertions.assertNotNull(statementProxy.executeQuery(sql));
+ Assertions.assertDoesNotThrow(() -> statementProxy.executeUpdate(sql));
+ Assertions.assertDoesNotThrow(() -> statementProxy.executeUpdate(sql, 1));
+ Assertions.assertDoesNotThrow(() -> statementProxy.executeUpdate(sql, new int[]{1}));
+ Assertions.assertDoesNotThrow(() -> statementProxy.executeUpdate(sql, new String[]{"id"}));
+ Assertions.assertDoesNotThrow(() -> statementProxy.execute(sql));
+ Assertions.assertDoesNotThrow(() -> statementProxy.execute(sql, 1));
+ Assertions.assertDoesNotThrow(() -> statementProxy.execute(sql, new int[]{1}));
+ Assertions.assertDoesNotThrow(() -> statementProxy.execute(sql, new String[]{"id"}));
+ Assertions.assertDoesNotThrow(() -> statementProxy.executeBatch());
+ }
+
+ @Test
+ public void testGetTargetStatement() {
+ Assertions.assertNotNull(statementProxy.getTargetStatement());
+ }
+
+ @Test
+ public void testGetTargetSQL() {
+ Assertions.assertNotNull(statementProxy.getTargetSQL());
+ }
+
+ @Test
+ public void testMaxFieldSize() throws SQLException {
+ statementProxy.setMaxFieldSize(1);
+ Assertions.assertEquals(1, statementProxy.getMaxFieldSize());
+ }
+
+ @Test
+ public void testMaxRows() throws SQLException {
+ statementProxy.setMaxRows(1);
+ Assertions.assertEquals(1, statementProxy.getMaxRows());
+ }
+
+ @Test
+ public void testEscapeProcessing() throws SQLException {
+ Assertions.assertDoesNotThrow(() -> statementProxy.setEscapeProcessing(true));
+ }
+
+ @Test
+ public void testQueryTimeout() throws SQLException {
+ statementProxy.setQueryTimeout(1);
+ Assertions.assertEquals(1, statementProxy.getQueryTimeout());
+ }
+
+ @Test
+ public void testCancel() {
+ Assertions.assertDoesNotThrow(() -> statementProxy.cancel());
+ }
+
+ @Test
+ public void testWarnings() throws SQLException {
+ Assertions.assertNull(statementProxy.getWarnings());
+ statementProxy.clearWarnings();
+ Assertions.assertNull(statementProxy.getWarnings());
+ }
+
+ @Test
+ public void testCursorName() {
+ Assertions.assertDoesNotThrow(() -> statementProxy.setCursorName("x"));
+ }
+
+ @Test
+ public void testResultSet() throws SQLException {
+ Assertions.assertNotNull(statementProxy.getUpdateCount());
+ }
+
+ @Test
+ public void testUpdateCount() throws SQLException {
+ Assertions.assertEquals(0, statementProxy.getUpdateCount());
+ }
+
+ @Test
+ public void testMoreResults() throws SQLException {
+ Assertions.assertEquals(false, statementProxy.getMoreResults());
+ }
+
+ @Test
+ public void testFetchDirection() throws SQLException {
+ statementProxy.setFetchDirection(1);
+ Assertions.assertEquals(1, statementProxy.getFetchDirection());
+ }
+
+ @Test
+ public void testFetchSize() throws SQLException {
+ statementProxy.setFetchSize(1);
+ Assertions.assertEquals(1, statementProxy.getFetchSize());
+ }
+
+ @Test
+ public void testResultSetConcurrency() throws SQLException {
+ Assertions.assertEquals(0, statementProxy.getResultSetConcurrency());
+ }
+
+ @Test
+ public void testResultSetType() throws SQLException {
+ Assertions.assertEquals(0, statementProxy.getResultSetType());
+ }
+
+ @Test
+ public void testBatch() throws SQLException {
+ statementProxy.addBatch("update t set x = 'x' where id = 1");
+ Assertions.assertDoesNotThrow(() -> statementProxy.executeBatch());
+ Assertions.assertDoesNotThrow(() -> statementProxy.clearBatch());
+ }
+
+ @Test
+ public void testGetMoreResults() throws SQLException {
+ Assertions.assertEquals(false, statementProxy.getMoreResults(1));
+ }
+
+ @Test
+ public void testGetGeneratedKeys() {
+ Assertions.assertDoesNotThrow(() -> statementProxy.getGeneratedKeys());
+ }
+
+ @Test
+ public void testGetResultSetHoldability() {
+ Assertions.assertDoesNotThrow(() -> statementProxy.getResultSetHoldability());
+ }
+
+ @Test
+ public void testIsClosed() {
+ Assertions.assertDoesNotThrow(() -> statementProxy.isClosed());
+ }
+
+ @Test
+ public void testPoolable() throws SQLException {
+ statementProxy.setPoolable(true);
+ Assertions.assertEquals(true, statementProxy.isPoolable());
+ }
+
+ @Test
+ public void testCloseOnCompletion() {
+ Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> statementProxy.closeOnCompletion());
+ Assertions.assertThrows(SQLFeatureNotSupportedException.class, () -> statementProxy.isCloseOnCompletion());
+ }
+
+ @Test
+ public void testWrap() throws SQLException {
+ Assertions.assertDoesNotThrow(() -> statementProxy.unwrap(String.class));
+ Assertions.assertEquals(false, statementProxy.isWrapperFor(String.class));
+ }
+
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/BatchInsertExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/BatchInsertExecutorTest.java
index 37ee104a352e3888b5d43f010872e96a8be9be64..a3a69e8794777aa2c4c3697e3eb93b3bc989fa81 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/BatchInsertExecutorTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/BatchInsertExecutorTest.java
@@ -15,7 +15,9 @@
*/
package io.seata.rm.datasource.exec;
+import com.alibaba.druid.util.JdbcConstants;
import io.seata.common.exception.NotSupportYetException;
+import io.seata.rm.datasource.ConnectionProxy;
import io.seata.rm.datasource.PreparedStatementProxy;
import io.seata.rm.datasource.sql.SQLInsertRecognizer;
import io.seata.rm.datasource.sql.struct.Null;
@@ -40,7 +42,6 @@ import static org.mockito.Mockito.when;
* batch insert executor test
*
* @author zjinlei
- * @date 2019/07/16
*/
public class BatchInsertExecutorTest {
@@ -50,6 +51,9 @@ public class BatchInsertExecutorTest {
private static final String USER_STATUS_COLUMN = "user_status";
private static final List<Integer> PK_VALUES = Arrays.asList(100000001, 100000002, 100000003, 100000004, 100000005);
+
+ private ConnectionProxy connectionProxy;
+
private PreparedStatementProxy statementProxy;
private SQLInsertRecognizer sqlInsertRecognizer;
@@ -62,11 +66,18 @@ public class BatchInsertExecutorTest {
@BeforeEach
public void init() {
+ connectionProxy = mock(ConnectionProxy.class);
+ when(connectionProxy.getDbType()).thenReturn(JdbcConstants.MYSQL);
+
statementProxy = mock(PreparedStatementProxy.class);
+ when(statementProxy.getConnectionProxy()).thenReturn(connectionProxy);
+
statementCallback = mock(StatementCallback.class);
sqlInsertRecognizer = mock(SQLInsertRecognizer.class);
tableMeta = mock(TableMeta.class);
insertExecutor = Mockito.spy(new InsertExecutor(statementProxy, statementCallback, sqlInsertRecognizer));
+
+ doReturn(1).when(insertExecutor).getPkIndex();
}
@Test
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/DeleteExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/DeleteExecutorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..4ce49559e3a45a91a94f7901dc040cc714ff9a04
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/DeleteExecutorTest.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.exec;
+
+import java.lang.reflect.Field;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.List;
+
+import com.alibaba.druid.mock.MockStatement;
+import com.alibaba.druid.mock.MockStatementBase;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.util.JdbcConstants;
+import com.google.common.collect.Lists;
+import io.seata.rm.datasource.ConnectionProxy;
+import io.seata.rm.datasource.DataSourceProxy;
+import io.seata.rm.datasource.StatementProxy;
+import io.seata.rm.datasource.mock.MockDriver;
+import io.seata.rm.datasource.sql.druid.MySQLDeleteRecognizer;
+import io.seata.rm.datasource.sql.struct.TableRecords;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author will
+ */
+public class DeleteExecutorTest {
+
+ private static DeleteExecutor deleteExecutor;
+
+ private static StatementProxy statementProxy;
+
+ @BeforeAll
+ public static void init() {
+ List<String> returnValueColumnLabels = Lists.newArrayList("id", "name");
+ Object[][] returnValue = new Object[][] {
+ new Object[] {1, "Tom"},
+ new Object[] {2, "Jack"},
+ };
+ Object[][] columnMetas = new Object[][] {
+ new Object[] {"", "", "table_delete_executor_test", "id", Types.INTEGER, "INTEGER", 64, 0, 10, 1, "", "", 0, 0, 64, 1, "NO", "YES"},
+ new Object[] {"", "", "table_delete_executor_test", "name", Types.VARCHAR, "VARCHAR", 64, 0, 10, 0, "", "", 0, 0, 64, 2, "YES", "NO"},
+ };
+ Object[][] indexMetas = new Object[][] {
+ new Object[] {"PRIMARY", "id", false, "", 3, 1, "A", 34},
+ };
+
+ MockDriver mockDriver = new MockDriver(returnValueColumnLabels, returnValue, columnMetas, indexMetas);
+ DruidDataSource dataSource = new DruidDataSource();
+ dataSource.setUrl("jdbc:mock:xxx");
+ dataSource.setDriver(mockDriver);
+
+ DataSourceProxy dataSourceProxy = new DataSourceProxy(dataSource);
+ try {
+ Field field = dataSourceProxy.getClass().getDeclaredField("dbType");
+ field.setAccessible(true);
+ field.set(dataSourceProxy, "mysql");
+ ConnectionProxy connectionProxy = new ConnectionProxy(dataSourceProxy, dataSource.getConnection().getConnection());
+ MockStatementBase mockStatement = new MockStatement(dataSource.getConnection().getConnection());
+ statementProxy = new StatementProxy(connectionProxy, mockStatement);
+ } catch (Exception e) {
+ throw new RuntimeException("init failed");
+ }
+ String sql = "delete from t where id = 1";
+ List<SQLStatement> asts = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
+ MySQLDeleteRecognizer recognizer = new MySQLDeleteRecognizer(sql, asts.get(0));
+ deleteExecutor = new DeleteExecutor(statementProxy, (statement, args) -> {
+ return null;
+ }, recognizer);
+ }
+
+ @Test
+ public void testBeforeImage() throws SQLException {
+ Assertions.assertNotNull(deleteExecutor.beforeImage());
+
+ String sql = "delete from t";
+ List<SQLStatement> asts = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
+ MySQLDeleteRecognizer recognizer = new MySQLDeleteRecognizer(sql, asts.get(0));
+ deleteExecutor = new DeleteExecutor(statementProxy, (statement, args) -> null, recognizer);
+ Assertions.assertNotNull(deleteExecutor.beforeImage());
+ }
+
+ @Test
+ public void testAfterImage() throws SQLException {
+ TableRecords tableRecords = deleteExecutor.beforeImage();
+ Assertions.assertTrue(deleteExecutor.afterImage(tableRecords).size() == 0);
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/InsertExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/InsertExecutorTest.java
index c45ed7e19c15c22d7eb1d3c2da9f085c7f20b822..7232fd9ce93e23c08c86c00502a8b31ec479a396 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/InsertExecutorTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/InsertExecutorTest.java
@@ -49,7 +49,6 @@ import static org.mockito.Mockito.when;
/**
* @author guoyao
- * @date 2019/3/21
*/
public class InsertExecutorTest {
@@ -73,15 +72,16 @@ public class InsertExecutorTest {
@BeforeEach
public void init() {
+ connectionProxy = mock(ConnectionProxy.class);
+ when(connectionProxy.getDbType()).thenReturn(JdbcConstants.MYSQL);
+
statementProxy = mock(PreparedStatementProxy.class);
+ when(statementProxy.getConnectionProxy()).thenReturn(connectionProxy);
+
statementCallback = mock(StatementCallback.class);
sqlInsertRecognizer = mock(SQLInsertRecognizer.class);
tableMeta = mock(TableMeta.class);
insertExecutor = Mockito.spy(new InsertExecutor(statementProxy, statementCallback, sqlInsertRecognizer));
-
- connectionProxy = mock(ConnectionProxy.class);
- when(statementProxy.getConnectionProxy()).thenReturn(connectionProxy);
- when(connectionProxy.getDbType()).thenReturn(JdbcConstants.MYSQL);
}
@Test
@@ -160,6 +160,7 @@ public class InsertExecutorTest {
when(tableMeta.getPkName()).thenReturn(ID_COLUMN);
List<Object> pkValues = new ArrayList<>();
pkValues.add(PK_VALUE);
+ doReturn(0).when(insertExecutor).getPkIndex();
List pkValuesByColumn = insertExecutor.getPkValuesByColumn();
Assertions.assertEquals(pkValuesByColumn, pkValues);
}
@@ -186,6 +187,7 @@ public class InsertExecutorTest {
pkValuesAuto.add(PK_VALUE);
//mock getPkValuesByAuto
doReturn(pkValuesAuto).when(insertExecutor).getPkValuesByAuto();
+ doReturn(0).when(insertExecutor).getPkIndex();
List pkValuesByColumn = insertExecutor.getPkValuesByColumn();
//pk value = Null so getPkValuesByAuto
verify(insertExecutor).getPkValuesByAuto();
@@ -309,6 +311,14 @@ public class InsertExecutorTest {
Assertions.assertEquals(pkValuesByAuto, pkValues);
}
+ @Test
+ public void test_getPkIndex() {
+ mockInsertColumns();
+ doReturn(tableMeta).when(insertExecutor).getTableMeta();
+ when(tableMeta.getPkName()).thenReturn(ID_COLUMN);
+ Assertions.assertEquals(0, insertExecutor.getPkIndex());
+ }
+
private List<String> mockInsertColumns() {
List<String> columns = new ArrayList<>();
columns.add(ID_COLUMN);
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/OracleInsertExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/OracleInsertExecutorTest.java
index 40a1a48a7020a0e0bf27af1d9f82465793e2e67e..5f7e7d09021752dc91e22dffe19b9799ca08079d 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/OracleInsertExecutorTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/OracleInsertExecutorTest.java
@@ -31,7 +31,6 @@ import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
import java.sql.ResultSet;
-import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
import java.util.Arrays;
@@ -69,15 +68,16 @@ public class OracleInsertExecutorTest {
@BeforeEach
public void init() {
+ connectionProxy = mock(ConnectionProxy.class);
+ when(connectionProxy.getDbType()).thenReturn(JdbcConstants.ORACLE);
+
statementProxy = mock(PreparedStatementProxy.class);
+ when(statementProxy.getConnectionProxy()).thenReturn(connectionProxy);
+
statementCallback = mock(StatementCallback.class);
sqlInsertRecognizer = mock(SQLInsertRecognizer.class);
tableMeta = mock(TableMeta.class);
insertExecutor = Mockito.spy(new InsertExecutor(statementProxy, statementCallback, sqlInsertRecognizer));
-
- connectionProxy = mock(ConnectionProxy.class);
- when(statementProxy.getConnectionProxy()).thenReturn(connectionProxy);
- when(connectionProxy.getDbType()).thenReturn(JdbcConstants.ORACLE);
}
@Test
@@ -90,6 +90,8 @@ public class OracleInsertExecutorTest {
pkValuesSeq.add(PK_VALUE);
doReturn(pkValuesSeq).when(insertExecutor).getPkValuesBySequence(expr);
+ doReturn(0).when(insertExecutor).getPkIndex();
+
List pkValuesByColumn = insertExecutor.getPkValuesByColumn();
verify(insertExecutor).getPkValuesBySequence(expr);
Assertions.assertEquals(pkValuesByColumn, pkValuesSeq);
@@ -117,10 +119,11 @@ public class OracleInsertExecutorTest {
mockStatementInsertRows();
statementProxy = mock(StatementProxy.class);
- insertExecutor = Mockito.spy(new InsertExecutor(statementProxy, statementCallback, sqlInsertRecognizer));
when(statementProxy.getConnectionProxy()).thenReturn(connectionProxy);
when(connectionProxy.getDbType()).thenReturn(JdbcConstants.ORACLE);
+ insertExecutor = Mockito.spy(new InsertExecutor(statementProxy, statementCallback, sqlInsertRecognizer));
+
doReturn(tableMeta).when(insertExecutor).getTableMeta();
Map<String, ColumnMeta> map = new HashMap<>();
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/PlainExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/PlainExecutorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..77c5923eef9c714dc2401d6e45738ded67249003
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/PlainExecutorTest.java
@@ -0,0 +1,74 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.exec;
+
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.List;
+import com.alibaba.druid.mock.MockStatement;
+import com.alibaba.druid.mock.MockStatementBase;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.google.common.collect.Lists;
+import io.seata.rm.datasource.ConnectionProxy;
+import io.seata.rm.datasource.DataSourceProxy;
+import io.seata.rm.datasource.StatementProxy;
+import io.seata.rm.datasource.mock.MockDriver;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author will
+ */
+public class PlainExecutorTest {
+
+ private PlainExecutor plainExecutor;
+
+ private StatementProxy statementProxy;
+
+ @BeforeEach
+ public void init() throws SQLException {
+ List<String> returnValueColumnLabels = Lists.newArrayList("id", "name");
+ Object[][] returnValue = new Object[][] {
+ new Object[] {1, "Tom"},
+ new Object[] {2, "Jack"},
+ };
+ Object[][] columnMetas = new Object[][] {
+ new Object[] {"", "", "table_plain_executor_test", "id", Types.INTEGER, "INTEGER", 64, 0, 10, 1, "", "", 0, 0, 64, 1, "NO", "YES"},
+ new Object[] {"", "", "table_plain_executor_test", "name", Types.VARCHAR, "VARCHAR", 64, 0, 10, 0, "", "", 0, 0, 64, 2, "YES", "NO"},
+ };
+ Object[][] indexMetas = new Object[][] {
+ new Object[] {"PRIMARY", "id", false, "", 3, 1, "A", 34},
+ };
+
+ MockDriver mockDriver = new MockDriver(returnValueColumnLabels, returnValue, columnMetas, indexMetas);
+ DruidDataSource dataSource = new DruidDataSource();
+ dataSource.setUrl("jdbc:mock:xxx");
+ dataSource.setDriver(mockDriver);
+
+ DataSourceProxy dataSourceProxy = new DataSourceProxy(dataSource);
+ ConnectionProxy connectionProxy = new ConnectionProxy(dataSourceProxy, dataSource.getConnection().getConnection());
+ MockStatementBase mockStatement = new MockStatement(dataSource.getConnection().getConnection());
+ statementProxy = new StatementProxy(connectionProxy, mockStatement);
+
+ plainExecutor = new PlainExecutor(statementProxy, (statement, args) -> null);
+ }
+
+ @Test
+ public void testExecute() throws Throwable {
+ plainExecutor.execute(null);
+ }
+
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/SelectForUpdateExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/SelectForUpdateExecutorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..a2317eae76119e7f1d96a28941c4753bb0af7fd4
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/SelectForUpdateExecutorTest.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.exec;
+
+import java.lang.reflect.Field;
+import java.sql.Types;
+import java.util.List;
+import com.alibaba.druid.mock.MockStatement;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.util.JdbcConstants;
+
+import com.google.common.collect.Lists;
+import io.seata.core.context.RootContext;
+import io.seata.rm.datasource.ConnectionProxy;
+import io.seata.rm.datasource.DataSourceProxy;
+import io.seata.rm.datasource.StatementProxy;
+import io.seata.rm.datasource.mock.MockConnectionProxy;
+import io.seata.rm.datasource.mock.MockDriver;
+import io.seata.rm.datasource.mock.MockLockConflictConnectionProxy;
+import io.seata.rm.datasource.sql.druid.MySQLSelectForUpdateRecognizer;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author will
+ */
+public class SelectForUpdateExecutorTest {
+
+ private static SelectForUpdateExecutor selectForUpdateExecutor;
+
+ private static ConnectionProxy connectionProxy;
+
+ private static StatementProxy statementProxy;
+
+ @BeforeAll
+ public static void init() {
+ List<String> returnValueColumnLabels = Lists.newArrayList("id", "name");
+ Object[][] returnValue = new Object[][] {
+ new Object[] {1, "Tom"},
+ new Object[] {2, "Jack"},
+ };
+ Object[][] columnMetas = new Object[][] {
+ new Object[] {"", "", "table_select_for_update_executor_test", "id", Types.INTEGER, "INTEGER", 64, 0, 10, 1, "", "", 0, 0, 64, 1, "NO", "YES"},
+ new Object[] {"", "", "table_select_for_update_executor_test", "name", Types.VARCHAR, "VARCHAR", 64, 0, 10, 0, "", "", 0, 0, 64, 2, "YES", "NO"},
+ };
+ Object[][] indexMetas = new Object[][] {
+ new Object[] {"PRIMARY", "id", false, "", 3, 1, "A", 34},
+ };
+
+ MockDriver mockDriver = new MockDriver(returnValueColumnLabels, returnValue, columnMetas, indexMetas);
+ DruidDataSource dataSource = new DruidDataSource();
+ dataSource.setUrl("jdbc:mock:xxx");
+ dataSource.setDriver(mockDriver);
+
+ DataSourceProxy dataSourceProxy = new DataSourceProxy(dataSource);
+ try {
+ Field field = dataSourceProxy.getClass().getDeclaredField("dbType");
+ field.setAccessible(true);
+ field.set(dataSourceProxy, "mysql");
+ connectionProxy = new MockConnectionProxy(dataSourceProxy, dataSource.getConnection().getConnection());
+ connectionProxy.bind("xid");
+ MockStatement mockStatement = new MockStatement(dataSource.getConnection().getConnection());
+ statementProxy = new StatementProxy(connectionProxy, mockStatement);
+ } catch (Exception e) {
+ throw new RuntimeException("init failed");
+ }
+
+ String sql = "select * from table_select_for_update_executor_test where id = 1";
+ List<SQLStatement> asts = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
+ MySQLSelectForUpdateRecognizer recognizer = new MySQLSelectForUpdateRecognizer(sql, asts.get(0));
+ selectForUpdateExecutor = new SelectForUpdateExecutor(statementProxy, (statement, args) -> {
+ return null;
+ }, recognizer);
+ }
+
+ @Test
+ public void testDoExecute() throws Throwable {
+ Assertions.assertThrows(RuntimeException.class, () -> {
+ selectForUpdateExecutor.doExecute(null);
+ });
+ RootContext.bind("xid");
+ Assertions.assertDoesNotThrow(() -> {
+ selectForUpdateExecutor.doExecute(null);
+ });
+ RootContext.unbind();
+
+ RootContext.bindGlobalLockFlag();
+ Assertions.assertDoesNotThrow(() -> {
+ selectForUpdateExecutor.doExecute(null);
+ });
+ RootContext.unbindGlobalLockFlag();
+
+ connectionProxy = new MockLockConflictConnectionProxy(connectionProxy.getDataSourceProxy(), connectionProxy.getTargetConnection());
+ statementProxy = new StatementProxy(connectionProxy, statementProxy.getTargetStatement());
+ statementProxy.getTargetStatement().getConnection().setAutoCommit(false);
+ String sql = "select * from dual";
+ List<SQLStatement> asts = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
+ MySQLSelectForUpdateRecognizer recognizer = new MySQLSelectForUpdateRecognizer(sql, asts.get(0));
+ selectForUpdateExecutor = new SelectForUpdateExecutor(statementProxy, (statement, args) -> null, recognizer);
+
+ RootContext.bind("xid");
+ Assertions.assertThrows(LockWaitTimeoutException.class, () -> {
+ selectForUpdateExecutor.doExecute(null);
+ });
+ RootContext.unbind();
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/exec/UpdateExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/UpdateExecutorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..390910971ab681e9b2e53541d0e4685d00c3e369
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/exec/UpdateExecutorTest.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.exec;
+
+import java.lang.reflect.Field;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.List;
+
+import com.alibaba.druid.mock.MockStatement;
+import com.alibaba.druid.mock.MockStatementBase;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.util.JdbcConstants;
+
+import com.google.common.collect.Lists;
+import io.seata.rm.datasource.ConnectionProxy;
+import io.seata.rm.datasource.DataSourceProxy;
+import io.seata.rm.datasource.StatementProxy;
+import io.seata.rm.datasource.mock.MockDriver;
+import io.seata.rm.datasource.sql.druid.MySQLUpdateRecognizer;
+import io.seata.rm.datasource.sql.struct.TableRecords;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author will
+ */
+public class UpdateExecutorTest {
+
+ private static UpdateExecutor updateExecutor;
+
+ private static StatementProxy statementProxy;
+
+ @BeforeAll
+ public static void init() {
+ List<String> returnValueColumnLabels = Lists.newArrayList("id", "name");
+ Object[][] returnValue = new Object[][] {
+ new Object[] {1, "Tom"},
+ new Object[] {2, "Jack"},
+ };
+ Object[][] columnMetas = new Object[][] {
+ new Object[] {"", "", "table_update_executor_test", "id", Types.INTEGER, "INTEGER", 64, 0, 10, 1, "", "", 0, 0, 64, 1, "NO", "YES"},
+ new Object[] {"", "", "table_update_executor_test", "name", Types.VARCHAR, "VARCHAR", 64, 0, 10, 0, "", "", 0, 0, 64, 2, "YES", "NO"},
+ };
+ Object[][] indexMetas = new Object[][] {
+ new Object[] {"PRIMARY", "id", false, "", 3, 1, "A", 34},
+ };
+
+ MockDriver mockDriver = new MockDriver(returnValueColumnLabels, returnValue, columnMetas, indexMetas);
+ DruidDataSource dataSource = new DruidDataSource();
+ dataSource.setUrl("jdbc:mock:xxx");
+ dataSource.setDriver(mockDriver);
+
+ DataSourceProxy dataSourceProxy = new DataSourceProxy(dataSource);
+ try {
+ Field field = dataSourceProxy.getClass().getDeclaredField("dbType");
+ field.setAccessible(true);
+ field.set(dataSourceProxy, "mysql");
+ ConnectionProxy connectionProxy = new ConnectionProxy(dataSourceProxy, dataSource.getConnection().getConnection());
+ MockStatementBase mockStatement = new MockStatement(dataSource.getConnection().getConnection());
+ statementProxy = new StatementProxy(connectionProxy, mockStatement);
+ } catch (Exception e) {
+ throw new RuntimeException("init failed");
+ }
+ String sql = "update table_update_executor_test set name = 'WILL'";
+ List<SQLStatement> asts = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
+ MySQLUpdateRecognizer recognizer = new MySQLUpdateRecognizer(sql, asts.get(0));
+ updateExecutor = new UpdateExecutor(statementProxy, (statement, args) -> {
+ return null;
+ }, recognizer);
+ }
+
+ @Test
+ public void testBeforeImage() throws SQLException {
+ Assertions.assertNotNull(updateExecutor.beforeImage());
+
+ String sql = "update table_update_executor_test set name = 'WILL' where id = 1";
+ List<SQLStatement> asts = SQLUtils.parseStatements(sql, JdbcConstants.MYSQL);
+ MySQLUpdateRecognizer recognizer = new MySQLUpdateRecognizer(sql, asts.get(0));
+ updateExecutor = new UpdateExecutor(statementProxy, (statement, args) -> null, recognizer);
+ Assertions.assertNotNull(updateExecutor.beforeImage());
+ }
+
+ @Test
+ public void testAfterImage() throws SQLException {
+ TableRecords beforeImage = updateExecutor.beforeImage();
+ TableRecords afterImage = updateExecutor.afterImage(beforeImage);
+ Assertions.assertNotNull(afterImage);
+
+ afterImage = updateExecutor.afterImage(new TableRecords());
+ Assertions.assertNotNull(afterImage);
+
+ afterImage = updateExecutor.afterImage(null);
+ Assertions.assertNotNull(afterImage);
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockBlob.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockBlob.java
new file mode 100644
index 0000000000000000000000000000000000000000..a92c7e83d6f0ba20ee37b0304db7f555c336d9f0
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockBlob.java
@@ -0,0 +1,85 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.mock;
+
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.sql.Blob;
+import java.sql.SQLException;
+
+/**
+ * @author will
+ */
+public class MockBlob implements Blob {
+
+ public MockBlob() {
+ }
+
+ @Override
+ public long length() throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public byte[] getBytes(long pos, int length) throws SQLException {
+ return new byte[0];
+ }
+
+ @Override
+ public InputStream getBinaryStream() throws SQLException {
+ return null;
+ }
+
+ @Override
+ public long position(byte[] pattern, long start) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public long position(Blob pattern, long start) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public int setBytes(long pos, byte[] bytes) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public int setBytes(long pos, byte[] bytes, int offset, int len) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public OutputStream setBinaryStream(long pos) throws SQLException {
+ return null;
+ }
+
+ @Override
+ public void truncate(long len) throws SQLException {
+
+ }
+
+ @Override
+ public void free() throws SQLException {
+
+ }
+
+ @Override
+ public InputStream getBinaryStream(long pos, long length) throws SQLException {
+ return null;
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockClob.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockClob.java
new file mode 100644
index 0000000000000000000000000000000000000000..00a1908d1ef4e4453ea5f01bbde69eac09a0f3c1
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockClob.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.mock;
+
+import java.io.ByteArrayInputStream;
+import java.io.CharArrayReader;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Reader;
+import java.io.Writer;
+import java.sql.Clob;
+import java.sql.SQLException;
+
+/**
+ * @author will
+ */
+public class MockClob implements Clob {
+
+ @Override
+ public long length() throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public String getSubString(long pos, int length) throws SQLException {
+ return null;
+ }
+
+ @Override
+ public Reader getCharacterStream() throws SQLException {
+ return new CharArrayReader(new char[0]);
+ }
+
+ @Override
+ public InputStream getAsciiStream() throws SQLException {
+ return new ByteArrayInputStream(new byte[0]);
+ }
+
+ @Override
+ public long position(String searchstr, long start) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public long position(Clob searchstr, long start) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public int setString(long pos, String str) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public int setString(long pos, String str, int offset, int len) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public OutputStream setAsciiStream(long pos) throws SQLException {
+ return null;
+ }
+
+ @Override
+ public Writer setCharacterStream(long pos) throws SQLException {
+ return null;
+ }
+
+ @Override
+ public void truncate(long len) throws SQLException {
+
+ }
+
+ @Override
+ public void free() throws SQLException {
+
+ }
+
+ @Override
+ public Reader getCharacterStream(long pos, long length) throws SQLException {
+ return null;
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockConnection.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockConnection.java
index 006b6265e2e90b33404f8f4b3376bd0ab35c832c..6b03d526b6fcf7f19e19a71ed01f7a1ac5ca7db0 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockConnection.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockConnection.java
@@ -17,12 +17,12 @@ package io.seata.rm.datasource.mock;
import java.sql.DatabaseMetaData;
import java.sql.SQLException;
+import java.sql.Savepoint;
import java.util.Properties;
/**
* Mock connection
* @author will
- * @date 2019/8/14
*/
public class MockConnection extends com.alibaba.druid.mock.MockConnection {
@@ -44,6 +44,21 @@ public class MockConnection extends com.alibaba.druid.mock.MockConnection {
return new MockDatabaseMetaData(this);
}
+ @Override
+ public void releaseSavepoint(Savepoint savepoint) throws SQLException {
+
+ }
+
+ @Override
+ public void rollback() {
+
+ }
+
+ @Override
+ public void rollback(Savepoint savepoint) {
+
+ }
+
@Override
public MockDriver getDriver() {
return mockDriver;
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockConnectionProxy.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockConnectionProxy.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b287e2d952eceb82e1c4ec37a72c3e3341b602b
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockConnectionProxy.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.mock;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import io.seata.rm.datasource.ConnectionProxy;
+import io.seata.rm.datasource.DataSourceProxy;
+
+/**
+ * @author will
+ */
+public class MockConnectionProxy extends ConnectionProxy {
+ /**
+ * Instantiates a new Connection proxy.
+ *
+ * @param dataSourceProxy the data source proxy
+ * @param targetConnection the target connection
+ */
+ public MockConnectionProxy(DataSourceProxy dataSourceProxy,
+ Connection targetConnection) {
+ super(dataSourceProxy, targetConnection);
+ }
+
+ @Override
+ public void checkLock(String lockKeys) throws SQLException {
+ //do nothing
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockDatabaseMetaData.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockDatabaseMetaData.java
index b2dc929414719e2e5a0b10af508917660a5cfdc8..e217947e16c5a85c9648d591a29641a66507eca0 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockDatabaseMetaData.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockDatabaseMetaData.java
@@ -27,7 +27,6 @@ import com.alibaba.druid.mock.MockStatementBase;
/**
* @author will
- * @date 2019/8/14
*/
public class MockDatabaseMetaData implements DatabaseMetaData {
@@ -704,8 +703,8 @@ public class MockDatabaseMetaData implements DatabaseMetaData {
@Override
public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
throws SQLException {
- return new MockResultSet((MockStatementBase)this.connection.createStatement(), columnMetaColumnLabels)
- .mockResultSet(columnsMetasReturnValue);
+ return new MockResultSet((MockStatementBase)this.connection.createStatement())
+ .mockResultSet(columnMetaColumnLabels, columnsMetasReturnValue);
}
@Override
@@ -761,8 +760,8 @@ public class MockDatabaseMetaData implements DatabaseMetaData {
@Override
public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate)
throws SQLException {
- return new MockResultSet((MockStatementBase)this.connection.createStatement(), indexMetaColumnLabels)
- .mockResultSet(indexMetasReturnValue);
+ return new MockResultSet((MockStatementBase)this.connection.createStatement())
+ .mockResultSet(indexMetaColumnLabels, indexMetasReturnValue);
}
@Override
@@ -838,7 +837,7 @@ public class MockDatabaseMetaData implements DatabaseMetaData {
@Override
public boolean supportsSavepoints() throws SQLException {
- return false;
+ return true;
}
@Override
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockDriver.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockDriver.java
index 528fdd2f5f4b440e41528da07609fdebf314a19e..6106e6477e6721989dc10811cd281a38c9cb6729 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockDriver.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockDriver.java
@@ -17,54 +17,61 @@ package io.seata.rm.datasource.mock;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.List;
import java.util.Properties;
import com.alibaba.druid.mock.MockStatementBase;
import com.alibaba.druid.mock.handler.MockExecuteHandler;
+import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Mock driver
* @author will
- * @date 2019/8/14
*/
public class MockDriver extends com.alibaba.druid.mock.MockDriver {
private static final Logger LOGGER = LoggerFactory.getLogger(MockDriver.class);
+ /**
+ * the mock column labels of return value
+ */
+ private List<String> mockReturnValueColumnLabels;
+
/**
* the mock value of return value
*/
- private Object[][] mockReturnValue = null;
+ private Object[][] mockReturnValue;
/**
* the mock value of columns meta return value
*/
- private Object[][] mockColumnsMetasReturnValue = null;
+ private Object[][] mockColumnsMetasReturnValue;
/**
* the mock value of index meta return value
*/
- private Object[][] mockIndexMetasReturnValue = null;
+ private Object[][] mockIndexMetasReturnValue;
/**
* the mock execute handler
*/
- private MockExecuteHandler mockExecuteHandler = null;
+ private MockExecuteHandler mockExecuteHandler;
public MockDriver(Object[][] mockColumnsMetasReturnValue, Object[][] mockIndexMetasReturnValue) {
- this(new Object[][]{}, mockColumnsMetasReturnValue, mockIndexMetasReturnValue);
+ this(Lists.newArrayList(), new Object[][]{}, mockColumnsMetasReturnValue, mockIndexMetasReturnValue);
}
/**
* Instantiate a new MockDriver
*/
- public MockDriver(Object[][] mockReturnValue, Object[][] mockColumnsMetasReturnValue, Object[][] mockIndexMetasReturnValue) {
+ public MockDriver(List<String> mockReturnValueColumnLabels, Object[][] mockReturnValue, Object[][] mockColumnsMetasReturnValue, Object[][] mockIndexMetasReturnValue) {
+ this.mockReturnValueColumnLabels = mockReturnValueColumnLabels;
this.mockReturnValue = mockReturnValue;
this.mockColumnsMetasReturnValue = mockColumnsMetasReturnValue;
this.mockIndexMetasReturnValue = mockIndexMetasReturnValue;
- this.setMockExecuteHandler(new MockExecuteHandlerImpl(mockReturnValue));
+ this.setMockExecuteHandler(new MockExecuteHandlerImpl(mockReturnValueColumnLabels, mockReturnValue, mockColumnsMetasReturnValue));
}
/**
@@ -85,6 +92,10 @@ public class MockDriver extends com.alibaba.druid.mock.MockDriver {
return this.mockExecuteHandler.executeQuery(stmt, sql);
}
+ public MockPreparedStatement createSeataMockPreparedStatement(MockConnection conn, String sql) {
+ return new MockPreparedStatement(conn, sql);
+ }
+
/**
* mock the return value
* @return
@@ -98,7 +109,7 @@ public class MockDriver extends com.alibaba.druid.mock.MockDriver {
* @param mockReturnValue
*/
public void setMockReturnValue(Object[][] mockReturnValue) {
- this.mockReturnValue = mockReturnValue;
+ this.mockReturnValue = mockReturnValue == null ? new Object[][]{} : mockReturnValue;
}
/**
@@ -106,7 +117,7 @@ public class MockDriver extends com.alibaba.druid.mock.MockDriver {
* @param mockColumnsMetasReturnValue
*/
public void setMockColumnsMetasReturnValue(Object[][] mockColumnsMetasReturnValue) {
- this.mockColumnsMetasReturnValue = mockColumnsMetasReturnValue;
+ this.mockColumnsMetasReturnValue = mockColumnsMetasReturnValue == null ? new Object[][]{} : mockColumnsMetasReturnValue;
}
/**
@@ -122,7 +133,7 @@ public class MockDriver extends com.alibaba.druid.mock.MockDriver {
* @param mockIndexMetasReturnValue
*/
public void setMockIndexMetasReturnValue(Object[][] mockIndexMetasReturnValue) {
- this.mockIndexMetasReturnValue = mockIndexMetasReturnValue;
+ this.mockIndexMetasReturnValue = mockIndexMetasReturnValue == null ? new Object[][]{} : mockIndexMetasReturnValue;
}
/**
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockExecuteHandlerImpl.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockExecuteHandlerImpl.java
index 44bdadc7809c64b3a5e1684eb14482ec3d6be9e6..fa7b9db117d8448fec7dfcd7c7553f74f75cde4f 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockExecuteHandlerImpl.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockExecuteHandlerImpl.java
@@ -17,26 +17,38 @@ package io.seata.rm.datasource.mock;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.List;
import com.alibaba.druid.mock.MockStatementBase;
import com.alibaba.druid.mock.handler.MockExecuteHandler;
/**
* @author will
- * @date 2019/8/16
*/
public class MockExecuteHandlerImpl implements MockExecuteHandler {
/**
* the mock value of return value
*/
- private Object[][] mockReturnValue = null;
+ private Object[][] mockReturnValue;
+
+ /**
+ * the mock column labels of return value
+ */
+ private List<String> mockReturnValueColumnLabels;
+
+ /**
+ * the mock column meta
+ */
+ private Object[][] mockColumnsMetasReturnValue;
/**
* Instantiate MockExecuteHandlerImpl
* @param mockReturnValue
*/
- public MockExecuteHandlerImpl(Object[][] mockReturnValue) {
+ public MockExecuteHandlerImpl(List<String> mockReturnValueColumnLabels, Object[][] mockReturnValue, Object[][] mockColumnsMetasReturnValue) {
+ this.mockReturnValueColumnLabels = mockReturnValueColumnLabels;
this.mockReturnValue = mockReturnValue;
+ this.mockColumnsMetasReturnValue = mockColumnsMetasReturnValue;
}
@Override
@@ -44,8 +56,9 @@ public class MockExecuteHandlerImpl implements MockExecuteHandler {
MockResultSet resultSet = new MockResultSet(statement);
//mock the return value
- resultSet.mockResultSet(mockReturnValue);
-
+ resultSet.mockResultSet(mockReturnValueColumnLabels, mockReturnValue);
+ //mock the rs meta data
+ resultSet.mockResultSetMetaData(mockColumnsMetasReturnValue);
return resultSet;
}
}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockLockConflictConnectionProxy.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockLockConflictConnectionProxy.java
new file mode 100644
index 0000000000000000000000000000000000000000..80f35374b8eb4a9e8fbb646689015404f8169ca2
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockLockConflictConnectionProxy.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.mock;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.sql.Savepoint;
+
+import io.seata.rm.datasource.ConnectionProxy;
+import io.seata.rm.datasource.DataSourceProxy;
+import io.seata.rm.datasource.exec.LockConflictException;
+
+/**
+ * @author will
+ */
+public class MockLockConflictConnectionProxy extends ConnectionProxy {
+ /**
+ * Instantiates a new Connection proxy.
+ *
+ * @param dataSourceProxy the data source proxy
+ * @param targetConnection the target connection
+ */
+ public MockLockConflictConnectionProxy(DataSourceProxy dataSourceProxy,
+ Connection targetConnection) {
+ super(dataSourceProxy, targetConnection);
+ }
+
+ @Override
+ public void releaseSavepoint(Savepoint savepoint) throws SQLException {
+ super.releaseSavepoint(savepoint);
+ }
+
+ @Override
+ public void checkLock(String lockKeys) throws SQLException {
+ throw new LockConflictException("mock lock conflict");
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockParameterMetaData.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockParameterMetaData.java
new file mode 100644
index 0000000000000000000000000000000000000000..a4469a0a1f0dec4b4cc3f1d57b6754b4e26280b8
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockParameterMetaData.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.mock;
+
+import java.sql.ParameterMetaData;
+import java.sql.SQLException;
+
+/**
+ * @author will
+ */
+public class MockParameterMetaData implements ParameterMetaData {
+
+ private int parameterCount;
+
+ public MockParameterMetaData(String sql) {
+ for (int i = 0; i < sql.length(); i++) {
+ if (sql.charAt(i) == '?') {
+ parameterCount++;
+ }
+ }
+ }
+
+ @Override
+ public int getParameterCount() throws SQLException {
+ return parameterCount;
+ }
+
+ @Override
+ public int isNullable(int param) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public boolean isSigned(int param) throws SQLException {
+ return false;
+ }
+
+ @Override
+ public int getPrecision(int param) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public int getScale(int param) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public int getParameterType(int param) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public String getParameterTypeName(int param) throws SQLException {
+ return null;
+ }
+
+ @Override
+ public String getParameterClassName(int param) throws SQLException {
+ return null;
+ }
+
+ @Override
+ public int getParameterMode(int param) throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public <T> T unwrap(Class<T> iface) throws SQLException {
+ return null;
+ }
+
+ @Override
+ public boolean isWrapperFor(Class<?> iface) throws SQLException {
+ return false;
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockPreparedStatement.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockPreparedStatement.java
new file mode 100644
index 0000000000000000000000000000000000000000..7ee88f3db5346b5e91c0acc7f8581a85d1520b26
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockPreparedStatement.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.mock;
+
+import java.sql.ParameterMetaData;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import com.alibaba.druid.mock.MockStatementBase;
+import com.alibaba.druid.util.jdbc.PreparedStatementBase;
+
+/**
+ * @author will
+ */
+public class MockPreparedStatement extends PreparedStatementBase implements MockStatementBase {
+
+ private final String sql;
+
+ private ParameterMetaData parameterMetaData;
+
+ public MockPreparedStatement(MockConnection conn, String sql){
+ super(conn);
+ this.sql = sql;
+ parameterMetaData = new MockParameterMetaData(sql);
+ }
+
+ @Override
+ public ResultSet executeQuery() throws SQLException {
+ MockConnection conn = getConnection();
+
+ if (conn != null && conn.getDriver() != null) {
+ return conn.getDriver().executeQuery(this, sql);
+ }
+ return null;
+ }
+
+ @Override
+ public int executeUpdate() throws SQLException {
+ return 0;
+ }
+
+ @Override
+ public boolean execute() throws SQLException {
+ return false;
+ }
+
+ @Override
+ public ParameterMetaData getParameterMetaData() throws SQLException {
+ return this.parameterMetaData;
+ }
+
+ public MockConnection getConnection() throws SQLException {
+ return (MockConnection) super.getConnection();
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockResultSet.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockResultSet.java
index a3e7680388a82a6aaa0444aaeb25bd7d240e67d4..e2ba78ef421d04c0e203ccbd75f9ff4654d7a063 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockResultSet.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockResultSet.java
@@ -16,8 +16,14 @@
package io.seata.rm.datasource.mock;
import com.alibaba.druid.util.jdbc.ResultSetBase;
+
+import com.google.common.collect.Lists;
+import io.seata.rm.datasource.sql.struct.ColumnMeta;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.sql.Blob;
+import java.sql.Clob;
+import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.sql.Statement;
import java.util.ArrayList;
@@ -25,54 +31,66 @@ import java.util.List;
/**
* @author will
- * @date 2019/8/14
*/
public class MockResultSet extends ResultSetBase {
- private List<String> columnLabels;
+ private List<ColumnMeta> columnMetas;
private int rowIndex = -1;
+ /**
+ * the column label
+ */
+ private List<String> columnLabels;
+
+ /**
+ * the return value
+ */
private List<Object[]> rows;
private static final Logger LOGGER = LoggerFactory.getLogger(MockResultSet.class);
- public MockResultSet(Statement statement) {
- this(statement, null);
- }
-
/**
* Instantiates a new Mock result set.
- *
- * @param statement the statement
- * @param columnLabels the column labels
+ * @param statement
*/
- public MockResultSet(Statement statement, List<String> columnLabels) {
+ public MockResultSet(Statement statement) {
super(statement);
- this.columnLabels = columnLabels;
- this.rows = new ArrayList<Object[]>();
- super.metaData = new MockResultSetMetaData();
+ this.rows = new ArrayList<>();
+ this.columnMetas = Lists.newArrayList();
}
/**
* mock result set
- * @param metas
+ * @param mockColumnLabels
+ * @param mockReturnValue
* @return
*/
- public MockResultSet mockResultSet(Object[][] metas){
- if(metas.length < 1){
- return this;
+ public MockResultSet mockResultSet(List<String> mockColumnLabels, Object[][] mockReturnValue){
+ this.columnLabels = mockColumnLabels;
+ for (int i = 0; i < mockReturnValue.length; i++) {
+ Object[] row = mockReturnValue[i];
+ this.getRows().add(row);
}
+ return this;
+ }
- for (Object[] columnMeta : metas) {
- this.getRows().add(columnMeta);
+ public void mockResultSetMetaData(Object[][] mockColumnsMetasReturnValue) {
+ for (Object[] meta : mockColumnsMetasReturnValue) {
+ ColumnMeta columnMeta = new ColumnMeta();
+ columnMeta.setTableName(meta[2].toString());
+ columnMeta.setColumnName(meta[3].toString());
+ this.columnMetas.add(columnMeta);
}
+ }
- return this;
+ @Override
+ public ResultSetMetaData getMetaData() throws SQLException {
+ return new MockResultSetMetaData(columnMetas);
}
public MockResultSetMetaData getMockMetaData() {
- return (MockResultSetMetaData) metaData;
+ return new MockResultSetMetaData(columnMetas);
}
@Override
@@ -93,6 +111,28 @@ public class MockResultSet extends ResultSetBase {
return columnLabels.indexOf(columnLabel) + 1;
}
+ @Override
+ public Blob getBlob(String columnLabel) throws SQLException {
+ return getBlob(findColumn(columnLabel));
+ }
+
+ @Override
+ public Blob getBlob(int columnIndex) throws SQLException {
+ byte[] bytes = getObjectInternal(columnIndex).toString().getBytes();
+ return new MockBlob();
+ }
+
+ @Override
+ public Clob getClob(String columnLabel) throws SQLException {
+ return getClob(findColumn(columnLabel));
+ }
+
+ @Override
+ public Clob getClob(int columnIndex) throws SQLException {
+ char[] chars = getObjectInternal(columnIndex).toString().toCharArray();
+ return new MockClob();
+ }
+
public Object getObjectInternal(int columnIndex) {
Object[] row = rows.get(rowIndex);
Object obj = row[columnIndex - 1];
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockResultSetMetaData.java b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockResultSetMetaData.java
index 140f2f7e9237609fa55be67c13733cc90a2bd4e4..f0f2c8a67ddc4df018c825a0266d942795d555ed 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockResultSetMetaData.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/mock/MockResultSetMetaData.java
@@ -14,6 +14,7 @@
* limitations under the License.
*/
package io.seata.rm.datasource.mock;
+import io.seata.common.util.ReflectionUtil;
import io.seata.rm.datasource.sql.struct.ColumnMeta;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
@@ -22,11 +23,14 @@ import java.util.List;
/**
* @author will
- * @date 2019/8/28
*/
public class MockResultSetMetaData implements ResultSetMetaData {
- private final List<ColumnMeta> columns = new ArrayList<ColumnMeta>();
+ private List<ColumnMeta> columns;
+
+ public MockResultSetMetaData(List<ColumnMeta> columns) {
+ this.columns = columns;
+ }
public List<ColumnMeta> getColumns() {
return columns;
@@ -99,7 +103,17 @@ public class MockResultSetMetaData implements ResultSetMetaData {
@Override
public String getTableName(int column) throws SQLException {
- return null;
+ ColumnMeta columnMeta = getColumn(column);
+ try {
+ Object tableName = ReflectionUtil.getFieldValue(columnMeta, "tableName");
+ return tableName.toString();
+ } catch (NoSuchFieldException e) {
+ e.printStackTrace();
+ return null;
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ return null;
+ }
}
@Override
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleDeleteRecognizerTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleDeleteRecognizerTest.java
index 9cf55b2d10ebd6dcdb0ea2eec6495f1d58b13111..80975ccce12d8a4b6d514887a2981446e724b4ab 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleDeleteRecognizerTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleDeleteRecognizerTest.java
@@ -29,7 +29,6 @@ import java.util.List;
/**
* @author will
- * @date 2019/9/23
*/
public class OracleDeleteRecognizerTest {
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleInsertRecognizerTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleInsertRecognizerTest.java
index 74c8f9df2912ad75b80f689a1011af5c27c2a471..e5accc16710479ad32df241a96023ef6d253b2c5 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleInsertRecognizerTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleInsertRecognizerTest.java
@@ -27,7 +27,6 @@ import org.junit.jupiter.api.Test;
/**
* @author will
- * @date 2019/9/23
*/
public class OracleInsertRecognizerTest {
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleSelectForUpdateRecognizerTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleSelectForUpdateRecognizerTest.java
index 5a59f39eaddc1e43bd8e433d20faae4146225315..76778f157f34468aaa8a428fef8eb01ce682aea6 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleSelectForUpdateRecognizerTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleSelectForUpdateRecognizerTest.java
@@ -31,7 +31,6 @@ import java.util.List;
/**
* @author will
- * @date 2019/9/24
*/
public class OracleSelectForUpdateRecognizerTest {
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleUpdateRecognizerTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleUpdateRecognizerTest.java
index 7e3f4ab2ea0cc85f3141a6fa35769b0477f24fb8..21004a455b7421d221a8cbfa2afd21a700320508 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleUpdateRecognizerTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/druid/oracle/OracleUpdateRecognizerTest.java
@@ -32,7 +32,6 @@ import java.util.List;
/**
* @author will
- * @date 2019/9/23
*/
public class OracleUpdateRecognizerTest {
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/ColumnMetaTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/ColumnMetaTest.java
index 555799b4f4adf2c959518e788326eb55d958fd9e..810bdb8f76b23646c92ba068fe218cae66457c74 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/ColumnMetaTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/ColumnMetaTest.java
@@ -20,7 +20,6 @@ import org.junit.jupiter.api.Test;
/**
* @author will
- * @date 2019/9/28
*/
public class ColumnMetaTest {
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/IndexMetaTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/IndexMetaTest.java
index 742a5940920cdbf5b64f22a318feb8e2fa50852e..9b6f2f5013a2eae151e3f1812ab0308e54e26cff 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/IndexMetaTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/IndexMetaTest.java
@@ -21,7 +21,6 @@ import org.junit.jupiter.api.Test;
/**
* @author will
- * @date 2019/9/28
*/
public class IndexMetaTest {
@@ -29,7 +28,6 @@ public class IndexMetaTest {
public void testIndexMeta() {
IndexMeta indexMeta = new IndexMeta();
indexMeta.setValues(Lists.newArrayList());
- Assertions.assertNotNull(indexMeta.getIndexvalue());
Assertions.assertNotNull(indexMeta.toString());
Assertions.assertEquals(indexMeta, indexMeta);
Assertions.assertEquals(indexMeta.hashCode(), indexMeta.hashCode());
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/IndexTypeTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/IndexTypeTest.java
index 54b5eec1727112f6d69c42ccf6cf03316a529669..840d3a4068e607905d29e4acdd0dcd82bec7e4ca 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/IndexTypeTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/IndexTypeTest.java
@@ -20,7 +20,6 @@ import org.junit.jupiter.api.Test;
/**
* @author will
- * @date 2019/9/28
*/
public class IndexTypeTest {
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaCacheFactoryTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaCacheFactoryTest.java
index 588afb9c8714c6fc0bfc21407d8666cad6b9e9b6..80a024999fa472990948cc61e666b5be1b4f96c9 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaCacheFactoryTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaCacheFactoryTest.java
@@ -1,3 +1,18 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.sql.struct;
import com.alibaba.druid.util.JdbcConstants;
@@ -9,7 +24,6 @@ import org.junit.jupiter.api.Test;
/**
* @author guoyao
- * @date 2019-10-14
*/
public class TableMetaCacheFactoryTest {
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaCacheTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaCacheTest.java
index a9f2c1826f8aa77ac112da160ece0ed567bd9c8e..368c33eb2821768265c23b55156ac1b1ad8f8a69 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaCacheTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaCacheTest.java
@@ -23,6 +23,7 @@ import io.seata.rm.datasource.mock.MockDriver;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import java.sql.SQLException;
import java.sql.Types;
import java.util.Collections;
@@ -56,7 +57,7 @@ public class TableMetaCacheTest {
TableMetaCache tableMetaCache = getTableMetaCache();
Assertions.assertNotNull(tableMetaCache);
Assertions.assertThrows(IllegalArgumentException.class, () -> {
- tableMetaCache.getTableMeta(null, null);
+ tableMetaCache.getTableMeta(null, null, null);
});
}
@@ -68,7 +69,7 @@ public class TableMetaCacheTest {
* The table meta fetch test.
*/
@Test
- public void getTableMetaTest_0() {
+ public void getTableMetaTest_0() throws SQLException {
MockDriver mockDriver = new MockDriver(columnMetas, indexMetas);
DruidDataSource dataSource = new DruidDataSource();
@@ -77,7 +78,7 @@ public class TableMetaCacheTest {
DataSourceProxy proxy = new DataSourceProxy(dataSource);
- TableMeta tableMeta = getTableMetaCache().getTableMeta(proxy, "t1");
+ TableMeta tableMeta = getTableMetaCache().getTableMeta(proxy.getPlainConnection(), "t1", proxy.getResourceId());
Assertions.assertEquals("t1", tableMeta.getTableName());
Assertions.assertEquals("id", tableMeta.getPkName());
@@ -106,18 +107,18 @@ public class TableMetaCacheTest {
};
mockDriver.setMockIndexMetasReturnValue(indexMetas);
Assertions.assertThrows(ShouldNeverHappenException.class, () -> {
- getTableMetaCache().getTableMeta(proxy, "t2");
+ getTableMetaCache().getTableMeta(proxy.getPlainConnection(), "t2", proxy.getResourceId());
});
mockDriver.setMockColumnsMetasReturnValue(null);
Assertions.assertThrows(ShouldNeverHappenException.class, () -> {
- getTableMetaCache().getTableMeta(proxy, "t2");
+ getTableMetaCache().getTableMeta(proxy.getPlainConnection(), "t2", proxy.getResourceId());
});
}
@Test
- public void refreshTest_0() {
+ public void refreshTest_0() throws SQLException {
MockDriver mockDriver = new MockDriver(columnMetas, indexMetas);
DruidDataSource druidDataSource = new DruidDataSource();
@@ -126,7 +127,8 @@ public class TableMetaCacheTest {
DataSourceProxy dataSourceProxy = new DataSourceProxy(druidDataSource);
- TableMeta tableMeta = getTableMetaCache().getTableMeta(dataSourceProxy, "t1");
+ TableMeta tableMeta = getTableMetaCache().getTableMeta(dataSourceProxy.getPlainConnection(), "t1",
+ dataSourceProxy.getResourceId());
//change the columns meta
columnMetas =
new Object[][] {
@@ -139,12 +141,7 @@ public class TableMetaCacheTest {
"NO"}
};
mockDriver.setMockColumnsMetasReturnValue(columnMetas);
- getTableMetaCache().refresh(dataSourceProxy);
-
- //test exception
- mockDriver.setMockColumnsMetasReturnValue(null);
- getTableMetaCache().refresh(dataSourceProxy);
-
+ getTableMetaCache().refresh(dataSourceProxy.getPlainConnection(), dataSourceProxy.getResourceId());
}
private void assertColumnMetaEquals(Object[] expected, ColumnMeta actual) {
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaTest.java
index 8de709cb5084ac681865ad31d0f3c3eab807af9e..b29bb85a4e861a3d078707cd97d8b2202a7ce8d5 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableMetaTest.java
@@ -16,14 +16,12 @@
package io.seata.rm.datasource.sql.struct;
import com.google.common.collect.Lists;
-import com.sun.org.apache.xpath.internal.operations.String;
import io.seata.common.exception.NotSupportYetException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
/**
* @author will
- * @date 2019/9/28
*/
public class TableMetaTest {
@@ -52,8 +50,8 @@ public class TableMetaTest {
public void testGetColumnMeta() {
TableMeta tableMeta = new TableMeta();
tableMeta.getAllColumns().put("id", new ColumnMeta());
- tableMeta.getAllColumns().put("`name`", new ColumnMeta());
- Assertions.assertNotNull(tableMeta.getColumnMeta("`id`"));
+ tableMeta.getAllColumns().put("name", new ColumnMeta());
+ Assertions.assertNull(tableMeta.getColumnMeta("`id`"));
Assertions.assertNotNull(tableMeta.getColumnMeta("name"));
}
@@ -116,8 +114,11 @@ public class TableMetaTest {
public void testContainsPK() {
TableMeta tableMeta = new TableMeta();
Assertions.assertFalse(tableMeta.containsPK(null));
- Assertions.assertFalse(tableMeta.containsPK(Lists.newArrayList("id")));
-
+ Throwable exception = Assertions.assertThrows(NotSupportYetException.class, () -> {
+ tableMeta.containsPK(Lists.newArrayList("id"));
+ });
+ Assertions.assertEquals(tableMeta.getTableName() + " needs to contain the primary key.",
+ exception.getMessage());
IndexMeta primary = new IndexMeta();
primary.setIndextype(IndexType.PRIMARY);
ColumnMeta columnMeta = new ColumnMeta();
@@ -127,60 +128,4 @@ public class TableMetaTest {
Assertions.assertTrue(tableMeta.containsPK(Lists.newArrayList("id")));
Assertions.assertTrue(tableMeta.containsPK(Lists.newArrayList("ID")));
}
-
- @Test
- public void testGetCreateTableSQL() {
- TableMeta tableMeta = new TableMeta();
- ColumnMeta id = new ColumnMeta();
- id.setColumnName("id");
- id.setColumnSize(1);
- id.setColumnDef("columnDef");
- id.setIsNullAble("isNullAble");
- ColumnMeta name = new ColumnMeta();
- name.setColumnName("name");
- ColumnMeta description = new ColumnMeta();
- name.setColumnName("description");
- ColumnMeta englishName = new ColumnMeta();
- name.setColumnName("englishName");
- ColumnMeta chineseName = new ColumnMeta();
- name.setColumnName("chineseName");
- ColumnMeta userCode = new ColumnMeta();
- userCode.setColumnName("userCode");
- tableMeta.getAllColumns().put("id", id);
- tableMeta.getAllColumns().put("name", name);
- tableMeta.getAllColumns().put("description", description);
- tableMeta.getAllColumns().put("englishName", englishName);
- tableMeta.getAllColumns().put("chineseName", chineseName);
- tableMeta.getAllColumns().put("userCode", userCode);
-
- IndexMeta primary = new IndexMeta();
- primary.setIndextype(IndexType.PRIMARY);
- primary.setValues(Lists.newArrayList(id));
- IndexMeta fullText = new IndexMeta();
- fullText.setIndextype(IndexType.FullText);
- fullText.setValues(Lists.newArrayList(description));
- IndexMeta normal = new IndexMeta();
- normal.setIndextype(IndexType.Normal);
- normal.setValues(Lists.newArrayList(englishName, chineseName));
- IndexMeta unique = new IndexMeta();
- unique.setIndextype(IndexType.Unique);
- unique.setValues(Lists.newArrayList(userCode));
- tableMeta.getAllIndexes().put("primary", primary);
- tableMeta.getAllIndexes().put("fullText", fullText);
- tableMeta.getAllIndexes().put("normal", normal);
- tableMeta.getAllIndexes().put("unique", unique);
- Assertions.assertNotNull(tableMeta.getCreateTableSQL());
-
- tableMeta.getAllColumns().get("id").setColumnDef(null);
- tableMeta.getAllColumns().get("id").setIsNullAble(null);
- Assertions.assertNotNull(tableMeta.getCreateTableSQL());
-
- IndexMeta nullIndex = new IndexMeta();
- nullIndex.setIndextype(null);
- tableMeta.getAllIndexes().put("nullIndex", nullIndex);
- Assertions.assertThrows(NullPointerException.class, () -> {
- tableMeta.getCreateTableSQL();
- });
- }
-
}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableRecordsTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableRecordsTest.java
index 7a40e711901178a4a5ee099db4f5d60ac46e2ed7..4fc75a3f5a03dcbb510148f0af9f58d549218401 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableRecordsTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/sql/struct/TableRecordsTest.java
@@ -19,6 +19,9 @@ import com.alibaba.druid.mock.MockStatement;
import com.alibaba.druid.mock.MockStatementBase;
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.util.JdbcConstants;
+
+import com.google.common.collect.Lists;
+import io.seata.common.exception.ShouldNeverHappenException;
import io.seata.rm.datasource.DataSourceProxy;
import io.seata.rm.datasource.mock.MockDriver;
import org.junit.jupiter.api.Assertions;
@@ -28,6 +31,7 @@ import org.junit.jupiter.api.Test;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Types;
+import java.util.List;
/**
* the table records test
@@ -39,6 +43,8 @@ public class TableRecordsTest {
new Object[][] {
new Object[] {"", "", "table_records_test", "id", Types.INTEGER, "INTEGER", 64, 0, 10, 1, "", "", 0, 0, 64, 1, "NO", "YES"},
new Object[] {"", "", "table_records_test", "name", Types.VARCHAR, "VARCHAR", 64, 0, 10, 0, "", "", 0, 0, 64, 2, "YES", "NO"},
+ new Object[] {"", "", "table_records_test", "information", Types.BLOB, "BLOB", 64, 0, 10, 0, "", "", 0, 0, 64, 2, "YES", "NO"},
+ new Object[] {"", "", "table_records_test", "description", Types.CLOB, "CLOB", 64, 0, 10, 0, "", "", 0, 0, 64, 2, "YES", "NO"},
};
private static Object[][] indexMetas =
@@ -46,20 +52,60 @@ public class TableRecordsTest {
new Object[] {"PRIMARY", "id", false, "", 3, 1, "A", 34},
};
+ private static List<String> returnValueColumnLabels = Lists.newArrayList("id", "name", "information", "description");
+
+ private static Object[][] returnValue =
+ new Object[][] {
+ new Object[] {1, "Tom", "hello", "world"},
+ new Object[] {2, "Jack", "hello", "world"},
+ };
+
@BeforeEach
public void initBeforeEach() {
}
+ @Test
+ public void testTableRecords() {
+
+ Assertions.assertThrows(ShouldNeverHappenException.class, () -> {
+ TableRecords tableRecords = new TableRecords(new TableMeta());
+ tableRecords.setTableMeta(new TableMeta());
+ });
+
+ TableRecords tableRecords = new TableRecords(new TableMeta());
+ Assertions.assertEquals(0, tableRecords.size());
+ }
+
+ @Test
+ public void testPkRow() throws SQLException {
+ MockDriver mockDriver = new MockDriver(returnValueColumnLabels, returnValue, columnMetas, indexMetas);
+ DruidDataSource dataSource = new DruidDataSource();
+ dataSource.setUrl("jdbc:mock:xxx");
+ dataSource.setDriver(mockDriver);
+ MockStatementBase mockStatement = new MockStatement(dataSource.getConnection().getConnection());
+ DataSourceProxy proxy = new DataSourceProxy(dataSource);
+
+ TableMeta tableMeta = TableMetaCacheFactory.getTableMetaCache(JdbcConstants.MYSQL).getTableMeta(proxy.getPlainConnection(),
+ "table_records_test", proxy.getResourceId());
+
+ ResultSet resultSet = mockDriver.executeQuery(mockStatement, "select * from table_records_test");
+
+ TableRecords tableRecords = TableRecords.buildRecords(tableMeta, resultSet);
+
+ Assertions.assertEquals(returnValue.length, tableRecords.pkRows().size());
+ }
+
@Test
public void testBuildRecords() throws SQLException {
- MockDriver mockDriver = new MockDriver(columnMetas, indexMetas);
+ MockDriver mockDriver = new MockDriver(returnValueColumnLabels, returnValue, columnMetas, indexMetas);
DruidDataSource dataSource = new DruidDataSource();
dataSource.setUrl("jdbc:mock:xxx");
dataSource.setDriver(mockDriver);
MockStatementBase mockStatement = new MockStatement(dataSource.getConnection().getConnection());
DataSourceProxy proxy = new DataSourceProxy(dataSource);
- TableMeta tableMeta = TableMetaCacheFactory.getTableMetaCache(JdbcConstants.MYSQL).getTableMeta(proxy, "table_records_test");
+ TableMeta tableMeta = TableMetaCacheFactory.getTableMetaCache(JdbcConstants.MYSQL).getTableMeta(proxy.getPlainConnection(),
+ "table_records_test", proxy.getResourceId());
ResultSet resultSet = mockDriver.executeQuery(mockStatement, "select * from table_records_test");
@@ -67,4 +113,22 @@ public class TableRecordsTest {
Assertions.assertNotNull(tableRecords);
}
+
+ @Test
+ public void testEmpty() {
+ TableRecords.EmptyTableRecords emptyTableRecords = new TableRecords.EmptyTableRecords();
+ Assertions.assertEquals(0, emptyTableRecords.size());
+
+ TableRecords empty = TableRecords.empty(new TableMeta());
+
+ Assertions.assertEquals(0, empty.size());
+ Assertions.assertEquals(0, empty.getRows().size());
+ Assertions.assertEquals(0, empty.pkRows().size());
+ Assertions.assertThrows(UnsupportedOperationException.class, () -> {
+ empty.add(new Row());
+ });
+ Assertions.assertThrows(UnsupportedOperationException.class, () -> {
+ empty.getTableMeta();
+ });
+ }
}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/BaseH2Test.java b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/BaseH2Test.java
index 99dbd5f29215862a25a6b7019162f8b4a807a25b..6a9782fd8f25a34b68fc78c72f4b32570d6d336f 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/BaseH2Test.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/BaseH2Test.java
@@ -15,6 +15,7 @@
*/
package io.seata.rm.datasource.undo;
+import io.seata.common.util.IOUtil;
import io.seata.rm.datasource.sql.struct.ColumnMeta;
import io.seata.rm.datasource.sql.struct.Field;
import io.seata.rm.datasource.sql.struct.KeyType;
@@ -61,12 +62,7 @@ public abstract class BaseH2Test {
@AfterAll
public static void stop() {
- if (connection != null) {
- try {
- connection.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(connection);
if (dataSource != null) {
try {
dataSource.close();
@@ -91,12 +87,7 @@ public abstract class BaseH2Test {
} catch (Exception e) {
e.printStackTrace();
} finally {
- if (s != null) {
- try {
- s.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(s);
}
}
@@ -108,24 +99,14 @@ public abstract class BaseH2Test {
set = s.executeQuery(sql);
return TableRecords.buildRecords(tableMeta, set);
} finally {
- if (set != null) {
- try {
- set.close();
- } catch (Exception e) {
- }
- }
- if (s != null) {
- try {
- s.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(set, s);
}
}
protected static TableMeta mockTableMeta() {
TableMeta tableMeta = Mockito.mock(TableMeta.class);
Mockito.when(tableMeta.getPkName()).thenReturn("ID");
+ Mockito.when(tableMeta.getEscapePkName("h2")).thenReturn("`ID`");
Mockito.when(tableMeta.getTableName()).thenReturn("table_name");
ColumnMeta meta0 = Mockito.mock(ColumnMeta.class);
Mockito.when(meta0.getDataType()).thenReturn(Types.INTEGER);
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/BaseUndoLogParserTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/BaseUndoLogParserTest.java
index 5a910d5e3e5ec931772eec0ec2a5074e2cfd266c..a2451ebc77e184e21155208e8b5ffe5622c6631b 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/BaseUndoLogParserTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/BaseUndoLogParserTest.java
@@ -146,4 +146,14 @@ public abstract class BaseUndoLogParserTest extends BaseH2Test{
LOGGER.info("elapsed time {} ms.", (end - start));
}
+ @Test
+ void testDecodeDefaultContent() {
+ byte[] defaultContent = getParser().getDefaultContent();
+
+ BranchUndoLog branchUndoLog = getParser().decode(defaultContent);
+ Assertions.assertNotNull(branchUndoLog);
+ Assertions.assertNull(branchUndoLog.getXid());
+ Assertions.assertEquals(0L, branchUndoLog.getBranchId());
+ Assertions.assertNull(branchUndoLog.getSqlUndoLogs());
+ }
}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/KeywordCheckerFactoryTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/KeywordCheckerFactoryTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..dbd3ad882786a9edbf050dcb50185bcc45e50c3e
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/KeywordCheckerFactoryTest.java
@@ -0,0 +1,36 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.undo;
+
+import io.seata.common.exception.NotSupportYetException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author will
+ */
+public class KeywordCheckerFactoryTest {
+
+ @Test
+ public void testKeywordCheckerFacotry() {
+ KeywordCheckerFactory keywordCheckerFactory = new KeywordCheckerFactory();
+ Assertions.assertNotNull(keywordCheckerFactory);
+
+ Assertions.assertThrows(NotSupportYetException.class, () -> {
+ KeywordCheckerFactory.getKeywordChecker("unknow");
+ });
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/UndoLogManagerTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/UndoLogManagerTest.java
index 8afa0bd15341e870ea79c1f928142bc691a8c320..5ad37b118e0723940e21cfc0c8afd7514a2ca4d4 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/UndoLogManagerTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/UndoLogManagerTest.java
@@ -34,7 +34,6 @@ import static org.mockito.Mockito.when;
/**
* @author guoyao
- * @date 2019/4/19
*/
public class UndoLogManagerTest {
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/mysql/MySQLUndoLogManagerTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/mysql/MySQLUndoLogManagerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..da73cecd09e5dace753471ed89c1cb23ebe65b6a
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/mysql/MySQLUndoLogManagerTest.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.undo.mysql;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.util.Date;
+import java.util.List;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
+import io.seata.rm.datasource.ConnectionContext;
+import io.seata.rm.datasource.ConnectionProxy;
+import io.seata.rm.datasource.DataSourceProxy;
+import io.seata.rm.datasource.mock.MockDriver;
+import io.seata.rm.datasource.undo.parser.JacksonUndoLogParser;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author will
+ */
+public class MySQLUndoLogManagerTest {
+
+ List<String> returnValueColumnLabels = Lists.newArrayList("log_status");
+ Object[][] returnValue = new Object[][] {
+ new Object[] {1},
+ new Object[] {2},
+ };
+ Object[][] columnMetas = new Object[][] {
+ new Object[] {"", "", "table_plain_executor_test", "id", Types.INTEGER, "INTEGER", 64, 0, 10, 1, "", "", 0, 0, 64, 1, "NO", "YES"},
+ new Object[] {"", "", "table_plain_executor_test", "name", Types.VARCHAR, "VARCHAR", 64, 0, 10, 0, "", "", 0, 0, 64, 2, "YES", "NO"},
+ };
+ Object[][] indexMetas = new Object[][] {
+ new Object[] {"PRIMARY", "id", false, "", 3, 1, "A", 34},
+ };
+
+ private DruidDataSource dataSource;
+
+ private DataSourceProxy dataSourceProxy;
+
+ private ConnectionProxy connectionProxy;
+
+ private MySQLUndoLogManager undoLogManager;
+
+ @BeforeEach
+ public void init() throws SQLException {
+ MockDriver mockDriver = new MockDriver(returnValueColumnLabels, returnValue, columnMetas, indexMetas);
+ dataSource = new DruidDataSource();
+ dataSource.setUrl("jdbc:mock:xxx");
+ dataSource.setDriver(mockDriver);
+
+ dataSourceProxy = new DataSourceProxy(dataSource);
+ connectionProxy = new ConnectionProxy(dataSourceProxy, dataSource.getConnection().getConnection());
+ undoLogManager = new MySQLUndoLogManager();
+ }
+
+ @Test
+ public void testGetDbType() {
+ Assertions.assertEquals("mysql", undoLogManager.getDbType());
+ }
+
+ @Test
+ public void testDeleteUndoLogByLogCreated() throws SQLException {
+ Assertions.assertEquals(0, undoLogManager.deleteUndoLogByLogCreated(new Date(), 3000, dataSource.getConnection()));
+ Assertions.assertThrows(SQLException.class, () -> {
+ undoLogManager.deleteUndoLogByLogCreated(new Date(), 3000, connectionProxy);
+ });
+ }
+
+ @Test
+ public void testInsertUndoLog() throws SQLException {
+ Assertions.assertDoesNotThrow(() -> {
+ undoLogManager.insertUndoLogWithGlobalFinished("xid", 1L, new JacksonUndoLogParser(),
+ dataSource.getConnection());
+ });
+
+ Assertions.assertDoesNotThrow(() -> {
+ undoLogManager.insertUndoLogWithNormal("xid", 1L, "", new byte[]{}, dataSource.getConnection());
+ });
+
+ Assertions.assertThrows(SQLException.class, () -> {
+ undoLogManager.deleteUndoLogByLogCreated(new Date(), 3000, connectionProxy);
+ });
+
+ }
+
+ @Test
+ public void testSerializer() {
+ MySQLUndoLogManager.setCurrentSerializer("jackson");
+ Assertions.assertEquals("jackson", MySQLUndoLogManager.getCurrentSerializer());
+ MySQLUndoLogManager.removeCurrentSerializer();
+ Assertions.assertEquals(null, MySQLUndoLogManager.getCurrentSerializer());
+ }
+
+ @Test
+ public void testDeleteUndoLog() {
+ Assertions.assertDoesNotThrow(() -> {
+ undoLogManager.deleteUndoLog("xid", 1L, dataSource.getConnection());
+ });
+
+ Assertions.assertThrows(SQLException.class, () -> {
+ undoLogManager.deleteUndoLog("xid", 1L, connectionProxy);
+ });
+ }
+
+ @Test
+ public void testBatchDeleteUndoLog() {
+ Assertions.assertDoesNotThrow(() -> {
+ undoLogManager.batchDeleteUndoLog(Sets.newHashSet("xid"), Sets.newHashSet(1L), dataSource.getConnection());
+ });
+
+ Assertions.assertThrows(SQLException.class, () -> {
+ undoLogManager.batchDeleteUndoLog(Sets.newHashSet("xid"), Sets.newHashSet(1L), connectionProxy);
+ });
+ }
+
+ @Test
+ public void testFlushUndoLogs() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
+ connectionProxy.bind("xid");
+ ConnectionContext context = connectionProxy.getContext();
+ Method method = context.getClass().getDeclaredMethod("setBranchId", Long.class);
+ method.setAccessible(true);
+ method.invoke(context, 1L);
+
+
+ Assertions.assertDoesNotThrow(() -> {
+ undoLogManager.flushUndoLogs(connectionProxy);
+ });
+ }
+
+ @Test
+ public void testUndo() throws SQLException {
+ Assertions.assertDoesNotThrow(() -> {
+ undoLogManager.undo(dataSourceProxy, "xid", 1L);
+ });
+ }
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/mysql/keyword/MySQLKeywordCheckerTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/mysql/keyword/MySQLKeywordCheckerTest.java
index a3ebae63ed4d6ba14c7c01f58a89178b1423ad0e..882274de884faf377e846ab6244bd3443429912f 100644
--- a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/mysql/keyword/MySQLKeywordCheckerTest.java
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/mysql/keyword/MySQLKeywordCheckerTest.java
@@ -38,7 +38,6 @@ import org.junit.jupiter.api.Test;
* The type My sql keyword checker test.
*
* @author Wu
- * @date 2019 /3/5 The type MySQL keyword checker test.
*/
public class MySQLKeywordCheckerTest {
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/OracleUndoDeleteExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/OracleUndoDeleteExecutorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..06dd71825d3c251250f0662b10b61fbb73702c99
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/OracleUndoDeleteExecutorTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.undo.oracle;
+
+import io.seata.rm.datasource.sql.SQLType;
+import io.seata.rm.datasource.sql.struct.Row;
+import io.seata.rm.datasource.sql.struct.TableMeta;
+import io.seata.rm.datasource.sql.struct.TableRecords;
+import io.seata.rm.datasource.undo.BaseExecutorTest;
+import io.seata.rm.datasource.undo.SQLUndoLog;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author jsbxyyx
+ */
+public class OracleUndoDeleteExecutorTest extends BaseExecutorTest {
+
+ private static OracleUndoDeleteExecutor executor;
+
+ @BeforeAll
+ public static void beforeAll() {
+ TableMeta tableMeta = Mockito.mock(TableMeta.class);
+ Mockito.when(tableMeta.getPkName()).thenReturn("ID");
+ Mockito.when(tableMeta.getTableName()).thenReturn("TABLE_NAME");
+
+ TableRecords beforeImage = new TableRecords();
+ beforeImage.setTableName("TABLE_NAME");
+ beforeImage.setTableMeta(tableMeta);
+ List<Row> beforeRows = new ArrayList<>();
+ Row row0 = new Row();
+ addField(row0, "ID", 1, "1");
+ addField(row0, "AGE", 1, "1");
+ beforeRows.add(row0);
+ Row row1 = new Row();
+ addField(row1, "ID", 1, "1");
+ addField(row1, "AGE", 1, "1");
+ beforeRows.add(row1);
+ beforeImage.setRows(beforeRows);
+
+ TableRecords afterImage = new TableRecords();
+ afterImage.setTableName("TABLE_NAME");
+ afterImage.setTableMeta(tableMeta);
+ List<Row> afterRows = new ArrayList<>();
+ Row row2 = new Row();
+ addField(row2, "ID", 1, "1");
+ addField(row2, "AGE", 1, "2");
+ afterRows.add(row2);
+ Row row3 = new Row();
+ addField(row3, "ID", 1, "1");
+ addField(row3, "AGE", 1, "2");
+ afterRows.add(row3);
+ afterImage.setRows(afterRows);
+
+ SQLUndoLog sqlUndoLog = new SQLUndoLog();
+ sqlUndoLog.setSqlType(SQLType.DELETE);
+ sqlUndoLog.setTableMeta(tableMeta);
+ sqlUndoLog.setTableName("TABLE_NAME");
+ sqlUndoLog.setBeforeImage(beforeImage);
+ sqlUndoLog.setAfterImage(afterImage);
+
+ executor = new OracleUndoDeleteExecutor(sqlUndoLog);
+ }
+
+ @Test
+ public void buildUndoSQL() {
+ String sql = executor.buildUndoSQL();
+ Assertions.assertNotNull(sql);
+ Assertions.assertTrue(sql.contains("INSERT"));
+ Assertions.assertTrue(sql.contains("\"ID\""));
+ Assertions.assertTrue(sql.contains("\"TABLE_NAME\""));
+ }
+
+ @Test
+ public void getUndoRows() {
+ Assertions.assertEquals(executor.getUndoRows(), executor.getSqlUndoLog().getBeforeImage());
+ }
+
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/OracleUndoInsertExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/OracleUndoInsertExecutorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..afea1cde3e30d6f3a559800e1dd0408d79338886
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/OracleUndoInsertExecutorTest.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.undo.oracle;
+
+import io.seata.rm.datasource.sql.SQLType;
+import io.seata.rm.datasource.sql.struct.Row;
+import io.seata.rm.datasource.sql.struct.TableMeta;
+import io.seata.rm.datasource.sql.struct.TableRecords;
+import io.seata.rm.datasource.undo.BaseExecutorTest;
+import io.seata.rm.datasource.undo.SQLUndoLog;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author jsbxyyx
+ */
+public class OracleUndoInsertExecutorTest extends BaseExecutorTest {
+
+ private static OracleUndoInsertExecutor executor;
+
+ @BeforeAll
+ public static void beforeAll() {
+ TableMeta tableMeta = Mockito.mock(TableMeta.class);
+ Mockito.when(tableMeta.getPkName()).thenReturn("ID");
+ Mockito.when(tableMeta.getTableName()).thenReturn("TABLE_NAME");
+
+ TableRecords beforeImage = new TableRecords();
+ beforeImage.setTableName("TABLE_NAME");
+ beforeImage.setTableMeta(tableMeta);
+ List<Row> beforeRows = new ArrayList<>();
+ Row row0 = new Row();
+ addField(row0, "ID", 1, "1");
+ addField(row0, "AGE", 1, "1");
+ beforeRows.add(row0);
+ Row row1 = new Row();
+ addField(row1, "ID", 1, "1");
+ addField(row1, "AGE", 1, "1");
+ beforeRows.add(row1);
+ beforeImage.setRows(beforeRows);
+
+ TableRecords afterImage = new TableRecords();
+ afterImage.setTableName("TABLE_NAME");
+ afterImage.setTableMeta(tableMeta);
+ List<Row> afterRows = new ArrayList<>();
+ Row row2 = new Row();
+ addField(row2, "ID", 1, "1");
+ addField(row2, "AGE", 1, "1");
+ afterRows.add(row2);
+ Row row3 = new Row();
+ addField(row3, "ID", 1, "1");
+ addField(row3, "AGE", 1, "1");
+ afterRows.add(row3);
+ afterImage.setRows(afterRows);
+
+ SQLUndoLog sqlUndoLog = new SQLUndoLog();
+ sqlUndoLog.setSqlType(SQLType.INSERT);
+ sqlUndoLog.setTableMeta(tableMeta);
+ sqlUndoLog.setTableName("TABLE_NAME");
+ sqlUndoLog.setBeforeImage(beforeImage);
+ sqlUndoLog.setAfterImage(afterImage);
+
+ executor = new OracleUndoInsertExecutor(sqlUndoLog);
+ }
+
+ @Test
+ public void buildUndoSQL() {
+ String sql = executor.buildUndoSQL();
+ Assertions.assertNotNull(sql);
+ Assertions.assertTrue(sql.contains("DELETE"));
+ Assertions.assertTrue(sql.contains("\"ID\""));
+ Assertions.assertTrue(sql.contains("\"TABLE_NAME\""));
+ }
+
+ @Test
+ public void getUndoRows() {
+ Assertions.assertEquals(executor.getUndoRows(), executor.getSqlUndoLog().getAfterImage());
+ }
+
+}
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/OracleUndoUpdateExecutorTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/OracleUndoUpdateExecutorTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..83f78be625543ae775181cd85ed3c05ed8806a00
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/OracleUndoUpdateExecutorTest.java
@@ -0,0 +1,98 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.undo.oracle;
+
+import io.seata.rm.datasource.sql.SQLType;
+import io.seata.rm.datasource.sql.struct.Row;
+import io.seata.rm.datasource.sql.struct.TableMeta;
+import io.seata.rm.datasource.sql.struct.TableRecords;
+import io.seata.rm.datasource.undo.BaseExecutorTest;
+import io.seata.rm.datasource.undo.SQLUndoLog;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author jsbxyyx
+ */
+public class OracleUndoUpdateExecutorTest extends BaseExecutorTest {
+
+ private static OracleUndoUpdateExecutor executor;
+
+ @BeforeAll
+ public static void init(){
+ TableMeta tableMeta = Mockito.mock(TableMeta.class);
+ Mockito.when(tableMeta.getPkName()).thenReturn("ID");
+ Mockito.when(tableMeta.getTableName()).thenReturn("TABLE_NAME");
+
+ TableRecords beforeImage = new TableRecords();
+ beforeImage.setTableName("TABLE_NAME");
+ beforeImage.setTableMeta(tableMeta);
+ List<Row> beforeRows = new ArrayList<>();
+ Row row0 = new Row();
+ addField(row0, "ID", 1, "1");
+ addField(row0, "AGE", 1, "1");
+ beforeRows.add(row0);
+ Row row1 = new Row();
+ addField(row1, "ID", 1, "1");
+ addField(row1, "AGE", 1, "1");
+ beforeRows.add(row1);
+ beforeImage.setRows(beforeRows);
+
+ TableRecords afterImage = new TableRecords();
+ afterImage.setTableName("TABLE_NAME");
+ afterImage.setTableMeta(tableMeta);
+ List<Row> afterRows = new ArrayList<>();
+ Row row2 = new Row();
+ addField(row2, "ID", 1, "1");
+ addField(row2, "AGE", 1, "1");
+ afterRows.add(row2);
+ Row row3 = new Row();
+ addField(row3, "ID", 1, "1");
+ addField(row3, "AGE", 1, "1");
+ afterRows.add(row3);
+ afterImage.setRows(afterRows);
+
+ SQLUndoLog sqlUndoLog = new SQLUndoLog();
+ sqlUndoLog.setSqlType(SQLType.UPDATE);
+ sqlUndoLog.setTableMeta(tableMeta);
+ sqlUndoLog.setTableName("TABLE_NAME");
+ sqlUndoLog.setBeforeImage(beforeImage);
+ sqlUndoLog.setAfterImage(afterImage);
+
+ executor = new OracleUndoUpdateExecutor(sqlUndoLog);
+ }
+
+ @Test
+ public void buildUndoSQL() {
+ String sql = executor.buildUndoSQL();
+ Assertions.assertNotNull(sql);
+ Assertions.assertTrue(sql.contains("UPDATE"));
+ Assertions.assertTrue(sql.contains("\"ID\""));
+ Assertions.assertTrue(sql.contains("\"AGE\""));
+ Assertions.assertTrue(sql.contains("\"TABLE_NAME\""));
+ }
+
+ @Test
+ public void getUndoRows() {
+ Assertions.assertEquals(executor.getUndoRows(), executor.getSqlUndoLog().getBeforeImage());
+ }
+
+}
\ No newline at end of file
diff --git a/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/keyword/OracleKeywordCheckerTest.java b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/keyword/OracleKeywordCheckerTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..cba82ea6fe634f9b14fbbf4c75f16a9ecabaf773
--- /dev/null
+++ b/rm-datasource/src/test/java/io/seata/rm/datasource/undo/oracle/keyword/OracleKeywordCheckerTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.rm.datasource.undo.oracle.keyword;
+
+import com.alibaba.druid.util.JdbcConstants;
+
+import io.seata.rm.datasource.undo.KeywordChecker;
+import io.seata.rm.datasource.undo.KeywordCheckerFactory;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author will
+ */
+public class OracleKeywordCheckerTest {
+
+ @Test
+ public void testOracleKeywordChecker() {
+ KeywordChecker keywordChecker = KeywordCheckerFactory.getKeywordChecker(JdbcConstants.ORACLE);
+ Assertions.assertNotNull(keywordChecker);
+ }
+
+ @Test
+ public void testCheckAndReplate() {
+ KeywordChecker keywordChecker = KeywordCheckerFactory.getKeywordChecker(JdbcConstants.ORACLE);
+ Assertions.assertEquals(null, keywordChecker.checkAndReplace(null));
+ Assertions.assertEquals("undo_log", keywordChecker.checkAndReplace("undo_log"));
+ Assertions.assertEquals("TABLE", keywordChecker.checkAndReplace("TABLE"));
+ }
+}
diff --git a/rm/src/main/java/io/seata/rm/RMClient.java b/rm/src/main/java/io/seata/rm/RMClient.java
index 71c2f6c53e00881efb4296a02ddb5817e6bbdd29..200137afc20da0c5f753b9c3708aa91f8fbf19f3 100644
--- a/rm/src/main/java/io/seata/rm/RMClient.java
+++ b/rm/src/main/java/io/seata/rm/RMClient.java
@@ -21,7 +21,7 @@ import io.seata.core.rpc.netty.RmRpcClient;
/**
* The Rm client Initiator.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class RMClient {
diff --git a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/config/DbStateMachineConfig.java b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/config/DbStateMachineConfig.java
index dc8e6e13f231bedacaaaebd46533601a02f76d53..c0b75e7bd8c8f82dca532479c386c553b97de04e 100644
--- a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/config/DbStateMachineConfig.java
+++ b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/config/DbStateMachineConfig.java
@@ -15,20 +15,21 @@
*/
package io.seata.saga.engine.config;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.SQLException;
+
+import javax.sql.DataSource;
+
import io.seata.saga.engine.impl.DefaultStateMachineConfig;
-import io.seata.saga.engine.store.db.DbStateLangStore;
import io.seata.saga.engine.store.db.DbAndReportTcStateLogStore;
+import io.seata.saga.engine.store.db.DbStateLangStore;
import io.seata.saga.tm.DefaultSagaTransactionalTemplate;
import io.seata.saga.tm.SagaTransactionalTemplate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.DisposableBean;
-import javax.sql.DataSource;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-
/**
* DbStateMachineConfig
*
@@ -38,24 +39,39 @@ public class DbStateMachineConfig extends DefaultStateMachineConfig implements D
private static final Logger LOGGER = LoggerFactory.getLogger(DbStateMachineConfig.class);
- private static final int DEFAULT_TRANS_OPER_TIMEOUT = 60000 * 10;
+ private static final int DEFAULT_TRANS_OPER_TIMEOUT = 60000 * 10;
- private DataSource dataSource;
- private String applicationId;
- private String txServiceGroup;
- private String tablePrefix = "seata_";
- private String dbType;
- private int transOperationTimeout = DEFAULT_TRANS_OPER_TIMEOUT;
+ private DataSource dataSource;
+ private String applicationId;
+ private String txServiceGroup;
+ private String tablePrefix = "seata_";
+ private String dbType;
+ private int transOperationTimeout = DEFAULT_TRANS_OPER_TIMEOUT;
private SagaTransactionalTemplate sagaTransactionalTemplate;
+ public static String getDbTypeFromDataSource(DataSource dataSource) throws SQLException {
+ Connection con = null;
+ try {
+ con = dataSource.getConnection();
+ DatabaseMetaData metaData = con.getMetaData();
+ return metaData.getDatabaseProductName();
+ } finally {
+ if (con != null) {
+ try {
+ con.close();
+ } catch (SQLException e) {
+ LOGGER.error("Get dbType from failed: {}", e.getMessage(), e);
+ }
+ }
+ }
+ }
+
@Override
public void afterPropertiesSet() throws Exception {
- super.afterPropertiesSet();
-
dbType = getDbTypeFromDataSource(dataSource);
- if(getStateLogStore() == null){
+ if (getStateLogStore() == null) {
DbAndReportTcStateLogStore dbStateLogStore = new DbAndReportTcStateLogStore();
dbStateLogStore.setDataSource(dataSource);
dbStateLogStore.setTablePrefix(tablePrefix);
@@ -63,8 +79,9 @@ public class DbStateMachineConfig extends DefaultStateMachineConfig implements D
dbStateLogStore.setDefaultTenantId(getDefaultTenantId());
dbStateLogStore.setSeqGenerator(getSeqGenerator());
- if(sagaTransactionalTemplate == null){
- DefaultSagaTransactionalTemplate defaultSagaTransactionalTemplate = new DefaultSagaTransactionalTemplate();
+ if (sagaTransactionalTemplate == null) {
+ DefaultSagaTransactionalTemplate defaultSagaTransactionalTemplate
+ = new DefaultSagaTransactionalTemplate();
defaultSagaTransactionalTemplate.setTimeout(transOperationTimeout);
defaultSagaTransactionalTemplate.setApplicationContext(getApplicationContext());
defaultSagaTransactionalTemplate.setApplicationId(applicationId);
@@ -78,7 +95,7 @@ public class DbStateMachineConfig extends DefaultStateMachineConfig implements D
setStateLogStore(dbStateLogStore);
}
- if(getStateLangStore() == null){
+ if (getStateLangStore() == null) {
DbStateLangStore dbStateLangStore = new DbStateLangStore();
dbStateLangStore.setDataSource(dataSource);
dbStateLangStore.setTablePrefix(tablePrefix);
@@ -86,32 +103,17 @@ public class DbStateMachineConfig extends DefaultStateMachineConfig implements D
setStateLangStore(dbStateLangStore);
}
+
+ super.afterPropertiesSet();//must execute after StateLangStore initialized
}
@Override
public void destroy() throws Exception {
- if((sagaTransactionalTemplate != null) && (sagaTransactionalTemplate instanceof DisposableBean)){
+ if ((sagaTransactionalTemplate != null) && (sagaTransactionalTemplate instanceof DisposableBean)) {
((DisposableBean)sagaTransactionalTemplate).destroy();
}
}
- public static String getDbTypeFromDataSource(DataSource dataSource) throws SQLException {
- Connection con = null;
- try {
- con = dataSource.getConnection();
- DatabaseMetaData metaData = con.getMetaData();
- return metaData.getDatabaseProductName();
- } finally {
- if (con != null) {
- try {
- con.close();
- } catch (SQLException e) {
- LOGGER.error("Get dbType from failed: " + e.getMessage(), e);
- }
- }
- }
- }
-
public DataSource getDataSource() {
return dataSource;
}
@@ -163,4 +165,4 @@ public class DbStateMachineConfig extends DefaultStateMachineConfig implements D
public void setTransOperationTimeout(int transOperationTimeout) {
this.transOperationTimeout = transOperationTimeout;
}
-}
\ No newline at end of file
+}
diff --git a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/Serializer.java b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/Serializer.java
index 68d3e0064a6425db0f0298f208fb2e8f0dc88c55..9f109a7d7a1262c5d632675e9786f8f4371f1fcc 100644
--- a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/Serializer.java
+++ b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/Serializer.java
@@ -24,6 +24,7 @@ public interface Serializer<S, T> {
/**
* serialize
+ *
* @param object
* @return
*/
@@ -31,6 +32,7 @@ public interface Serializer<S, T> {
/**
* deserialize
+ *
* @param obj
* @return
*/
diff --git a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/impl/ExceptionSerializer.java b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/impl/ExceptionSerializer.java
index 98ae7265e30352e8cb59db90bec256951eaa4c42..508d0de63f52ca5a34e7349874e4c74d519b02f8 100644
--- a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/impl/ExceptionSerializer.java
+++ b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/impl/ExceptionSerializer.java
@@ -15,39 +15,29 @@
*/
package io.seata.saga.engine.serializer.impl;
-import io.seata.saga.engine.serializer.Serializer;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
+import io.seata.saga.engine.serializer.Serializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Exception serializer
+ *
* @author lorne.cl
*/
public class ExceptionSerializer implements Serializer<Exception, byte[]> {
private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionSerializer.class);
- @Override
- public byte[] serialize(Exception object) {
-
- return serializeByObjectOutput(object);
- }
-
- @Override
- public Exception deserialize(byte[] bytes) {
- return deserializeByObjectInputStream(bytes, Exception.class);
- }
-
public static byte[] serializeByObjectOutput(Object o) {
byte[] result = null;
- if(o != null){
+ if (o != null) {
ObjectOutputStream oos = null;
try {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -56,8 +46,8 @@ public class ExceptionSerializer implements Serializer<Exception, byte[]> {
oos.flush();
result = baos.toByteArray();
} catch (IOException e) {
- LOGGER.error("serializer failed：" + o.getClass(), e);
- throw (new RuntimeException("IO Create Error", e));
+ LOGGER.error("serializer failed: {}", o.getClass(), e);
+ throw new RuntimeException("IO Create Error", e);
} finally {
if (oos != null) {
try {
@@ -73,7 +63,7 @@ public class ExceptionSerializer implements Serializer<Exception, byte[]> {
public static <T> T deserializeByObjectInputStream(byte[] bytes, Class<T> valueType) {
- if ( bytes == null ) {
+ if (bytes == null) {
return null;
}
@@ -84,23 +74,20 @@ public class ExceptionSerializer implements Serializer<Exception, byte[]> {
public static Object deserializeByObjectInputStream(byte[] bytes) {
Object result = null;
- if(bytes != null){
+ if (bytes != null) {
ObjectInputStream ois = null;
try {
ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
ois = new ObjectInputStream(bais);
result = ois.readObject();
- }
- catch (IOException e) {
- LOGGER.error("deserialize failed：", e);
- throw(new RuntimeException("IO Create Error", e));
- }
- catch (ClassNotFoundException e) {
- LOGGER.error("deserialize failed：", e);
- throw(new RuntimeException("Cannot find specified class", e));
- }
- finally {
- if(ois!=null){
+ } catch (IOException e) {
+ LOGGER.error("deserialize failed:", e);
+ throw new RuntimeException("IO Create Error", e);
+ } catch (ClassNotFoundException e) {
+ LOGGER.error("deserialize failed:", e);
+ throw new RuntimeException("Cannot find specified class", e);
+ } finally {
+ if (ois != null) {
try {
ois.close();
} catch (IOException e) {
@@ -111,4 +98,15 @@ public class ExceptionSerializer implements Serializer<Exception, byte[]> {
}
return result;
}
-}
\ No newline at end of file
+
+ @Override
+ public byte[] serialize(Exception object) {
+
+ return serializeByObjectOutput(object);
+ }
+
+ @Override
+ public Exception deserialize(byte[] bytes) {
+ return deserializeByObjectInputStream(bytes, Exception.class);
+ }
+}
diff --git a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/impl/ParamsFastjsonSerializer.java b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/impl/ParamsFastjsonSerializer.java
index 2a73663090eeddedf574dd53459b890bec6c0453..89aa33d59e7fb5451d15e35710fccbe229454491 100644
--- a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/impl/ParamsFastjsonSerializer.java
+++ b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/serializer/impl/ParamsFastjsonSerializer.java
@@ -18,23 +18,23 @@ package io.seata.saga.engine.serializer.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.parser.Feature;
import com.alibaba.fastjson.serializer.SerializerFeature;
+
import io.seata.saga.engine.serializer.Serializer;
/**
* Parameter serializer based on Fastjson
+ *
* @author lorne.cl
*/
public class ParamsFastjsonSerializer implements Serializer<Object, String> {
private static final SerializerFeature[] SERIALIZER_FEATURES = new SerializerFeature[] {
- SerializerFeature.DisableCircularReferenceDetect,
- SerializerFeature.WriteDateUseDateFormat,
- SerializerFeature.WriteClassName
- };
+ SerializerFeature.DisableCircularReferenceDetect, SerializerFeature.WriteDateUseDateFormat,
+ SerializerFeature.WriteClassName};
@Override
public String serialize(Object params) {
- if(params != null){
+ if (params != null) {
return JSON.toJSONString(params, SERIALIZER_FEATURES);
}
return null;
@@ -42,7 +42,7 @@ public class ParamsFastjsonSerializer implements Serializer<Object, String> {
@Override
public Object deserialize(String json) {
- if(json != null){
+ if (json != null) {
return JSON.parse(json, Feature.SupportAutoType);
}
diff --git a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/AbstractStore.java b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/AbstractStore.java
index a85567469f306521c9b43ce502aca1cf165dd5fa..02d56ab850f071c9574301f2924f7de296ca5f72 100644
--- a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/AbstractStore.java
+++ b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/AbstractStore.java
@@ -15,12 +15,6 @@
*/
package io.seata.saga.engine.store.db;
-import io.seata.common.exception.StoreException;
-import io.seata.saga.engine.store.utils.BeanUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -29,8 +23,16 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import javax.sql.DataSource;
+
+import io.seata.common.exception.StoreException;
+import io.seata.saga.engine.store.utils.BeanUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Abstract store
+ *
* @author lorne.cl
*/
public class AbstractStore {
@@ -43,28 +45,38 @@ public class AbstractStore {
protected String tablePrefix;
- protected <T> T selectOne(String sql, ResultSetToObject<T> resultSetToObject, Object... args){
+ public static void closeSilent(AutoCloseable closeable) {
+ if (closeable != null) {
+ try {
+ closeable.close();
+ } catch (Exception e) {
+ LOGGER.info(e.getMessage(), e);
+ }
+ }
+ }
+
+ protected <T> T selectOne(String sql, ResultSetToObject<T> resultSetToObject, Object... args) {
Connection connection = null;
PreparedStatement stmt = null;
ResultSet resultSet = null;
try {
connection = dataSource.getConnection();
- if(LOGGER.isDebugEnabled()){
+ if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Preparing SQL statement: {}", sql);
}
stmt = connection.prepareStatement(sql);
- if(LOGGER.isDebugEnabled()){
+ if (LOGGER.isDebugEnabled()) {
LOGGER.debug("setting params to PreparedStatement: {}", Arrays.toString(args));
}
- for(int i = 0; i < args.length; i++){
- stmt.setObject(i+1, args[i]);
+ for (int i = 0; i < args.length; i++) {
+ stmt.setObject(i + 1, args[i]);
}
resultSet = stmt.executeQuery();
- if(resultSet.next()){
+ if (resultSet.next()) {
return resultSetToObject.toObject(resultSet);
}
} catch (SQLException e) {
@@ -77,29 +89,29 @@ public class AbstractStore {
return null;
}
- protected <T> List<T> selectList(String sql, ResultSetToObject<T> resultSetToObject, Object... args){
+ protected <T> List<T> selectList(String sql, ResultSetToObject<T> resultSetToObject, Object... args) {
Connection connection = null;
PreparedStatement stmt = null;
ResultSet resultSet = null;
try {
connection = dataSource.getConnection();
- if(LOGGER.isDebugEnabled()){
+ if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Preparing SQL: {}", sql);
}
stmt = connection.prepareStatement(sql);
- if(LOGGER.isDebugEnabled()){
+ if (LOGGER.isDebugEnabled()) {
LOGGER.debug("setting params to PreparedStatement: {}", Arrays.toString(args));
}
- for(int i = 0; i < args.length; i++){
- stmt.setObject((i+1), args[i]);
+ for (int i = 0; i < args.length; i++) {
+ stmt.setObject(i + 1, args[i]);
}
resultSet = stmt.executeQuery();
List<T> list = new ArrayList<>();
- while (resultSet.next()){
+ while (resultSet.next()) {
list.add(resultSetToObject.toObject(resultSet));
}
return list;
@@ -112,25 +124,25 @@ public class AbstractStore {
}
}
- protected <T> int executeUpdate(String sql, ObjectToStatement<T> objectToStatement, T o){
+ protected <T> int executeUpdate(String sql, ObjectToStatement<T> objectToStatement, T o) {
Connection connection = null;
PreparedStatement stmt = null;
try {
connection = dataSource.getConnection();
- if(LOGGER.isDebugEnabled()){
+ if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Preparing SQL: {}", sql);
}
stmt = connection.prepareStatement(sql);
- if(LOGGER.isDebugEnabled()){
+ if (LOGGER.isDebugEnabled()) {
LOGGER.debug("setting params to PreparedStatement: {}", BeanUtils.beanToString(o));
}
objectToStatement.toStatement(o, stmt);
int count = stmt.executeUpdate();
- if(!connection.getAutoCommit()){
+ if (!connection.getAutoCommit()) {
connection.commit();
}
return count;
@@ -142,27 +154,27 @@ public class AbstractStore {
}
}
- protected int executeUpdate(String sql, Object... args){
+ protected int executeUpdate(String sql, Object... args) {
Connection connection = null;
PreparedStatement stmt = null;
try {
connection = dataSource.getConnection();
- if(LOGGER.isDebugEnabled()){
+ if (LOGGER.isDebugEnabled()) {
LOGGER.debug("Preparing SQL: {}", sql);
}
stmt = connection.prepareStatement(sql);
- if(LOGGER.isDebugEnabled()){
+ if (LOGGER.isDebugEnabled()) {
LOGGER.debug("setting params to PreparedStatement: {}", Arrays.toString(args));
}
- for(int i = 0; i < args.length; i++){
- stmt.setObject((i+1), args[i]);
+ for (int i = 0; i < args.length; i++) {
+ stmt.setObject(i + 1, args[i]);
}
int count = stmt.executeUpdate();
- if(!connection.getAutoCommit()){
+ if (!connection.getAutoCommit()) {
connection.commit();
}
return count;
@@ -174,26 +186,6 @@ public class AbstractStore {
}
}
- protected interface ResultSetToObject<T> {
-
- T toObject(ResultSet resultSet) throws SQLException;
- }
-
- protected interface ObjectToStatement<T> {
-
- void toStatement(T o, PreparedStatement statement) throws SQLException;
- }
-
- public static void closeSilent(AutoCloseable closeable){
- if(closeable != null){
- try {
- closeable.close();
- } catch (Exception e) {
- LOGGER.info(e.getMessage(), e);
- }
- }
- }
-
public void setDataSource(DataSource dataSource) {
this.dataSource = dataSource;
}
@@ -205,4 +197,14 @@ public class AbstractStore {
public void setTablePrefix(String tablePrefix) {
this.tablePrefix = tablePrefix;
}
+
+ protected interface ResultSetToObject<T> {
+
+ T toObject(ResultSet resultSet) throws SQLException;
+ }
+
+ protected interface ObjectToStatement<T> {
+
+ void toStatement(T o, PreparedStatement statement) throws SQLException;
+ }
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbAndReportTcStateLogStore.java b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbAndReportTcStateLogStore.java
index 7ede74b31a967db39ce41482e6ef69427f393c30..ab2db6415305c0172b5f83f958116421d2c990ad 100644
--- a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbAndReportTcStateLogStore.java
+++ b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbAndReportTcStateLogStore.java
@@ -15,6 +15,14 @@
*/
package io.seata.saga.engine.store.db;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Timestamp;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.core.context.RootContext;
import io.seata.core.exception.TransactionException;
@@ -22,10 +30,10 @@ import io.seata.core.model.BranchStatus;
import io.seata.core.model.GlobalStatus;
import io.seata.saga.engine.exception.EngineExecutionException;
import io.seata.saga.engine.sequence.SeqGenerator;
-import io.seata.saga.engine.store.StateLogStore;
import io.seata.saga.engine.serializer.Serializer;
import io.seata.saga.engine.serializer.impl.ExceptionSerializer;
import io.seata.saga.engine.serializer.impl.ParamsFastjsonSerializer;
+import io.seata.saga.engine.store.StateLogStore;
import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.ExecutionStatus;
@@ -35,21 +43,12 @@ import io.seata.saga.statelang.domain.impl.StateInstanceImpl;
import io.seata.saga.statelang.domain.impl.StateMachineInstanceImpl;
import io.seata.saga.tm.SagaTransactionalTemplate;
import io.seata.tm.api.GlobalTransaction;
-import io.seata.tm.api.GlobalTransactionContext;
import io.seata.tm.api.TransactionalExecutor.ExecutionException;
import io.seata.tm.api.transaction.TransactionInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* State machine logs and definitions persist to database and report status to TC (Transaction Coordinator)
*
@@ -57,42 +56,56 @@ import java.util.Map;
*/
public class DbAndReportTcStateLogStore extends AbstractStore implements StateLogStore {
- private static final Logger LOGGER = LoggerFactory.getLogger(DbAndReportTcStateLogStore.class);
-
- private SagaTransactionalTemplate sagaTransactionalTemplate;
+ private static final Logger LOGGER = LoggerFactory.getLogger(
+ DbAndReportTcStateLogStore.class);
+ private static final StateMachineInstanceToStatementForInsert STATE_MACHINE_INSTANCE_TO_STATEMENT_FOR_INSERT
+ = new StateMachineInstanceToStatementForInsert();
+ private static final StateMachineInstanceToStatementForUpdate STATE_MACHINE_INSTANCE_TO_STATEMENT_FOR_UPDATE
+ = new StateMachineInstanceToStatementForUpdate();
+ private static final ResultSetToStateMachineInstance RESULT_SET_TO_STATE_MACHINE_INSTANCE
+ = new ResultSetToStateMachineInstance();
+ private static final StateInstanceToStatementForInsert STATE_INSTANCE_TO_STATEMENT_FOR_INSERT
+ = new StateInstanceToStatementForInsert();
+ private static final StateInstanceToStatementForUpdate STATE_INSTANCE_TO_STATEMENT_FOR_UPDATE
+ = new StateInstanceToStatementForUpdate();
+ private static final ResultSetToStateInstance RESULT_SET_TO_STATE_INSTANCE = new ResultSetToStateInstance();
+ private SagaTransactionalTemplate sagaTransactionalTemplate;
private Serializer<Object, String> paramsSerializer = new ParamsFastjsonSerializer();
private Serializer<Exception, byte[]> exceptionSerializer = new ExceptionSerializer();
- private StateLogStoreSqls stateLogStoreSqls;
- private String defaultTenantId;
- private SeqGenerator seqGenerator;
-
- private static final StateMachineInstanceToStatementForInsert STATE_MACHINE_INSTANCE_TO_STATEMENT_FOR_INSERT = new StateMachineInstanceToStatementForInsert();
- private static final StateMachineInstanceToStatementForUpdate STATE_MACHINE_INSTANCE_TO_STATEMENT_FOR_UPDATE = new StateMachineInstanceToStatementForUpdate();
- private static final ResultSetToStateMachineInstance RESULT_SET_TO_STATE_MACHINE_INSTANCE = new ResultSetToStateMachineInstance();
-
- private static final StateInstanceToStatementForInsert STATE_INSTANCE_TO_STATEMENT_FOR_INSERT = new StateInstanceToStatementForInsert();
- private static final StateInstanceToStatementForUpdate STATE_INSTANCE_TO_STATEMENT_FOR_UPDATE = new StateInstanceToStatementForUpdate();
- private static final ResultSetToStateInstance RESULT_SET_TO_STATE_INSTANCE = new ResultSetToStateInstance();
+ private StateLogStoreSqls stateLogStoreSqls;
+ private String defaultTenantId;
+ private SeqGenerator seqGenerator;
@Override
public void recordStateMachineStarted(StateMachineInstance machineInstance, ProcessContext context) {
- if(machineInstance != null){
+ if (machineInstance != null) {
beginTransaction(machineInstance, context);
- if(StringUtils.isEmpty(machineInstance.getId()) && seqGenerator != null){
+ if (StringUtils.isEmpty(machineInstance.getId()) && seqGenerator != null) {
machineInstance.setId(seqGenerator.generate(DomainConstants.SEQ_ENTITY_STATE_MACHINE_INST));
}
// save to db
machineInstance.setSerializedStartParams(paramsSerializer.serialize(machineInstance.getStartParams()));
- executeUpdate(stateLogStoreSqls.getRecordStateMachineStartedSql(dbType), STATE_MACHINE_INSTANCE_TO_STATEMENT_FOR_INSERT, machineInstance);
+ executeUpdate(stateLogStoreSqls.getRecordStateMachineStartedSql(dbType),
+ STATE_MACHINE_INSTANCE_TO_STATEMENT_FOR_INSERT, machineInstance);
}
}
- private void beginTransaction(StateMachineInstance machineInstance, ProcessContext context){
+ private void beginTransaction(StateMachineInstance machineInstance, ProcessContext context) {
+
+ if (sagaTransactionalTemplate != null) {
- if(sagaTransactionalTemplate != null){
+ //if parentId is not null, machineInstance is a SubStateMachine, do not start a new global transaction,
+ //use parent transaction instead.
+ String parentId = machineInstance.getParentId();
+ if (StringUtils.hasLength(parentId)) {
+ if (StringUtils.isEmpty(machineInstance.getId())) {
+ machineInstance.setId(parentId);
+ }
+ return;
+ }
TransactionInfo transactionInfo = new TransactionInfo();
transactionInfo.setTimeOut(sagaTransactionalTemplate.getTimeout());
@@ -102,8 +115,8 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
machineInstance.setId(globalTransaction.getXid());
context.setVariable(DomainConstants.VAR_NAME_GLOBAL_TX, globalTransaction);
- Map<String, Object> machineContext = machineInstance.getContext();
- if(machineContext != null){
+ Map<String, Object> machineContext = machineInstance.getContext();
+ if (machineContext != null) {
machineContext.put(DomainConstants.VAR_NAME_GLOBAL_TX, globalTransaction);
}
context.setVariable(DomainConstants.VAR_NAME_ROOT_CONTEXT_HOLDER, RootContext.entries());
@@ -111,10 +124,12 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
} catch (ExecutionException e) {
String xid = null;
- if(e.getTransaction() != null){
+ if (e.getTransaction() != null) {
xid = e.getTransaction().getXid();
}
- throw new EngineExecutionException(e, e.getCode()+ ", TransName:" +transactionInfo.getName() +", XID: " + xid + ", Reason: " + e.getMessage(), FrameworkErrorCode.TransactionManagerError);
+ throw new EngineExecutionException(e,
+ e.getCode() + ", TransName:" + transactionInfo.getName() + ", XID: " + xid + ", Reason: " + e
+ .getMessage(), FrameworkErrorCode.TransactionManagerError);
}
}
}
@@ -122,66 +137,68 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
@Override
public void recordStateMachineFinished(StateMachineInstance machineInstance, ProcessContext context) {
- if(machineInstance != null){
+ if (machineInstance != null) {
// save to db
Map<String, Object> endParams = machineInstance.getEndParams();
- if(endParams != null){
+ if (endParams != null) {
endParams.remove(DomainConstants.VAR_NAME_GLOBAL_TX);
}
machineInstance.setSerializedEndParams(paramsSerializer.serialize(machineInstance.getEndParams()));
machineInstance.setSerializedException(exceptionSerializer.serialize(machineInstance.getException()));
- executeUpdate(stateLogStoreSqls.getRecordStateMachineFinishedSql(dbType), STATE_MACHINE_INSTANCE_TO_STATEMENT_FOR_UPDATE, machineInstance);
+ executeUpdate(stateLogStoreSqls.getRecordStateMachineFinishedSql(dbType),
+ STATE_MACHINE_INSTANCE_TO_STATEMENT_FOR_UPDATE, machineInstance);
reportTransactionFinished(machineInstance, context);
}
}
- private void reportTransactionFinished(StateMachineInstance machineInstance, ProcessContext context){
+ private void reportTransactionFinished(StateMachineInstance machineInstance, ProcessContext context) {
- if(sagaTransactionalTemplate != null){
+ //if parentId is not null, machineInstance is a SubStateMachine, do not report global transaction.
+ if (sagaTransactionalTemplate != null && StringUtils.isEmpty(machineInstance.getParentId())) {
try {
- GlobalTransaction globalTransaction = (GlobalTransaction)context.getVariable(DomainConstants.VAR_NAME_GLOBAL_TX);
- if(globalTransaction == null){
- globalTransaction = GlobalTransactionContext.reload(machineInstance.getId());
- }
+ GlobalTransaction globalTransaction = getGlobalTransaction(machineInstance, context);
+ if (globalTransaction == null) {
- if(globalTransaction == null){
- throw new EngineExecutionException("Global transaction is not exists", FrameworkErrorCode.ObjectNotExists);
+ throw new EngineExecutionException("Global transaction is not exists",
+ FrameworkErrorCode.ObjectNotExists);
}
GlobalStatus globalStatus;
-
- if(ExecutionStatus.SU.equals(machineInstance.getStatus()) && machineInstance.getCompensationStatus() == null){
+ if (ExecutionStatus.SU.equals(machineInstance.getStatus())
+ && machineInstance.getCompensationStatus() == null) {
globalStatus = GlobalStatus.Committed;
- }
- else if(ExecutionStatus.SU.equals(machineInstance.getCompensationStatus())){
+ } else if (ExecutionStatus.SU.equals(machineInstance.getCompensationStatus())) {
globalStatus = GlobalStatus.Rollbacked;
- }
- else if(ExecutionStatus.FA.equals(machineInstance.getCompensationStatus())
- || ExecutionStatus.UN.equals(machineInstance.getCompensationStatus())){
+ } else if (ExecutionStatus.FA.equals(machineInstance.getCompensationStatus()) || ExecutionStatus.UN
+ .equals(machineInstance.getCompensationStatus())) {
globalStatus = GlobalStatus.RollbackRetrying;
- }
- else if(ExecutionStatus.FA.equals(machineInstance.getStatus()) && machineInstance.getCompensationStatus() == null){
+ } else if (ExecutionStatus.FA.equals(machineInstance.getStatus())
+ && machineInstance.getCompensationStatus() == null) {
globalStatus = GlobalStatus.Finished;
- }
- else if(ExecutionStatus.UN.equals(machineInstance.getStatus()) && machineInstance.getCompensationStatus() == null){
+ } else if (ExecutionStatus.UN.equals(machineInstance.getStatus())
+ && machineInstance.getCompensationStatus() == null) {
globalStatus = GlobalStatus.CommitRetrying;
- }
- else{
+ } else {
globalStatus = GlobalStatus.UnKnown;
}
sagaTransactionalTemplate.reportTransaction(globalTransaction, globalStatus);
} catch (ExecutionException e) {
- LOGGER.error("Report transaction finish to server error: ", e.getCode()+ ", StateMachine:" + machineInstance.getStateMachine().getName() +", XID: "+machineInstance.getId()+", Reason: " + e.getMessage(), e);
+ LOGGER.error("Report transaction finish to server error: ",
+ e.getCode() + ", StateMachine:" + machineInstance.getStateMachine().getName() + ", XID: "
+ + machineInstance.getId() + ", Reason: " + e.getMessage(), e);
} catch (TransactionException e) {
- LOGGER.error("Report transaction finish to server error: " + e.getCode()+ ", StateMachine:" + machineInstance.getStateMachine().getName() +", XID: "+machineInstance.getId()+", Reason: " + e.getMessage(), e);
- }
- finally {
+ LOGGER.error(
+ "Report transaction finish to server error: " + e.getCode() + ", StateMachine:" + machineInstance
+ .getStateMachine().getName() + ", XID: " + machineInstance.getId() + ", Reason: " + e
+ .getMessage(), e);
+ } finally {
// clear
- Map<String, String> rootContextEntries = (Map<String, String>)context.getVariable(DomainConstants.VAR_NAME_ROOT_CONTEXT_HOLDER);
- if(rootContextEntries != null){
+ Map<String, String> rootContextEntries = (Map<String, String>) context.getVariable(
+ DomainConstants.VAR_NAME_ROOT_CONTEXT_HOLDER);
+ if (rootContextEntries != null) {
rootContextEntries.clear();
}
sagaTransactionalTemplate.triggerAfterCompletion();
@@ -195,39 +212,44 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
if (machineInstance != null) {
//save to db
- executeUpdate(stateLogStoreSqls.getUpdateStateMachineRunningStatusSql(dbType), machineInstance.isRunning(), machineInstance.getId());
+ executeUpdate(stateLogStoreSqls.getUpdateStateMachineRunningStatusSql(dbType), machineInstance.isRunning(),
+ machineInstance.getId());
reportTransactionRestarted(machineInstance, context);
}
}
- private void reportTransactionRestarted(StateMachineInstance machineInstance, ProcessContext context){
+ private void reportTransactionRestarted(StateMachineInstance machineInstance, ProcessContext context) {
- if(sagaTransactionalTemplate != null){
+ //if parentId is not null, machineInstance is a SubStateMachine, do not report global transaction.
+ if (sagaTransactionalTemplate != null && StringUtils.isEmpty(machineInstance.getParentId())) {
GlobalStatus globalStatus;
- if(DomainConstants.OPERATION_NAME_COMPENSATE.equals(context.getVariable(DomainConstants.VAR_NAME_OPERATION_NAME))){
+ if (DomainConstants.OPERATION_NAME_COMPENSATE.equals(
+ context.getVariable(DomainConstants.VAR_NAME_OPERATION_NAME))) {
globalStatus = GlobalStatus.Rollbacking;
- }
- else{
+ } else {
globalStatus = GlobalStatus.Committing;
}
try {
- GlobalTransaction globalTransaction = (GlobalTransaction)context.getVariable(DomainConstants.VAR_NAME_GLOBAL_TX);
- if(globalTransaction == null){
- globalTransaction = GlobalTransactionContext.reload(machineInstance.getId());
- }
-
- if(globalTransaction == null){
- throw new EngineExecutionException("Global transaction is not exists", FrameworkErrorCode.ObjectNotExists);
+ GlobalTransaction globalTransaction = getGlobalTransaction(machineInstance, context);
+ if (globalTransaction == null) {
+ throw new EngineExecutionException("Global transaction is not exists",
+ FrameworkErrorCode.ObjectNotExists);
}
sagaTransactionalTemplate.reportTransaction(globalTransaction, globalStatus);
} catch (ExecutionException e) {
- LOGGER.error("Report transaction status to server error: " + e.getCode()+ ", StateMachine:" + machineInstance.getStateMachine().getName() +", XID: "+machineInstance.getId()+", globalStatus:"+ globalStatus +", Reason: " + e.getMessage(), e);
+ LOGGER.error(
+ "Report transaction status to server error: " + e.getCode() + ", StateMachine:" + machineInstance
+ .getStateMachine().getName() + ", XID: " + machineInstance.getId() + ", globalStatus:"
+ + globalStatus + ", Reason: " + e.getMessage(), e);
} catch (TransactionException e) {
- LOGGER.error("Report transaction status to server error: " + e.getCode()+ ", StateMachine:" + machineInstance.getStateMachine().getName() +", XID: "+machineInstance.getId()+", globalStatus:"+ globalStatus +", Reason: " + e.getMessage(), e);
+ LOGGER.error(
+ "Report transaction status to server error: " + e.getCode() + ", StateMachine:" + machineInstance
+ .getStateMachine().getName() + ", XID: " + machineInstance.getId() + ", globalStatus:"
+ + globalStatus + ", Reason: " + e.getMessage(), e);
}
}
}
@@ -239,36 +261,137 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
branchRegister(stateInstance, context);
- if(StringUtils.isEmpty(stateInstance.getId()) && seqGenerator != null){
+ if (StringUtils.isEmpty(stateInstance.getId()) && seqGenerator != null) {
stateInstance.setId(seqGenerator.generate(DomainConstants.SEQ_ENTITY_STATE_INST));
}
stateInstance.setSerializedInputParams(paramsSerializer.serialize(stateInstance.getInputParams()));
- executeUpdate(stateLogStoreSqls.getRecordStateStartedSql(dbType), STATE_INSTANCE_TO_STATEMENT_FOR_INSERT, stateInstance);
+ executeUpdate(stateLogStoreSqls.getRecordStateStartedSql(dbType), STATE_INSTANCE_TO_STATEMENT_FOR_INSERT,
+ stateInstance);
}
}
- private void branchRegister(StateInstance stateInstance, ProcessContext context){
+ private void branchRegister(StateInstance stateInstance, ProcessContext context) {
- if(sagaTransactionalTemplate != null){
+ if (sagaTransactionalTemplate != null) {
- try {
- GlobalTransaction globalTransaction = (GlobalTransaction)context.getVariable(DomainConstants.VAR_NAME_GLOBAL_TX);
- if(globalTransaction == null){
- globalTransaction = GlobalTransactionContext.reload(stateInstance.getStateMachineInstance().getId());
- }
+ //if this state is for retry, do not register branch, but generate id
+ if (StringUtils.hasLength(stateInstance.getStateIdRetriedFor())) {
- if(globalTransaction == null){
- throw new EngineExecutionException("Global transaction is not exists", FrameworkErrorCode.ObjectNotExists);
+ stateInstance.setId(generateRetryStateInstanceId(stateInstance));
+ }
+ //if this state is for compensation, do not register branch, but generate id
+ else if (StringUtils.hasLength(stateInstance.getStateIdCompensatedFor())) {
+
+ stateInstance.setId(generateCompensateStateInstanceId(stateInstance));
+ } else {
+ //Register branch
+ try {
+ StateMachineInstance machineInstance = stateInstance.getStateMachineInstance();
+ GlobalTransaction globalTransaction = getGlobalTransaction(machineInstance, context);
+ if (globalTransaction == null) {
+ throw new EngineExecutionException("Global transaction is not exists", FrameworkErrorCode.ObjectNotExists);
+ }
+
+ String resourceId = stateInstance.getStateMachineInstance().getStateMachine().getName() + "#" + stateInstance.getName();
+ long branchId = sagaTransactionalTemplate.branchRegister(resourceId, null, globalTransaction.getXid(), null, null);
+ stateInstance.setId(String.valueOf(branchId));
+ } catch (TransactionException e) {
+ throw new EngineExecutionException(e,
+ "Branch transaction error: " + e.getCode() + ", StateMachine:" + stateInstance.getStateMachineInstance()
+ .getStateMachine().getName() + ", XID: " + stateInstance.getStateMachineInstance().getId() + ", State:"
+ + stateInstance.getName() + ", stateId: " + stateInstance.getId() + ", Reason: " + e.getMessage(),
+ FrameworkErrorCode.TransactionManagerError);
+ } catch (ExecutionException e) {
+ throw new EngineExecutionException(e,
+ "Branch transaction error: " + e.getCode() + ", StateMachine:" + stateInstance.getStateMachineInstance()
+ .getStateMachine().getName() + ", XID: " + stateInstance.getStateMachineInstance().getId() + ", State:"
+ + stateInstance.getName() + ", stateId: " + stateInstance.getId() + ", Reason: " + e.getMessage(),
+ FrameworkErrorCode.TransactionManagerError);
}
+ }
+ }
+ }
- String resourceId = stateInstance.getStateMachineInstance().getStateMachine().getName() + "#" + stateInstance.getName();
- long branchId = sagaTransactionalTemplate.branchRegister(resourceId, null, globalTransaction.getXid(), null, null);
- stateInstance.setId(String.valueOf(branchId));
- } catch (TransactionException e) {
- throw new EngineExecutionException(e, "Branch transaction error: " + e.getCode() + ", StateMachine:" + stateInstance.getStateMachineInstance().getStateMachine().getName() + ", XID: " + stateInstance.getStateMachineInstance().getId() + ", State:" + stateInstance.getName() + ", stateId: " + stateInstance.getId() + ", Reason: " + e.getMessage(), FrameworkErrorCode.TransactionManagerError);
+ private GlobalTransaction getGlobalTransaction(StateMachineInstance machineInstance, ProcessContext context)
+ throws ExecutionException, TransactionException {
+
+ GlobalTransaction globalTransaction = (GlobalTransaction) context.getVariable(DomainConstants.VAR_NAME_GLOBAL_TX);
+ if (globalTransaction == null) {
+ String xid;
+ String parentId = machineInstance.getParentId();
+ if (StringUtils.isEmpty(parentId)) {
+ xid = machineInstance.getId();
+ } else {
+ xid = parentId.substring(0, parentId.lastIndexOf(DomainConstants.SEPERATOR_PARENT_ID));
+ }
+ globalTransaction = sagaTransactionalTemplate.reloadTransaction(xid);
+ if (globalTransaction != null) {
+ context.setVariable(DomainConstants.VAR_NAME_GLOBAL_TX, globalTransaction);
+ }
+ }
+ return globalTransaction;
+ }
+
+ /**
+ * generate retry state instance id based on original state instance id
+ * ${originalStateInstanceId}.${retryCount}
+ * @param stateInstance
+ * @return
+ */
+ private String generateRetryStateInstanceId(StateInstance stateInstance) {
+
+ String originalStateInstId = stateInstance.getStateIdRetriedFor();
+ int maxIndex = 1;
+ Map<String, StateInstance> stateInstanceMap = stateInstance.getStateMachineInstance().getStateMap();
+ StateInstance originalStateInst = stateInstanceMap.get(stateInstance.getStateIdRetriedFor());
+ while (StringUtils.hasLength(originalStateInst.getStateIdRetriedFor())) {
+ originalStateInst = stateInstanceMap.get(originalStateInst.getStateIdRetriedFor());
+ int idIndex = getIdIndex(originalStateInst.getId(), ".");
+ maxIndex = idIndex > maxIndex ? idIndex : maxIndex;
+ maxIndex++;
+ }
+ if (originalStateInst != null) {
+ originalStateInstId = originalStateInst.getId();
+ }
+ return originalStateInstId + "." + maxIndex;
+ }
+
+ /**
+ * generate compensate state instance id based on original state instance id
+ * ${originalStateInstanceId}-${retryCount}
+ * @param stateInstance
+ * @return
+ */
+ private String generateCompensateStateInstanceId(StateInstance stateInstance) {
+
+ String originalCompensateStateInstId = stateInstance.getStateIdCompensatedFor();
+ int maxIndex = 1;
+ for (StateInstance aStateInstance : stateInstance.getStateMachineInstance().getStateList()) {
+ if (aStateInstance != stateInstance
+ && originalCompensateStateInstId.equals(aStateInstance.getStateIdCompensatedFor())) {
+ int idIndex = getIdIndex(aStateInstance.getId(), "-");
+ maxIndex = idIndex > maxIndex ? idIndex : maxIndex;
+ maxIndex++;
+ }
+ }
+ return originalCompensateStateInstId + "-" + maxIndex;
+ }
+
+ private int getIdIndex(String stateInstanceId, String separator) {
+
+ if (StringUtils.hasLength(stateInstanceId)) {
+ int start = stateInstanceId.lastIndexOf(separator);
+ if (start > 0) {
+ String indexStr = stateInstanceId.substring(start + 1, stateInstanceId.length());
+ try {
+ return Integer.parseInt(indexStr);
+ } catch (NumberFormatException e) {
+ LOGGER.warn("get stateInstance id index failed", e);
+ }
}
}
+ return -1;
}
@Override
@@ -278,63 +401,113 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
stateInstance.setSerializedOutputParams(paramsSerializer.serialize(stateInstance.getOutputParams()));
stateInstance.setSerializedException(exceptionSerializer.serialize(stateInstance.getException()));
- executeUpdate(stateLogStoreSqls.getRecordStateFinishedSql(dbType), STATE_INSTANCE_TO_STATEMENT_FOR_UPDATE, stateInstance);
+ executeUpdate(stateLogStoreSqls.getRecordStateFinishedSql(dbType), STATE_INSTANCE_TO_STATEMENT_FOR_UPDATE,
+ stateInstance);
branchReport(stateInstance, context);
}
}
- private void branchReport(StateInstance stateInstance, ProcessContext context){
+ private void branchReport(StateInstance stateInstance, ProcessContext context) {
+
+ if (sagaTransactionalTemplate != null) {
- if(sagaTransactionalTemplate != null){
+ //find out the original state instance, only the original state instance is registered on the server, and its status should
+ // be reported.
+ StateInstance originalStateInst = null;
+ if (StringUtils.hasLength(stateInstance.getStateIdRetriedFor())) {
+
+ originalStateInst = findOutOriginalStateInstanceOfRetryState(stateInstance);
+ } else if (StringUtils.hasLength(stateInstance.getStateIdCompensatedFor())) {
+
+ originalStateInst = findOutOriginalStateInstanceOfCompensateState(stateInstance);
+ }
+
+ if (originalStateInst == null) {
+ originalStateInst = stateInstance;
+ }
BranchStatus branchStatus = null;
try {
- GlobalTransaction globalTransaction = (GlobalTransaction)context.getVariable(DomainConstants.VAR_NAME_GLOBAL_TX);
- if(globalTransaction == null){
- globalTransaction = GlobalTransactionContext.reload(stateInstance.getStateMachineInstance().getId());
- }
+ StateMachineInstance machineInstance = stateInstance.getStateMachineInstance();
+ GlobalTransaction globalTransaction = getGlobalTransaction(machineInstance, context);
- if(globalTransaction == null){
+ if (globalTransaction == null) {
throw new EngineExecutionException("Global transaction is not exists", FrameworkErrorCode.ObjectNotExists);
}
- if(ExecutionStatus.SU.equals(stateInstance.getStatus()) && stateInstance.getCompensationStatus() == null){
+ if (ExecutionStatus.SU.equals(originalStateInst.getStatus()) && originalStateInst.getCompensationStatus() == null) {
branchStatus = BranchStatus.PhaseTwo_Committed;
- }
- else if(ExecutionStatus.SU.equals(stateInstance.getCompensationStatus())){
+ } else if (ExecutionStatus.SU.equals(originalStateInst.getCompensationStatus())) {
branchStatus = BranchStatus.PhaseTwo_Rollbacked;
- }
- else if(ExecutionStatus.FA.equals(stateInstance.getCompensationStatus())
- || ExecutionStatus.UN.equals(stateInstance.getCompensationStatus())){
+ } else if (ExecutionStatus.FA.equals(originalStateInst.getCompensationStatus())
+ || ExecutionStatus.UN.equals(originalStateInst.getCompensationStatus())) {
branchStatus = BranchStatus.PhaseTwo_RollbackFailed_Retryable;
- }
- else if((ExecutionStatus.FA.equals(stateInstance.getStatus()) || ExecutionStatus.UN.equals(stateInstance.getStatus()))
- && stateInstance.getCompensationStatus() == null){
+ } else if ((ExecutionStatus.FA.equals(originalStateInst.getStatus()) || ExecutionStatus.UN.equals(
+ originalStateInst.getStatus()))
+ && originalStateInst.getCompensationStatus() == null) {
branchStatus = BranchStatus.PhaseOne_Failed;
- }
- else{
+ } else {
branchStatus = BranchStatus.Unknown;
}
- sagaTransactionalTemplate.branchReport(globalTransaction.getXid(), Long.parseLong(stateInstance.getId()), branchStatus, null);
+ sagaTransactionalTemplate.branchReport(globalTransaction.getXid(), Long.parseLong(originalStateInst.getId()), branchStatus,
+ null);
} catch (TransactionException e) {
- LOGGER.error("Report branch status to server error: " + e.getCode() +
- ", StateMachine:" + stateInstance.getStateMachineInstance().getStateMachine().getName() +
- ", StateName:" + stateInstance.getName() +
- ", XID: "+stateInstance.getStateMachineInstance().getId() +
- ", branchId: " + stateInstance.getId() +
- ", branchStatus:" + branchStatus +
- ", Reason: " + e.getMessage(), e);
+ LOGGER.error(
+ "Report branch status to server error: {}, StateMachine:{}, StateName:{}, XID: {}, branchId: {}, branchStatus:{},"
+ + " Reason:{} "
+ , e.getCode()
+ , originalStateInst.getStateMachineInstance().getStateMachine().getName()
+ , originalStateInst.getName()
+ , originalStateInst.getStateMachineInstance().getId()
+ , originalStateInst.getId()
+ , branchStatus
+ , e.getMessage()
+ , e);
+ } catch (ExecutionException e) {
+ LOGGER.error(
+ "Report branch status to server error: {}, StateMachine:{}, StateName:{}, XID: {}, branchId: {}, branchStatus:{},"
+ + " Reason:{} "
+ , e.getCode()
+ , originalStateInst.getStateMachineInstance().getStateMachine().getName()
+ , originalStateInst.getName()
+ , originalStateInst.getStateMachineInstance().getId()
+ , originalStateInst.getId()
+ , branchStatus
+ , e.getMessage()
+ , e);
}
}
}
+ private StateInstance findOutOriginalStateInstanceOfRetryState(StateInstance stateInstance) {
+
+ StateInstance originalStateInst;
+ Map<String, StateInstance> stateInstanceMap = stateInstance.getStateMachineInstance().getStateMap();
+ originalStateInst = stateInstanceMap.get(stateInstance.getStateIdRetriedFor());
+ while (StringUtils.hasLength(originalStateInst.getStateIdRetriedFor())) {
+ originalStateInst = stateInstanceMap.get(originalStateInst.getStateIdRetriedFor());
+ }
+ return originalStateInst;
+ }
+
+ private StateInstance findOutOriginalStateInstanceOfCompensateState(StateInstance stateInstance) {
+
+ StateInstance originalStateInst;
+ Map<String, StateInstance> stateInstanceMap = stateInstance.getStateMachineInstance().getStateMap();
+ originalStateInst = stateInstance.getStateMachineInstance().getStateMap().get(stateInstance.getStateIdCompensatedFor());
+ while (StringUtils.hasLength(originalStateInst.getStateIdRetriedFor())) {
+ originalStateInst = stateInstanceMap.get(originalStateInst.getStateIdRetriedFor());
+ }
+ return originalStateInst;
+ }
@Override
public StateMachineInstance getStateMachineInstance(String stateMachineInstanceId) {
- StateMachineInstance stateMachineInstance = selectOne(stateLogStoreSqls.getGetStateMachineInstanceByIdSql(dbType), RESULT_SET_TO_STATE_MACHINE_INSTANCE, stateMachineInstanceId);
+ StateMachineInstance stateMachineInstance = selectOne(stateLogStoreSqls.getGetStateMachineInstanceByIdSql(dbType),
+ RESULT_SET_TO_STATE_MACHINE_INSTANCE, stateMachineInstanceId);
if (stateMachineInstance == null) {
return null;
}
@@ -350,10 +523,12 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
@Override
public StateMachineInstance getStateMachineInstanceByBusinessKey(String businessKey, String tenantId) {
- if(StringUtils.isEmpty(tenantId)){
+ if (StringUtils.isEmpty(tenantId)) {
tenantId = defaultTenantId;
}
- StateMachineInstance stateMachineInstance = selectOne(stateLogStoreSqls.getGetStateMachineInstanceByBusinessKeySql(dbType), RESULT_SET_TO_STATE_MACHINE_INSTANCE, businessKey, tenantId);
+ StateMachineInstance stateMachineInstance = selectOne(
+ stateLogStoreSqls.getGetStateMachineInstanceByBusinessKeySql(dbType), RESULT_SET_TO_STATE_MACHINE_INSTANCE,
+ businessKey, tenantId);
if (stateMachineInstance == null) {
return null;
}
@@ -367,31 +542,35 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
}
private void deserializeParamsAndException(StateMachineInstance stateMachineInstance) {
- byte[] serializedException = (byte[])stateMachineInstance.getSerializedException();
+ byte[] serializedException = (byte[]) stateMachineInstance.getSerializedException();
if (serializedException != null) {
stateMachineInstance.setException((Exception) exceptionSerializer.deserialize(serializedException));
}
- String serializedStartParams = (String)stateMachineInstance.getSerializedStartParams();
- if(StringUtils.hasLength(serializedStartParams)){
- stateMachineInstance.setStartParams((Map<String, Object>) paramsSerializer.deserialize(serializedStartParams));
+ String serializedStartParams = (String) stateMachineInstance.getSerializedStartParams();
+ if (StringUtils.hasLength(serializedStartParams)) {
+ stateMachineInstance.setStartParams(
+ (Map<String, Object>) paramsSerializer.deserialize(serializedStartParams));
}
- String serializedEndParams = (String)stateMachineInstance.getSerializedEndParams();
- if(StringUtils.hasLength(serializedEndParams)){
+ String serializedEndParams = (String) stateMachineInstance.getSerializedEndParams();
+ if (StringUtils.hasLength(serializedEndParams)) {
stateMachineInstance.setEndParams((Map<String, Object>) paramsSerializer.deserialize(serializedEndParams));
}
}
@Override
public List<StateMachineInstance> queryStateMachineInstanceByParentId(String parentId) {
- return selectList(stateLogStoreSqls.getQueryStateMachineInstancesByParentIdSql(dbType), RESULT_SET_TO_STATE_MACHINE_INSTANCE, parentId);
+ return selectList(stateLogStoreSqls.getQueryStateMachineInstancesByParentIdSql(dbType),
+ RESULT_SET_TO_STATE_MACHINE_INSTANCE, parentId);
}
@Override
public StateInstance getStateInstance(String stateInstanceId, String machineInstId) {
- StateInstance stateInstance = selectOne(stateLogStoreSqls.getGetStateInstanceByIdAndMachineInstanceIdSql(dbType), RESULT_SET_TO_STATE_INSTANCE, machineInstId, stateInstanceId);
+ StateInstance stateInstance = selectOne(
+ stateLogStoreSqls.getGetStateInstanceByIdAndMachineInstanceIdSql(dbType), RESULT_SET_TO_STATE_INSTANCE,
+ machineInstId, stateInstanceId);
deserializeParamsAndException(stateInstance);
return stateInstance;
}
@@ -399,15 +578,15 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
private void deserializeParamsAndException(StateInstance stateInstance) {
if (stateInstance != null) {
String inputParams = (String) stateInstance.getSerializedInputParams();
- if(StringUtils.hasLength(inputParams)){
+ if (StringUtils.hasLength(inputParams)) {
stateInstance.setInputParams(paramsSerializer.deserialize(inputParams));
}
String outputParams = (String) stateInstance.getSerializedOutputParams();
- if(StringUtils.hasLength(outputParams)){
+ if (StringUtils.hasLength(outputParams)) {
stateInstance.setOutputParams(paramsSerializer.deserialize(outputParams));
}
byte[] serializedException = (byte[]) stateInstance.getSerializedException();
- if(serializedException != null){
+ if (serializedException != null) {
stateInstance.setException((Exception) exceptionSerializer.deserialize(serializedException));
}
}
@@ -416,7 +595,9 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
@Override
public List<StateInstance> queryStateInstanceListByMachineInstanceId(String stateMachineInstanceId) {
- List<StateInstance> stateInstanceList = selectList(stateLogStoreSqls.getQueryStateInstancesByMachineInstanceIdSql(dbType), RESULT_SET_TO_STATE_INSTANCE, stateMachineInstanceId);
+ List<StateInstance> stateInstanceList = selectList(
+ stateLogStoreSqls.getQueryStateInstancesByMachineInstanceIdSql(dbType), RESULT_SET_TO_STATE_INSTANCE,
+ stateMachineInstanceId);
if (stateInstanceList == null || stateInstanceList.size() == 0) {
return stateInstanceList;
@@ -476,9 +657,48 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
}
}
+ public void setExceptionSerializer(Serializer<Exception, byte[]> exceptionSerializer) {
+ this.exceptionSerializer = exceptionSerializer;
+ }
+
+ public SagaTransactionalTemplate getSagaTransactionalTemplate() {
+ return sagaTransactionalTemplate;
+ }
+
+ public void setSagaTransactionalTemplate(SagaTransactionalTemplate sagaTransactionalTemplate) {
+ this.sagaTransactionalTemplate = sagaTransactionalTemplate;
+ }
+
+ public Serializer<Object, String> getParamsSerializer() {
+ return paramsSerializer;
+ }
+
+ public void setParamsSerializer(Serializer<Object, String> paramsSerializer) {
+ this.paramsSerializer = paramsSerializer;
+ }
+
+ public String getDefaultTenantId() {
+ return defaultTenantId;
+ }
+
+ public void setDefaultTenantId(String defaultTenantId) {
+ this.defaultTenantId = defaultTenantId;
+ }
+
+ public void setSeqGenerator(SeqGenerator seqGenerator) {
+ this.seqGenerator = seqGenerator;
+ }
+
+ @Override
+ public void setTablePrefix(String tablePrefix) {
+ super.setTablePrefix(tablePrefix);
+ this.stateLogStoreSqls = new StateLogStoreSqls(tablePrefix);
+ }
+
private static class StateMachineInstanceToStatementForInsert implements ObjectToStatement<StateMachineInstance> {
@Override
- public void toStatement(StateMachineInstance stateMachineInstance, PreparedStatement statement) throws SQLException {
+ public void toStatement(StateMachineInstance stateMachineInstance, PreparedStatement statement)
+ throws SQLException {
statement.setString(1, stateMachineInstance.getId());
statement.setString(2, stateMachineInstance.getMachineId());
statement.setString(3, stateMachineInstance.getTenantId());
@@ -493,12 +713,16 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
private static class StateMachineInstanceToStatementForUpdate implements ObjectToStatement<StateMachineInstance> {
@Override
- public void toStatement(StateMachineInstance stateMachineInstance, PreparedStatement statement) throws SQLException {
+ public void toStatement(StateMachineInstance stateMachineInstance, PreparedStatement statement)
+ throws SQLException {
statement.setTimestamp(1, new Timestamp(stateMachineInstance.getGmtEnd().getTime()));
- statement.setBytes(2, stateMachineInstance.getSerializedException() != null ? (byte[])stateMachineInstance.getSerializedException() : null);
+ statement.setBytes(2, stateMachineInstance.getSerializedException() != null ? (byte[]) stateMachineInstance
+ .getSerializedException() : null);
statement.setObject(3, stateMachineInstance.getSerializedEndParams());
statement.setString(4, stateMachineInstance.getStatus().name());
- statement.setString(5, stateMachineInstance.getCompensationStatus() != null?stateMachineInstance.getCompensationStatus().name():null);
+ statement.setString(5,
+ stateMachineInstance.getCompensationStatus() != null ? stateMachineInstance.getCompensationStatus()
+ .name() : null);
statement.setBoolean(6, stateMachineInstance.isRunning());
statement.setString(7, stateMachineInstance.getId());
}
@@ -528,7 +752,8 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
@Override
public void toStatement(StateInstance stateInstance, PreparedStatement statement) throws SQLException {
statement.setTimestamp(1, new Timestamp(stateInstance.getGmtEnd().getTime()));
- statement.setBytes(2, stateInstance.getException() != null ? (byte[])stateInstance.getSerializedException() : null);
+ statement.setBytes(2,
+ stateInstance.getException() != null ? (byte[]) stateInstance.getSerializedException() : null);
statement.setString(3, stateInstance.getStatus().name());
statement.setObject(4, stateInstance.getSerializedOutputParams());
statement.setString(5, stateInstance.getId());
@@ -551,13 +776,13 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
stateMachineInstance.setStatus(ExecutionStatus.valueOf(resultSet.getString("status")));
String compensationStatusName = resultSet.getString("compensation_status");
- if(StringUtils.hasLength(compensationStatusName)){
+ if (StringUtils.hasLength(compensationStatusName)) {
stateMachineInstance.setCompensationStatus(ExecutionStatus.valueOf(compensationStatusName));
}
stateMachineInstance.setRunning(resultSet.getBoolean("is_running"));
stateMachineInstance.setGmtUpdated(resultSet.getTimestamp("gmt_updated"));
- if(resultSet.getMetaData().getColumnCount() > 11){
+ if (resultSet.getMetaData().getColumnCount() > 11) {
stateMachineInstance.setSerializedStartParams(resultSet.getString("start_params"));
stateMachineInstance.setSerializedEndParams(resultSet.getString("end_params"));
stateMachineInstance.setSerializedException(resultSet.getBytes("excep"));
@@ -592,42 +817,4 @@ public class DbAndReportTcStateLogStore extends AbstractStore implements StateLo
return stateInstance;
}
}
-
- public void setExceptionSerializer(Serializer<Exception, byte[]> exceptionSerializer) {
- this.exceptionSerializer = exceptionSerializer;
- }
-
- public SagaTransactionalTemplate getSagaTransactionalTemplate() {
- return sagaTransactionalTemplate;
- }
-
- public void setSagaTransactionalTemplate(SagaTransactionalTemplate sagaTransactionalTemplate) {
- this.sagaTransactionalTemplate = sagaTransactionalTemplate;
- }
-
- public Serializer<Object, String> getParamsSerializer() {
- return paramsSerializer;
- }
-
- public void setParamsSerializer(Serializer<Object, String> paramsSerializer) {
- this.paramsSerializer = paramsSerializer;
- }
-
- public String getDefaultTenantId() {
- return defaultTenantId;
- }
-
- public void setDefaultTenantId(String defaultTenantId) {
- this.defaultTenantId = defaultTenantId;
- }
-
- public void setSeqGenerator(SeqGenerator seqGenerator) {
- this.seqGenerator = seqGenerator;
- }
-
- @Override
- public void setTablePrefix(String tablePrefix) {
- super.setTablePrefix(tablePrefix);
- this.stateLogStoreSqls = new StateLogStoreSqls(tablePrefix);
- }
-}
\ No newline at end of file
+}
diff --git a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbStateLangStore.java b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbStateLangStore.java
index 316a10566a49078abd4d4ff6dcc0c9595df8a519..6e121c70aff1da2f250c124e85c964702bf32c89 100644
--- a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbStateLangStore.java
+++ b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/DbStateLangStore.java
@@ -15,17 +15,17 @@
*/
package io.seata.saga.engine.store.db;
-import io.seata.saga.engine.store.StateLangStore;
-import io.seata.saga.statelang.domain.StateMachine;
-import io.seata.saga.statelang.domain.StateMachine.Status;
-import io.seata.saga.statelang.domain.impl.StateMachineImpl;
-
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Timestamp;
import java.util.List;
+import io.seata.saga.engine.store.StateLangStore;
+import io.seata.saga.statelang.domain.StateMachine;
+import io.seata.saga.statelang.domain.StateMachine.Status;
+import io.seata.saga.statelang.domain.impl.StateMachineImpl;
+
/**
* State language definition store in DB
*
@@ -41,14 +41,16 @@ public class DbStateLangStore extends AbstractStore implements StateLangStore {
@Override
public StateMachine getStateMachineById(String stateMachineId) {
- return selectOne(stateLangStoreSqls.getGetStateMachineByIdSql(dbType), RESULT_SET_TO_STATE_MACHINE, stateMachineId);
+ return selectOne(stateLangStoreSqls.getGetStateMachineByIdSql(dbType), RESULT_SET_TO_STATE_MACHINE,
+ stateMachineId);
}
@Override
public StateMachine getLastVersionStateMachine(String stateMachineName, String tenantId) {
- List<StateMachine> list = selectList(stateLangStoreSqls.getQueryStateMachinesByNameAndTenantSql(dbType), RESULT_SET_TO_STATE_MACHINE, stateMachineName, tenantId);
- if(list != null && list.size() > 0){
+ List<StateMachine> list = selectList(stateLangStoreSqls.getQueryStateMachinesByNameAndTenantSql(dbType),
+ RESULT_SET_TO_STATE_MACHINE, stateMachineName, tenantId);
+ if (list != null && list.size() > 0) {
return list.get(0);
}
return null;
@@ -56,7 +58,14 @@ public class DbStateLangStore extends AbstractStore implements StateLangStore {
@Override
public boolean storeStateMachine(StateMachine stateMachine) {
- return executeUpdate(stateLangStoreSqls.getInsertStateMachineSql(dbType), STATE_MACHINE_TO_STATEMENT, stateMachine) > 0;
+ return executeUpdate(stateLangStoreSqls.getInsertStateMachineSql(dbType), STATE_MACHINE_TO_STATEMENT,
+ stateMachine) > 0;
+ }
+
+ @Override
+ public void setTablePrefix(String tablePrefix) {
+ super.setTablePrefix(tablePrefix);
+ this.stateLangStoreSqls = new StateLangStoreSqls(tablePrefix);
}
private static class ResultSetToStateMachine implements ResultSetToObject<StateMachine> {
@@ -94,10 +103,4 @@ public class DbStateLangStore extends AbstractStore implements StateLangStore {
statement.setString(11, stateMachine.getComment());
}
}
-
- @Override
- public void setTablePrefix(String tablePrefix) {
- super.setTablePrefix(tablePrefix);
- this.stateLangStoreSqls = new StateLangStoreSqls(tablePrefix);
- }
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/StateLangStoreSqls.java b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/StateLangStoreSqls.java
index cad2f3732ae7fed81705b177ecec31be0da2e759..ea453f7f874e4661540897490c5ec6294fa425bf 100644
--- a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/StateLangStoreSqls.java
+++ b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/StateLangStoreSqls.java
@@ -22,13 +22,17 @@ package io.seata.saga.engine.store.db;
*/
public class StateLangStoreSqls {
- private static final String STATE_MACHINE_FIELDS = "id, tenant_id, app_name, name, status, gmt_create, ver, type, content, recover_strategy, comment_";
+ private static final String STATE_MACHINE_FIELDS
+ = "id, tenant_id, app_name, name, status, gmt_create, ver, type, content, recover_strategy, comment_";
- private static final String GET_STATE_MACHINE_BY_ID_SQL = "SELECT " + STATE_MACHINE_FIELDS + " FROM ${TABLE_PREFIX}state_machine_def WHERE id = ?";
+ private static final String GET_STATE_MACHINE_BY_ID_SQL = "SELECT " + STATE_MACHINE_FIELDS
+ + " FROM ${TABLE_PREFIX}state_machine_def WHERE id = ?";
- private static final String QUERY_STATE_MACHINES_BY_NAME_AND_TENANT_SQL = "SELECT " + STATE_MACHINE_FIELDS + " FROM ${TABLE_PREFIX}state_machine_def WHERE name = ? AND tenant_id = ? ORDER BY gmt_create DESC";
+ private static final String QUERY_STATE_MACHINES_BY_NAME_AND_TENANT_SQL = "SELECT " + STATE_MACHINE_FIELDS
+ + " FROM ${TABLE_PREFIX}state_machine_def WHERE name = ? AND tenant_id = ? ORDER BY gmt_create DESC";
- private static final String INSERT_STATE_MACHINE_SQL = "INSERT INTO ${TABLE_PREFIX}state_machine_def (" + STATE_MACHINE_FIELDS + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+ private static final String INSERT_STATE_MACHINE_SQL = "INSERT INTO ${TABLE_PREFIX}state_machine_def ("
+ + STATE_MACHINE_FIELDS + ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
private static final String TABLE_PREFIX_REGEX = "\\$\\{TABLE_PREFIX}";
@@ -38,26 +42,27 @@ public class StateLangStoreSqls {
private String queryStateMachinesByNameAndTenantSql;
private String insertStateMachineSql;
- public StateLangStoreSqls(String tablePrefix){
+ public StateLangStoreSqls(String tablePrefix) {
this.tablePrefix = tablePrefix;
init();
}
- private void init(){
+ private void init() {
getGetStateMachineByIdSql = GET_STATE_MACHINE_BY_ID_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
- queryStateMachinesByNameAndTenantSql = QUERY_STATE_MACHINES_BY_NAME_AND_TENANT_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
+ queryStateMachinesByNameAndTenantSql = QUERY_STATE_MACHINES_BY_NAME_AND_TENANT_SQL.replaceAll(
+ TABLE_PREFIX_REGEX, tablePrefix);
insertStateMachineSql = INSERT_STATE_MACHINE_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
}
- public String getGetStateMachineByIdSql(String dbType){
+ public String getGetStateMachineByIdSql(String dbType) {
return getGetStateMachineByIdSql;
}
- public String getQueryStateMachinesByNameAndTenantSql(String dbType){
+ public String getQueryStateMachinesByNameAndTenantSql(String dbType) {
return queryStateMachinesByNameAndTenantSql;
}
- public String getInsertStateMachineSql(String dbType){
+ public String getInsertStateMachineSql(String dbType) {
return insertStateMachineSql;
}
diff --git a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/StateLogStoreSqls.java b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/StateLogStoreSqls.java
index 54263cf2941acfe01f2fff2ed23c5ed61f0187c2..f9f9a29b6254254cb9b77bae44ccec9652363673 100644
--- a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/StateLogStoreSqls.java
+++ b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/db/StateLogStoreSqls.java
@@ -22,49 +22,75 @@ package io.seata.saga.engine.store.db;
*/
public class StateLogStoreSqls {
- /** machine instance **/
- private static final String STATE_MACHINE_INSTANCE_FIELDS = "id, machine_id, tenant_id, parent_id, business_key, gmt_started, gmt_end, status, compensation_status, is_running, gmt_updated, start_params, end_params, excep";
+ /**
+ * machine instance
+ **/
+ private static final String STATE_MACHINE_INSTANCE_FIELDS
+ = "id, machine_id, tenant_id, parent_id, business_key, gmt_started, gmt_end, status, compensation_status, "
+ + "is_running, gmt_updated, start_params, end_params, excep";
- private static final String STATE_MACHINE_INSTANCE_FIELDS_WITHOUT_PARAMS = "id, machine_id, tenant_id, parent_id, business_key, gmt_started, gmt_end, status, compensation_status, is_running, gmt_updated";
+ private static final String STATE_MACHINE_INSTANCE_FIELDS_WITHOUT_PARAMS
+ = "id, machine_id, tenant_id, parent_id, business_key, gmt_started, gmt_end, status, compensation_status, "
+ + "is_running, gmt_updated";
private static final String RECORD_STATE_MACHINE_STARTED_SQL = "INSERT INTO ${TABLE_PREFIX}state_machine_inst\n"
- + "(id, machine_id, tenant_id, parent_id, gmt_started, business_key, start_params, is_running, status, gmt_updated)\n"
- + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, current_timestamp)";
+ + "(id, machine_id, tenant_id, parent_id, gmt_started, business_key, start_params, is_running, status, "
+ + "gmt_updated)\n"
+ + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, current_timestamp)";
- private static final String RECORD_STATE_MACHINE_FINISHED_SQL = "UPDATE ${TABLE_PREFIX}state_machine_inst SET gmt_end = ?, excep = ?, end_params = ?,status = ?, compensation_status = ?, is_running = ?, gmt_updated = current_timestamp WHERE id = ?";
+ private static final String RECORD_STATE_MACHINE_FINISHED_SQL
+ = "UPDATE ${TABLE_PREFIX}state_machine_inst SET gmt_end = ?, excep = ?, end_params = ?,status = ?, "
+ + "compensation_status = ?, is_running = ?, gmt_updated = current_timestamp WHERE id = ?";
- private static final String UPDATE_STATE_MACHINE_RUNNING_STATUS_SQL = "UPDATE ${TABLE_PREFIX}state_machine_inst SET\n"
+ private static final String UPDATE_STATE_MACHINE_RUNNING_STATUS_SQL =
+ "UPDATE ${TABLE_PREFIX}state_machine_inst SET\n"
+ "is_running = ?, gmt_updated = current_timestamp where id = ?";
+ private static final String GET_STATE_MACHINE_INSTANCE_BY_ID_SQL = "SELECT " + STATE_MACHINE_INSTANCE_FIELDS
+ + " FROM ${TABLE_PREFIX}state_machine_inst WHERE id = ?";
- private static final String GET_STATE_MACHINE_INSTANCE_BY_ID_SQL = "SELECT " + STATE_MACHINE_INSTANCE_FIELDS + " FROM ${TABLE_PREFIX}state_machine_inst WHERE id = ?";
+ private static final String GET_STATE_MACHINE_INSTANCE_BY_BUSINESS_KEY_SQL = "SELECT "
+ + STATE_MACHINE_INSTANCE_FIELDS
+ + " FROM ${TABLE_PREFIX}state_machine_inst WHERE business_key = ? AND tenant_id = ?";
- private static final String GET_STATE_MACHINE_INSTANCE_BY_BUSINESS_KEY_SQL = "SELECT " + STATE_MACHINE_INSTANCE_FIELDS + " FROM ${TABLE_PREFIX}state_machine_inst WHERE business_key = ? AND tenant_id = ?";
+ private static final String QUERY_STATE_MACHINE_INSTANCES_BY_PARENT_ID_SQL = "SELECT "
+ + STATE_MACHINE_INSTANCE_FIELDS_WITHOUT_PARAMS
+ + " FROM ${TABLE_PREFIX}state_machine_inst WHERE parent_id = ? ORDER BY gmt_started DESC";
- private static final String QUERY_STATE_MACHINE_INSTANCES_BY_PARENT_ID_SQL = "SELECT " + STATE_MACHINE_INSTANCE_FIELDS_WITHOUT_PARAMS + " FROM ${TABLE_PREFIX}state_machine_inst WHERE parent_id = ? ORDER BY gmt_started DESC";
+ /**
+ * state instance
+ **/
+ private static final String STATE_INSTANCE_FIELDS
+ = "id, machine_inst_id, name, type, business_key, gmt_started, service_name, service_method, service_type, "
+ + "is_for_update, status, input_params, output_params, excep, gmt_end, state_id_compensated_for, "
+ + "state_id_retried_for";
+ private static final String RECORD_STATE_STARTED_SQL =
+ "INSERT INTO ${TABLE_PREFIX}state_inst (id, machine_inst_id, name, type,"
+ + " gmt_started, service_name, service_method, service_type, is_for_update, input_params, status, "
+ + "business_key, "
+ + "state_id_compensated_for, state_id_retried_for)\n" + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
- /** state instance **/
- private static final String STATE_INSTANCE_FIELDS = "id, machine_inst_id, name, type, business_key, gmt_started, service_name, service_method, service_type, is_for_update, status, input_params, output_params, excep, gmt_end, state_id_compensated_for, state_id_retried_for";
+ private static final String RECORD_STATE_FINISHED_SQL
+ = "UPDATE ${TABLE_PREFIX}state_inst SET gmt_end = ?, excep = ?, status = ?, output_params = ? WHERE id = ? "
+ + "AND machine_inst_id = ?";
- private static final String RECORD_STATE_STARTED_SQL = "INSERT INTO ${TABLE_PREFIX}state_inst (id, machine_inst_id, name, type,"
- + " gmt_started, service_name, service_method, service_type, is_for_update, input_params, status, business_key, "
- + "state_id_compensated_for, state_id_retried_for)\n"
- + "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)";
+ private static final String UPDATE_STATE_EXECUTION_STATUS_SQL
+ = "UPDATE ${TABLE_PREFIX}state_inst SET status = ? WHERE machine_inst_id = ? AND id = ?";
- private static final String RECORD_STATE_FINISHED_SQL = "UPDATE ${TABLE_PREFIX}state_inst SET gmt_end = ?, excep = ?, status = ?, output_params = ? WHERE id = ? AND machine_inst_id = ?";
+ private static final String QUERY_STATE_INSTANCES_BY_MACHINE_INSTANCE_ID_SQL = "SELECT " + STATE_INSTANCE_FIELDS
+ + " FROM ${TABLE_PREFIX}state_inst WHERE machine_inst_id = ? ORDER BY gmt_started, ID ASC";
- private static final String UPDATE_STATE_EXECUTION_STATUS_SQL = "UPDATE ${TABLE_PREFIX}state_inst SET status = ? WHERE machine_inst_id = ? AND id = ?";
-
- private static final String QUERY_STATE_INSTANCES_BY_MACHINE_INSTANCE_ID_SQL = "SELECT " + STATE_INSTANCE_FIELDS + " FROM ${TABLE_PREFIX}state_inst WHERE machine_inst_id = ? ORDER BY gmt_started, ID ASC";
-
- private static final String GET_STATE_INSTANCE_BY_ID_AND_MACHINE_INSTANCE_ID_SQL = "SELECT " + STATE_INSTANCE_FIELDS + " FROM ${TABLE_PREFIX}state_inst WHERE machine_inst_id = ? AND id = ?";
+ private static final String GET_STATE_INSTANCE_BY_ID_AND_MACHINE_INSTANCE_ID_SQL = "SELECT " + STATE_INSTANCE_FIELDS
+ + " FROM ${TABLE_PREFIX}state_inst WHERE machine_inst_id = ? AND id = ?";
private static final String TABLE_PREFIX_REGEX = "\\$\\{TABLE_PREFIX}";
private String tablePrefix;
- /** machine instance **/
+ /**
+ * machine instance
+ **/
private String recordStateMachineStartedSql;
private String recordStateMachineFinishedSql;
@@ -77,8 +103,9 @@ public class StateLogStoreSqls {
private String queryStateMachineInstancesByParentIdSql;
-
- /** state instance **/
+ /**
+ * state instance
+ **/
private String recordStateStartedSql;
private String recordStateFinishedSql;
@@ -94,19 +121,25 @@ public class StateLogStoreSqls {
init();
}
- private void init(){
+ private void init() {
recordStateMachineStartedSql = RECORD_STATE_MACHINE_STARTED_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
recordStateMachineFinishedSql = RECORD_STATE_MACHINE_FINISHED_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
- updateStateMachineRunningStatusSql = UPDATE_STATE_MACHINE_RUNNING_STATUS_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
- getStateMachineInstanceByIdSql = GET_STATE_MACHINE_INSTANCE_BY_ID_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
- getStateMachineInstanceByBusinessKeySql = GET_STATE_MACHINE_INSTANCE_BY_BUSINESS_KEY_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
- queryStateMachineInstancesByParentIdSql = QUERY_STATE_MACHINE_INSTANCES_BY_PARENT_ID_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
+ updateStateMachineRunningStatusSql = UPDATE_STATE_MACHINE_RUNNING_STATUS_SQL.replaceAll(TABLE_PREFIX_REGEX,
+ tablePrefix);
+ getStateMachineInstanceByIdSql = GET_STATE_MACHINE_INSTANCE_BY_ID_SQL.replaceAll(TABLE_PREFIX_REGEX,
+ tablePrefix);
+ getStateMachineInstanceByBusinessKeySql = GET_STATE_MACHINE_INSTANCE_BY_BUSINESS_KEY_SQL.replaceAll(
+ TABLE_PREFIX_REGEX, tablePrefix);
+ queryStateMachineInstancesByParentIdSql = QUERY_STATE_MACHINE_INSTANCES_BY_PARENT_ID_SQL.replaceAll(
+ TABLE_PREFIX_REGEX, tablePrefix);
recordStateStartedSql = RECORD_STATE_STARTED_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
recordStateFinishedSql = RECORD_STATE_FINISHED_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
updateStateExecutionStatusSql = UPDATE_STATE_EXECUTION_STATUS_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
- queryStateInstancesByMachineInstanceIdSql = QUERY_STATE_INSTANCES_BY_MACHINE_INSTANCE_ID_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
- getStateInstanceByIdAndMachineInstanceIdSql = GET_STATE_INSTANCE_BY_ID_AND_MACHINE_INSTANCE_ID_SQL.replaceAll(TABLE_PREFIX_REGEX, tablePrefix);
+ queryStateInstancesByMachineInstanceIdSql = QUERY_STATE_INSTANCES_BY_MACHINE_INSTANCE_ID_SQL.replaceAll(
+ TABLE_PREFIX_REGEX, tablePrefix);
+ getStateInstanceByIdAndMachineInstanceIdSql = GET_STATE_INSTANCE_BY_ID_AND_MACHINE_INSTANCE_ID_SQL.replaceAll(
+ TABLE_PREFIX_REGEX, tablePrefix);
}
public String getRecordStateMachineStartedSql(String dbType) {
diff --git a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/utils/BeanUtils.java b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/utils/BeanUtils.java
index 9b0331776026f1bcf6b8b87e85d115d362c7634e..d54379ac0b7dcc00d0865ad7cb8b430c68871257 100644
--- a/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/utils/BeanUtils.java
+++ b/saga/seata-saga-engine-store/src/main/java/io/seata/saga/engine/store/utils/BeanUtils.java
@@ -15,12 +15,12 @@
*/
package io.seata.saga.engine.store.utils;
+import java.lang.reflect.Field;
+
import io.seata.common.util.ReflectionUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.lang.reflect.Field;
-
/**
* Bean utils
*
@@ -30,15 +30,15 @@ public class BeanUtils {
protected static final Logger LOGGER = LoggerFactory.getLogger(BeanUtils.class);
- public static String beanToString(Object o){
- if(o == null){
+ public static String beanToString(Object o) {
+ if (o == null) {
return null;
}
Field[] fields = o.getClass().getDeclaredFields();
StringBuffer buffer = new StringBuffer();
buffer.append("[");
- for(Field field : fields){
+ for (Field field : fields) {
Object val = null;
try {
val = ReflectionUtil.getFieldValue(o, field.getName());
@@ -47,11 +47,11 @@ public class BeanUtils {
} catch (IllegalAccessException e) {
LOGGER.warn(e.getMessage(), e);
}
- if(val != null){
+ if (val != null) {
buffer.append(field.getName()).append("=").append(val).append(", ");
}
}
- if(buffer.length() > 2){
+ if (buffer.length() > 2) {
buffer.delete(buffer.length() - 2, buffer.length());
}
buffer.append("]");
diff --git a/saga/seata-saga-engine-store/src/main/resources/sql/h2_init.sql b/saga/seata-saga-engine-store/src/main/resources/sql/h2_init.sql
deleted file mode 100644
index d06749870bac3dc99359e1630ef9d1c25ecd1e1d..0000000000000000000000000000000000000000
--- a/saga/seata-saga-engine-store/src/main/resources/sql/h2_init.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-create table if not exists seata_state_machine_def
-(
- id varchar(32) not null comment 'id',
- name varchar(255) not null comment 'name',
- tenant_id varchar(32) not null comment 'tenant id',
- app_name varchar(32) not null comment 'application name',
- type varchar(20) comment 'state language type',
- comment_ varchar(255) comment 'comment',
- ver varchar(16) not null comment 'version',
- gmt_create timestamp not null comment 'create time',
- status varchar(2) not null comment 'status(AC:active|IN:inactive)',
- content clob comment 'content',
- recover_strategy varchar(16) comment 'transaction recover strategy(compensate|retry)',
- primary key(id)
-);
-
-create table if not exists seata_state_machine_inst
-(
- id varchar(32) not null comment 'id',
- machine_id varchar(32) not null comment 'state machine definition id',
- tenant_id varchar(32) not null comment 'tenant id',
- parent_id varchar(46) comment 'parentid',
- gmt_started timestamp not null comment 'start time',
- business_key varchar(48) comment 'business key',
- start_params clob comment 'start parameters',
- gmt_end timestamp comment 'end time',
- excep blob comment 'exception',
- end_params clob comment 'end parameters',
- status varchar(2) comment 'status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
- compensation_status varchar(2) comment 'compensation status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
- is_running tinyint(1) comment 'is running(0 no|1 yes)',
- gmt_updated timestamp not null,
- primary key(id),
- unique key unikey_buz_tenant (business_key, tenant_id)
-);
-
-create table if not exists seata_state_inst
-(
- id varchar(32) not null comment 'id',
- machine_inst_id varchar(32) not null comment 'state machine instance id',
- name varchar(255) not null comment 'state name',
- type varchar(20) comment 'state type',
- service_name varchar(255) comment 'service name',
- service_method varchar(255) comment 'method name',
- service_type varchar(16) comment 'service type',
- business_key varchar(48) comment 'business key',
- state_id_compensated_for varchar(32) comment 'state compensated for',
- state_id_retried_for varchar(32) comment 'state retried for',
- gmt_started timestamp not null comment 'start time',
- is_for_update tinyint(1) comment 'is service for update',
- input_params clob comment 'input parameters',
- output_params clob comment 'output parameters',
- status varchar(2) not null comment 'status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
- excep blob comment 'exception',
- gmt_end timestamp comment 'end time',
- primary key(id, machine_inst_id)
-);
\ No newline at end of file
diff --git a/saga/seata-saga-engine-store/src/main/resources/sql/mysql_init.sql b/saga/seata-saga-engine-store/src/main/resources/sql/mysql_init.sql
deleted file mode 100644
index 63bc0a273944c455b08a119b5d55dfb5faff643f..0000000000000000000000000000000000000000
--- a/saga/seata-saga-engine-store/src/main/resources/sql/mysql_init.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-create table if not exists seata_state_machine_def
-(
- id varchar(32) not null comment 'id',
- name varchar(255) not null comment 'name',
- tenant_id varchar(32) not null comment 'tenant id',
- app_name varchar(32) not null comment 'application name',
- type varchar(20) comment 'state language type',
- comment_ varchar(255) comment 'comment',
- ver varchar(16) not null comment 'version',
- gmt_create datetime(3) not null comment 'create time',
- status varchar(2) not null comment 'status(AC:active|IN:inactive)',
- content longtext comment 'content',
- recover_strategy varchar(16) comment 'transaction recover strategy(compensate|retry)',
- primary key(id)
-) comment 'state machine definition';
-
-create table if not exists seata_state_machine_inst
-(
- id varchar(32) not null comment 'id',
- machine_id varchar(32) not null comment 'state machine definition id',
- tenant_id varchar(32) not null comment 'tenant id',
- parent_id varchar(46) comment 'parentid',
- gmt_started datetime(3) not null comment 'start time',
- business_key varchar(48) comment 'business key',
- start_params longtext comment 'start parameters',
- gmt_end datetime(3) comment 'end time',
- excep longblob comment 'exception',
- end_params longtext comment 'end parameters',
- status varchar(2) comment 'status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
- compensation_status varchar(2) comment 'compensation status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
- is_running tinyint(1) comment 'is running(0 no|1 yes)',
- gmt_updated datetime(3) not null,
- primary key(id),
- unique key unikey_buz_tenant (business_key, tenant_id)
-) comment 'state machine instance';
-
-create table if not exists seata_state_inst
-(
- id varchar(32) not null comment 'id',
- machine_inst_id varchar(32) not null comment 'state machine instance id',
- name varchar(255) not null comment 'state name',
- type varchar(20) comment 'state type',
- service_name varchar(255) comment 'service name',
- service_method varchar(255) comment 'method name',
- service_type varchar(16) comment 'service type',
- business_key varchar(48) comment 'business key',
- state_id_compensated_for varchar(32) comment 'state compensated for',
- state_id_retried_for varchar(32) comment 'state retried for',
- gmt_started datetime(3) not null comment 'start time',
- is_for_update tinyint(1) comment 'is service for update',
- input_params longtext comment 'input parameters',
- output_params longtext comment 'output parameters',
- status varchar(2) not null comment 'status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
- excep longblob comment 'exception',
- gmt_end datetime(3) comment 'end time',
- primary key(id, machine_inst_id)
-) comment 'state instance';
\ No newline at end of file
diff --git a/saga/seata-saga-engine-store/src/main/resources/sql/oracle_init.sql b/saga/seata-saga-engine-store/src/main/resources/sql/oracle_init.sql
deleted file mode 100644
index 8e691a21b5090a6efbbc86fc18f1e5d997a3d89b..0000000000000000000000000000000000000000
--- a/saga/seata-saga-engine-store/src/main/resources/sql/oracle_init.sql
+++ /dev/null
@@ -1,63 +0,0 @@
-create table seata_state_machine_def
-(
- id varchar(32) not null,
- name varchar(255) not null,
- tenant_id varchar(32) not null,
- app_name varchar(32) not null,
- type varchar(20),
- comment_ varchar(255),
- ver varchar(16) not null,
- gmt_create timestamp not null,
- status varchar(2) not null,
- content clob,
- recover_strategy varchar(16),
- primary key(id)
-);
-
-create table seata_state_machine_inst
-(
- id varchar(32) not null,
- machine_id varchar(32) not null,
- tenant_id varchar(32) not null,
- parent_id varchar(46),
- gmt_started timestamp not null,
- business_key varchar(48),
- uni_business_key varchar(48) generated always as(
- CASE
- WHEN "BUSINESS_KEY" IS NULL
- THEN "ID"
- ELSE "BUSINESS_KEY"
- END),
- start_params clob,
- gmt_end timestamp,
- excep blob,
- end_params clob,
- status varchar(2),
- compensation_status varchar(2),
- is_running smallint,
- gmt_updated timestamp not null,
- primary key(id)
-);
-create unique index state_machine_inst_unibuzkey on seata_state_machine_inst(uni_business_key, tenant_id);
-
-create table seata_state_inst
-(
- id varchar(32) not null,
- machine_inst_id varchar(32) not null,
- name varchar(255) not null,
- type varchar(20),
- service_name varchar(255),
- service_method varchar(255),
- service_type varchar(16),
- business_key varchar(48),
- state_id_compensated_for varchar(32),
- state_id_retried_for varchar(32),
- gmt_started timestamp not null,
- is_for_update smallint,
- input_params clob,
- output_params clob,
- status varchar(2) not null,
- excep blob,
- gmt_end timestamp,
- primary key(id, machine_inst_id)
-);
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/AsyncCallback.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/AsyncCallback.java
index 00d0c8ffddaa7388193e5bf21011305026aae9f2..e450e87a3c792a180a692cdb1c5616fcf1fbb9b6 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/AsyncCallback.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/AsyncCallback.java
@@ -20,12 +20,14 @@ import io.seata.saga.statelang.domain.StateMachineInstance;
/**
* Async Callback
+ *
* @author lorne.cl
*/
public interface AsyncCallback {
/**
* on finished
+ *
* @param context
* @param stateMachineInstance
*/
@@ -33,6 +35,7 @@ public interface AsyncCallback {
/**
* on error
+ *
* @param context
* @param stateMachineInstance
* @param exp
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/StateMachineConfig.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/StateMachineConfig.java
index fa3d064b45ef0667bf902c189eda0343caa3f293..721e3a58b16444d09d52ce6ed7fd389dfd248c29 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/StateMachineConfig.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/StateMachineConfig.java
@@ -15,15 +15,18 @@
*/
package io.seata.saga.engine;
+import java.util.concurrent.ThreadPoolExecutor;
+
import io.seata.saga.engine.evaluation.EvaluatorFactoryManager;
import io.seata.saga.engine.expression.ExpressionFactoryManager;
import io.seata.saga.engine.invoker.ServiceInvokerManager;
-import io.seata.saga.engine.store.StateLangStore;
-import io.seata.saga.proctrl.eventing.impl.ProcessCtrlEventPublisher;
-import io.seata.saga.engine.store.StateLogStore;
+import io.seata.saga.engine.repo.StateLogRepository;
import io.seata.saga.engine.repo.StateMachineRepository;
import io.seata.saga.engine.sequence.SeqGenerator;
-import java.util.concurrent.ThreadPoolExecutor;
+import io.seata.saga.engine.store.StateLangStore;
+import io.seata.saga.engine.store.StateLogStore;
+import io.seata.saga.engine.strategy.StatusDecisionStrategy;
+import io.seata.saga.proctrl.eventing.impl.ProcessCtrlEventPublisher;
import org.springframework.context.ApplicationContext;
/**
@@ -33,6 +36,13 @@ import org.springframework.context.ApplicationContext;
*/
public interface StateMachineConfig {
+ /**
+ * Gets state log store.
+ *
+ * @return the StateLogRepository
+ */
+ StateLogRepository getStateLogRepository();
+
/**
* Gets get state log store.
*
@@ -133,6 +143,7 @@ public interface StateMachineConfig {
/**
* get ServiceInvokerManager
+ *
* @return
*/
ServiceInvokerManager getServiceInvokerManager();
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/StateMachineEngine.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/StateMachineEngine.java
index fb642cf783033ffc2639409e26626308d5abbdd2..02fcc7ffb144675d0491dbf73c428ec51978eb61 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/StateMachineEngine.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/StateMachineEngine.java
@@ -15,10 +15,11 @@
*/
package io.seata.saga.engine;
+import java.util.Map;
+
import io.seata.saga.engine.exception.EngineExecutionException;
import io.seata.saga.engine.exception.ForwardInvalidException;
import io.seata.saga.statelang.domain.StateMachineInstance;
-import java.util.Map;
/**
* State machine engine
@@ -29,16 +30,19 @@ public interface StateMachineEngine {
/**
* start a state machine instance
+ *
* @param stateMachineName
* @param tenantId
* @param startParams
* @return
* @throws EngineExecutionException
*/
- StateMachineInstance start(String stateMachineName, String tenantId, Map<String, Object> startParams) throws EngineExecutionException;
+ StateMachineInstance start(String stateMachineName, String tenantId, Map<String, Object> startParams)
+ throws EngineExecutionException;
/**
* start a state machine instance with businessKey
+ *
* @param stateMachineName
* @param tenantId
* @param businessKey
@@ -46,10 +50,12 @@ public interface StateMachineEngine {
* @return
* @throws EngineExecutionException
*/
- StateMachineInstance startWithBusinessKey(String stateMachineName, String tenantId, String businessKey, Map<String, Object> startParams) throws EngineExecutionException;
+ StateMachineInstance startWithBusinessKey(String stateMachineName, String tenantId, String businessKey,
+ Map<String, Object> startParams) throws EngineExecutionException;
/**
* start a state machine instance asynchronously
+ *
* @param stateMachineName
* @param tenantId
* @param startParams
@@ -57,10 +63,12 @@ public interface StateMachineEngine {
* @return
* @throws EngineExecutionException
*/
- StateMachineInstance startAsync(String stateMachineName, String tenantId, Map<String, Object> startParams, AsyncCallback callback) throws EngineExecutionException;
+ StateMachineInstance startAsync(String stateMachineName, String tenantId, Map<String, Object> startParams,
+ AsyncCallback callback) throws EngineExecutionException;
/**
* start a state machine instance asynchronously with businessKey
+ *
* @param stateMachineName
* @param tenantId
* @param businessKey
@@ -69,48 +77,59 @@ public interface StateMachineEngine {
* @return
* @throws EngineExecutionException
*/
- StateMachineInstance startWithBusinessKeyAsync(String stateMachineName, String tenantId, String businessKey, Map<String, Object> startParams, AsyncCallback callback) throws EngineExecutionException;
+ StateMachineInstance startWithBusinessKeyAsync(String stateMachineName, String tenantId, String businessKey,
+ Map<String, Object> startParams, AsyncCallback callback)
+ throws EngineExecutionException;
/**
* forward restart a failed state machine instance
+ *
* @param stateMachineInstId
* @param replaceParams
* @return
* @throws ForwardInvalidException
*/
- StateMachineInstance forward(String stateMachineInstId, Map<String, Object> replaceParams) throws ForwardInvalidException;
+ StateMachineInstance forward(String stateMachineInstId, Map<String, Object> replaceParams)
+ throws ForwardInvalidException;
/**
* forward restart a failed state machine instance asynchronously
+ *
* @param stateMachineInstId
* @param replaceParams
* @param callback
* @return
* @throws ForwardInvalidException
*/
- StateMachineInstance forwardAsync(String stateMachineInstId, Map<String, Object> replaceParams, AsyncCallback callback) throws ForwardInvalidException;
+ StateMachineInstance forwardAsync(String stateMachineInstId, Map<String, Object> replaceParams,
+ AsyncCallback callback) throws ForwardInvalidException;
/**
* compensate a state machine instance
+ *
* @param stateMachineInstId
* @param replaceParams
* @return
* @throws EngineExecutionException
*/
- StateMachineInstance compensate(String stateMachineInstId, Map<String, Object> replaceParams) throws EngineExecutionException;
+ StateMachineInstance compensate(String stateMachineInstId, Map<String, Object> replaceParams)
+ throws EngineExecutionException;
/**
* compensate a state machine instance asynchronously
+ *
* @param stateMachineInstId
* @param replaceParams
* @param callback
* @return
* @throws EngineExecutionException
*/
- StateMachineInstance compensateAsync(String stateMachineInstId, Map<String, Object> replaceParams, AsyncCallback callback) throws EngineExecutionException;
+ StateMachineInstance compensateAsync(String stateMachineInstId, Map<String, Object> replaceParams,
+ AsyncCallback callback) throws EngineExecutionException;
/**
* skip current failed state instance and forward restart state machine instance
+ *
* @param stateMachineInstId
* @return
* @throws EngineExecutionException
@@ -119,15 +138,18 @@ public interface StateMachineEngine {
/**
* skip current failed state instance and forward restart state machine instance asynchronously
+ *
* @param stateMachineInstId
* @param callback
* @return
* @throws EngineExecutionException
*/
- StateMachineInstance skipAndForwardAsync(String stateMachineInstId, AsyncCallback callback) throws EngineExecutionException;
+ StateMachineInstance skipAndForwardAsync(String stateMachineInstId, AsyncCallback callback)
+ throws EngineExecutionException;
/**
* get state machine configurations
+ *
* @return
*/
StateMachineConfig getStateMachineConfig();
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/EvaluatorFactory.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/EvaluatorFactory.java
index b1e6ebcfc45c0cf58f3c5795d461b5c559e3da8d..df4e6475378298b1ea7d7727e39e87f76cdd5038 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/EvaluatorFactory.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/EvaluatorFactory.java
@@ -18,9 +18,8 @@ package io.seata.saga.engine.evaluation;
/**
* Evaluator Factory
*
- * @see Evaluator
- *
* @author lorne.cl
+ * @see Evaluator
*/
public interface EvaluatorFactory {
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/EvaluatorFactoryManager.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/EvaluatorFactoryManager.java
index ab9b9a36dbea44aaaaac4c472a4a7352b5f8db1a..3e2e6ae5a1295a86b4661ab4f5b6d2577e0f497c 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/EvaluatorFactoryManager.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/EvaluatorFactoryManager.java
@@ -15,16 +15,17 @@
*/
package io.seata.saga.engine.evaluation;
-import io.seata.common.util.StringUtils;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import io.seata.common.util.StringUtils;
+
/**
* Evaluator Factory Manager
*
+ * @author lorne.cl
* @see EvaluatorFactory
* @see Evaluator
- * @author lorne.cl
*/
public class EvaluatorFactoryManager {
@@ -32,9 +33,9 @@ public class EvaluatorFactoryManager {
private Map<String, EvaluatorFactory> evaluatorFactoryMap = new ConcurrentHashMap<>();
- public EvaluatorFactory getEvaluatorFactory(String type){
+ public EvaluatorFactory getEvaluatorFactory(String type) {
- if(StringUtils.isBlank(type)){
+ if (StringUtils.isBlank(type)) {
type = EVALUATOR_TYPE_DEFAULT;
}
return this.evaluatorFactoryMap.get(type);
@@ -48,7 +49,7 @@ public class EvaluatorFactoryManager {
this.evaluatorFactoryMap.putAll(evaluatorFactoryMap);
}
- public void putEvaluatorFactory(String type, EvaluatorFactory factory){
+ public void putEvaluatorFactory(String type, EvaluatorFactory factory) {
this.evaluatorFactoryMap.put(type, factory);
}
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/exception/ExceptionMatchEvaluator.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/exception/ExceptionMatchEvaluator.java
index c954010ec53ddca667fc8a4357bf41108103a07c..15c9e1c7fca9e189bb5d8e5383c6358eebc925e7 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/exception/ExceptionMatchEvaluator.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/exception/ExceptionMatchEvaluator.java
@@ -15,11 +15,12 @@
*/
package io.seata.saga.engine.evaluation.exception;
+import java.util.Map;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.saga.engine.evaluation.Evaluator;
import io.seata.saga.engine.exception.EngineExecutionException;
import io.seata.saga.statelang.domain.DomainConstants;
-import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
@@ -43,21 +44,20 @@ public class ExceptionMatchEvaluator implements Evaluator {
public boolean evaluate(Map<String, Object> variables) {
Object eObj = variables.get(getRootObjectName());
- if(eObj!=null && (eObj instanceof Exception)
- && StringUtils.hasText(exceptionString)){
+ if (eObj != null && (eObj instanceof Exception) && StringUtils.hasText(exceptionString)) {
Exception e = (Exception)eObj;
String exceptionClassName = e.getClass().getName();
- if(exceptionClassName.equals(exceptionString)){
+ if (exceptionClassName.equals(exceptionString)) {
return true;
}
try {
- if(exceptionClass.isAssignableFrom(e.getClass())){
+ if (exceptionClass.isAssignableFrom(e.getClass())) {
return true;
}
} catch (Exception e1) {
- LOGGER.error("Exception Match failed. expression[ "+ exceptionString +"]",e1);
+ LOGGER.error("Exception Match failed. expression[{}]", exceptionString, e1);
}
}
@@ -73,18 +73,16 @@ public class ExceptionMatchEvaluator implements Evaluator {
this.exceptionString = exceptionString;
try {
this.exceptionClass = (Class<Exception>)Class.forName(exceptionString);
- }
- catch (ClassNotFoundException e) {
- throw new EngineExecutionException(e, exceptionString + " is not a Exception Class", FrameworkErrorCode.NotExceptionClass);
+ } catch (ClassNotFoundException e) {
+ throw new EngineExecutionException(e, exceptionString + " is not a Exception Class",
+ FrameworkErrorCode.NotExceptionClass);
}
}
-
public Class<Exception> getExceptionClass() {
return exceptionClass;
}
-
public void setExceptionClass(Class<Exception> exceptionClass) {
this.exceptionClass = exceptionClass;
this.exceptionString = exceptionClass.getName();
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/expression/ExpressionEvaluator.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/expression/ExpressionEvaluator.java
index 9c1027f44c7484fd5e9318945dc30bdd9d3e38dc..b35792beb533f6e2174f6c292c5609d49bfa314a 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/expression/ExpressionEvaluator.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/evaluation/expression/ExpressionEvaluator.java
@@ -15,12 +15,13 @@
*/
package io.seata.saga.engine.evaluation.expression;
+import java.util.Map;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.saga.engine.evaluation.Evaluator;
import io.seata.saga.engine.exception.EngineExecutionException;
import io.seata.saga.engine.expression.Expression;
import io.seata.saga.statelang.domain.DomainConstants;
-import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
@@ -34,23 +35,20 @@ public class ExpressionEvaluator implements Evaluator {
private static final Logger LOGGER = LoggerFactory.getLogger(ExpressionEvaluator.class);
- private Expression expression;
- private String rootObjectName = DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT;//如果为空则用variables作为root变量，否则取rootObjectName为作root变量
+ private Expression expression;
+
+ /**
+ * If it is empty, use variables as the root variable, otherwise take rootObjectName as the root.
+ */
+ private String rootObjectName = DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT;
@Override
public boolean evaluate(Map<String, Object> variables) {
Object rootObject;
- if(StringUtils.hasText(this.rootObjectName)){
+ if (StringUtils.hasText(this.rootObjectName)) {
rootObject = variables.get(this.rootObjectName);
- if(rootObject == null){
- if(LOGGER.isWarnEnabled()){
- LOGGER.warn("Variable ["+rootObjectName+"] is not exits. Cannot execute expression "+expression.getExpressionString()+" , return false instead.");
- }
- return false;
- }
- }
- else{
+ } else {
rootObject = variables;
}
@@ -60,8 +58,8 @@ public class ExpressionEvaluator implements Evaluator {
} catch (Exception e) {
result = Boolean.FALSE;
if (LOGGER.isWarnEnabled()) {
- LOGGER.warn("Expression [" + expression.getExpressionString()
- + "] execute failed, and it will return false by default. variables:" + variables, e);
+ LOGGER.warn("Expression [{}] execute failed, and it will return false by default. variables:{}",
+ expression.getExpressionString(), variables, e);
}
}
@@ -69,10 +67,11 @@ public class ExpressionEvaluator implements Evaluator {
throw new EngineExecutionException("Evaluation returns null", FrameworkErrorCode.EvaluationReturnsNull);
}
if (!(result instanceof Boolean)) {
- throw new EngineExecutionException("Evaluation returns non-Boolean: " + result + " (" + result.getClass().getName() + ")",
+ throw new EngineExecutionException(
+ "Evaluation returns non-Boolean: " + result + " (" + result.getClass().getName() + ")",
FrameworkErrorCode.EvaluationReturnsNonBoolean);
}
- return (Boolean) result;
+ return (Boolean)result;
}
public Expression getExpression() {
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/Expression.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/Expression.java
index edc318864eb0bef49bb135fcc597a85c15752f2f..51943283101daff9c3cef519030230f2d798921b 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/Expression.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/Expression.java
@@ -15,7 +15,6 @@
*/
package io.seata.saga.engine.expression;
-
/**
* Expression
*
@@ -34,7 +33,7 @@ public interface Expression {
/**
* Sets set value.
*
- * @param value the value
+ * @param value the value
* @param elContext the el context
*/
void setValue(Object value, Object elContext);
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/ExpressionFactory.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/ExpressionFactory.java
index 462afab5a7d82010ff1fb63bbe46ebe92eaa3c59..8fe16d4cac0cb37738a955e68047dc3b0fabb1e4 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/ExpressionFactory.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/ExpressionFactory.java
@@ -17,12 +17,14 @@ package io.seata.saga.engine.expression;
/**
* Expression Factory
+ *
* @author lorne.cl
*/
public interface ExpressionFactory {
/**
* create expression
+ *
* @param expression
* @return
*/
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/ExpressionFactoryManager.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/ExpressionFactoryManager.java
index 896e428a1b755cdb0c85aef4d6156f22dedccd36..05c980a79fa1b085f85b6623f26f8b52536731ed 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/ExpressionFactoryManager.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/ExpressionFactoryManager.java
@@ -15,10 +15,11 @@
*/
package io.seata.saga.engine.expression;
-import io.seata.common.util.StringUtils;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import io.seata.common.util.StringUtils;
+
/**
* Expression factory manager
*
@@ -30,8 +31,8 @@ public class ExpressionFactoryManager {
private Map<String, ExpressionFactory> expressionFactoryMap = new ConcurrentHashMap<>();
- public ExpressionFactory getExpressionFactory(String expressionType){
- if(StringUtils.isBlank(expressionType)){
+ public ExpressionFactory getExpressionFactory(String expressionType) {
+ if (StringUtils.isBlank(expressionType)) {
expressionType = DEFAULT_EXPRESSION_TYPE;
}
return expressionFactoryMap.get(expressionType);
@@ -42,7 +43,7 @@ public class ExpressionFactoryManager {
this.expressionFactoryMap.putAll(expressionFactoryMap);
}
- public void putExpressionFactory(String type, ExpressionFactory factory){
+ public void putExpressionFactory(String type, ExpressionFactory factory) {
this.expressionFactoryMap.put(type, factory);
}
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/seq/SequenceExpression.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/seq/SequenceExpression.java
index 54b23bbe1abf150e295977e91051bf5624945e95..097087725d44f53a6d82d9b7f3170b8f89f98a78 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/seq/SequenceExpression.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/seq/SequenceExpression.java
@@ -20,13 +20,14 @@ import io.seata.saga.engine.sequence.SeqGenerator;
/**
* Generate sequence expression
+ *
* @author lorne.cl
*/
public class SequenceExpression implements Expression {
private SeqGenerator seqGenerator;
- private String entity;
- private String rule;
+ private String entity;
+ private String rule;
@Override
public Object getValue(Object elContext) {
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/seq/SequenceExpressionFactory.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/seq/SequenceExpressionFactory.java
index 348ef1114ae38bbd5c06f7009e1251e15f947b59..cbd2374fcd48d2afdde2c611b002fc664f38bb07 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/seq/SequenceExpressionFactory.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/seq/SequenceExpressionFactory.java
@@ -34,9 +34,9 @@ public class SequenceExpressionFactory implements ExpressionFactory {
SequenceExpression sequenceExpression = new SequenceExpression();
sequenceExpression.setSeqGenerator(this.seqGenerator);
- if(StringUtils.hasLength(expressionString)){
+ if (StringUtils.hasLength(expressionString)) {
String[] strings = expressionString.split("\\|");
- if(strings.length >= 2){
+ if (strings.length >= 2) {
sequenceExpression.setEntity(strings[0]);
sequenceExpression.setRule(strings[1]);
}
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/spel/SpringELExpressionFactory.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/spel/SpringELExpressionFactory.java
index afad66703c66cbbd2f64017e50f9e2f64e9db5c5..69b0ab463b4ad19fdd00498be665b791f06e23db 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/spel/SpringELExpressionFactory.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/expression/spel/SpringELExpressionFactory.java
@@ -30,6 +30,7 @@ import org.springframework.expression.spel.support.StandardEvaluationContext;
/**
* SpringELExpression factory
+ *
* @author lorne.cl
*/
public class SpringELExpressionFactory implements ExpressionFactory, ApplicationContextAware {
@@ -40,8 +41,8 @@ public class SpringELExpressionFactory implements ExpressionFactory, Application
@Override
public Expression createExpression(String expression) {
org.springframework.expression.Expression defaultExpression = parser.parseExpression(expression);
- EvaluationContext evaluationContext = ((SpelExpression) defaultExpression).getEvaluationContext();
- ((StandardEvaluationContext) evaluationContext).setBeanResolver(new AppContextBeanResolver());
+ EvaluationContext evaluationContext = ((SpelExpression)defaultExpression).getEvaluationContext();
+ ((StandardEvaluationContext)evaluationContext).setBeanResolver(new AppContextBeanResolver());
return new SpringELExpression(defaultExpression);
}
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/impl/DefaultStateMachineConfig.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/impl/DefaultStateMachineConfig.java
index 83a03a27f49569598bf26ac73031b7b6521f56aa..c49c0582444ec30767ff25f580204d6d4c444fb9 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/impl/DefaultStateMachineConfig.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/impl/DefaultStateMachineConfig.java
@@ -15,6 +15,11 @@
*/
package io.seata.saga.engine.impl;
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ThreadPoolExecutor;
+
import io.seata.saga.engine.StateMachineConfig;
import io.seata.saga.engine.evaluation.EvaluatorFactoryManager;
import io.seata.saga.engine.evaluation.exception.ExceptionMatchEvaluatorFactory;
@@ -23,10 +28,19 @@ import io.seata.saga.engine.expression.ExpressionFactoryManager;
import io.seata.saga.engine.expression.seq.SequenceExpressionFactory;
import io.seata.saga.engine.expression.spel.SpringELExpressionFactory;
import io.seata.saga.engine.invoker.ServiceInvokerManager;
+import io.seata.saga.engine.invoker.impl.SpringBeanServiceInvoker;
import io.seata.saga.engine.pcext.StateMachineProcessHandler;
import io.seata.saga.engine.pcext.StateMachineProcessRouter;
+import io.seata.saga.engine.repo.StateLogRepository;
+import io.seata.saga.engine.repo.StateMachineRepository;
+import io.seata.saga.engine.repo.impl.StateLogRepositoryImpl;
+import io.seata.saga.engine.repo.impl.StateMachineRepositoryImpl;
+import io.seata.saga.engine.sequence.SeqGenerator;
+import io.seata.saga.engine.sequence.SpringJvmUUIDSeqGenerator;
import io.seata.saga.engine.store.StateLangStore;
-import io.seata.saga.engine.StatusDecisionStrategy;
+import io.seata.saga.engine.store.StateLogStore;
+import io.seata.saga.engine.strategy.StatusDecisionStrategy;
+import io.seata.saga.engine.strategy.impl.DefaultStatusDecisionStrategy;
import io.seata.saga.proctrl.ProcessRouter;
import io.seata.saga.proctrl.ProcessType;
import io.seata.saga.proctrl.eventing.impl.AsyncEventBus;
@@ -38,16 +52,6 @@ import io.seata.saga.proctrl.handler.ProcessHandler;
import io.seata.saga.proctrl.handler.RouterHandler;
import io.seata.saga.proctrl.impl.ProcessControllerImpl;
import io.seata.saga.proctrl.process.impl.CustomizeBusinessProcessor;
-import io.seata.saga.engine.store.StateLogStore;
-import io.seata.saga.engine.repo.StateMachineRepository;
-import io.seata.saga.engine.repo.impl.StateMachineRepositoryImpl;
-import io.seata.saga.engine.sequence.SeqGenerator;
-import io.seata.saga.engine.sequence.SpringJvmUUIDSeqGenerator;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.ThreadPoolExecutor;
-
import io.seata.saga.statelang.domain.DomainConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -58,36 +62,35 @@ import org.springframework.core.io.Resource;
/**
* Default state machine configuration
+ *
* @author lorne.cl
*/
public class DefaultStateMachineConfig implements StateMachineConfig, ApplicationContextAware, InitializingBean {
- private static final Logger LOGGER = LoggerFactory.getLogger(DefaultStateMachineConfig.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(DefaultStateMachineConfig.class);
+
+ private StateLogRepository stateLogRepository;
+ private StateLogStore stateLogStore;
+ private StateLangStore stateLangStore;
+ private ExpressionFactoryManager expressionFactoryManager;
+ private EvaluatorFactoryManager evaluatorFactoryManager;
+ private StateMachineRepository stateMachineRepository;
+ private StatusDecisionStrategy statusDecisionStrategy;
+ private SeqGenerator seqGenerator;
- private StateLogStore stateLogStore;
- private StateLangStore stateLangStore;
- private ExpressionFactoryManager expressionFactoryManager;
- private EvaluatorFactoryManager evaluatorFactoryManager;
- private StateMachineRepository stateMachineRepository;
- private StatusDecisionStrategy statusDecisionStrategy;
- private SeqGenerator seqGenerator;
private ProcessCtrlEventPublisher syncProcessCtrlEventPublisher;
private ProcessCtrlEventPublisher asyncProcessCtrlEventPublisher;
- private ApplicationContext applicationContext;
- private ThreadPoolExecutor threadPoolExecutor;
- private boolean enableAsync;
- private ServiceInvokerManager serviceInvokerManager;
+ private ApplicationContext applicationContext;
+ private ThreadPoolExecutor threadPoolExecutor;
+ private boolean enableAsync;
+ private ServiceInvokerManager serviceInvokerManager;
- private Resource[] resources = new Resource[0];
- private String charset = "UTF-8";
- private String defaultTenantId = "000001";
+ private Resource[] resources = new Resource[0];
+ private String charset = "UTF-8";
+ private String defaultTenantId = "000001";
protected void init() throws Exception {
- if (seqGenerator == null) {
- seqGenerator = new SpringJvmUUIDSeqGenerator();
- }
-
if (expressionFactoryManager == null) {
expressionFactoryManager = new ExpressionFactoryManager();
@@ -98,7 +101,8 @@ public class DefaultStateMachineConfig implements StateMachineConfig, Applicatio
SequenceExpressionFactory sequenceExpressionFactory = new SequenceExpressionFactory();
sequenceExpressionFactory.setSeqGenerator(getSeqGenerator());
- expressionFactoryManager.putExpressionFactory(DomainConstants.EXPRESSION_TYPE_SEQUENCE, sequenceExpressionFactory);
+ expressionFactoryManager.putExpressionFactory(DomainConstants.EXPRESSION_TYPE_SEQUENCE,
+ sequenceExpressionFactory);
}
if (evaluatorFactoryManager == null) {
@@ -107,9 +111,11 @@ public class DefaultStateMachineConfig implements StateMachineConfig, Applicatio
ExpressionEvaluatorFactory expressionEvaluatorFactory = new ExpressionEvaluatorFactory();
expressionEvaluatorFactory.setExpressionFactory(
expressionFactoryManager.getExpressionFactory(ExpressionFactoryManager.DEFAULT_EXPRESSION_TYPE));
- evaluatorFactoryManager.putEvaluatorFactory(EvaluatorFactoryManager.EVALUATOR_TYPE_DEFAULT, expressionEvaluatorFactory);
+ evaluatorFactoryManager.putEvaluatorFactory(EvaluatorFactoryManager.EVALUATOR_TYPE_DEFAULT,
+ expressionEvaluatorFactory);
- evaluatorFactoryManager.putEvaluatorFactory(DomainConstants.EVALUATOR_TYPE_EXCEPTION, new ExceptionMatchEvaluatorFactory());
+ evaluatorFactoryManager.putEvaluatorFactory(DomainConstants.EVALUATOR_TYPE_EXCEPTION,
+ new ExceptionMatchEvaluatorFactory());
}
if (stateMachineRepository == null) {
@@ -128,6 +134,12 @@ public class DefaultStateMachineConfig implements StateMachineConfig, Applicatio
this.stateMachineRepository = stateMachineRepository;
}
+ if (stateLogRepository == null) {
+ StateLogRepositoryImpl stateLogRepositoryImpl = new StateLogRepositoryImpl();
+ stateLogRepositoryImpl.setStateLogStore(stateLogStore);
+ this.stateLogRepository = stateLogRepositoryImpl;
+ }
+
if (statusDecisionStrategy == null) {
statusDecisionStrategy = new DefaultStatusDecisionStrategy();
}
@@ -165,8 +177,14 @@ public class DefaultStateMachineConfig implements StateMachineConfig, Applicatio
asyncProcessCtrlEventPublisher = asyncEventPublisher;
}
- if(this.serviceInvokerManager == null){
+ if (this.serviceInvokerManager == null) {
this.serviceInvokerManager = new ServiceInvokerManager();
+
+ SpringBeanServiceInvoker springBeanServiceInvoker = new SpringBeanServiceInvoker();
+ springBeanServiceInvoker.setApplicationContext(getApplicationContext());
+ springBeanServiceInvoker.setThreadPoolExecutor(threadPoolExecutor);
+ this.serviceInvokerManager.putServiceInvoker(DomainConstants.SERVICE_TYPE_SPRING_BEAN,
+ springBeanServiceInvoker);
}
}
@@ -211,41 +229,80 @@ public class DefaultStateMachineConfig implements StateMachineConfig, Applicatio
return this.stateLogStore;
}
+ public void setStateLogStore(StateLogStore stateLogStore) {
+ this.stateLogStore = stateLogStore;
+ }
+
@Override
public StateLangStore getStateLangStore() {
return stateLangStore;
}
+ public void setStateLangStore(StateLangStore stateLangStore) {
+ this.stateLangStore = stateLangStore;
+ }
+
@Override
public ExpressionFactoryManager getExpressionFactoryManager() {
return this.expressionFactoryManager;
}
+ public void setExpressionFactoryManager(ExpressionFactoryManager expressionFactoryManager) {
+ this.expressionFactoryManager = expressionFactoryManager;
+ }
+
@Override
public EvaluatorFactoryManager getEvaluatorFactoryManager() {
return this.evaluatorFactoryManager;
}
+ public void setEvaluatorFactoryManager(EvaluatorFactoryManager evaluatorFactoryManager) {
+ this.evaluatorFactoryManager = evaluatorFactoryManager;
+ }
+
@Override
public String getCharset() {
return this.charset;
}
+ public void setCharset(String charset) {
+ this.charset = charset;
+ }
+
@Override
public StateMachineRepository getStateMachineRepository() {
return stateMachineRepository;
}
+ public void setStateMachineRepository(StateMachineRepository stateMachineRepository) {
+ this.stateMachineRepository = stateMachineRepository;
+ }
+
@Override
public StatusDecisionStrategy getStatusDecisionStrategy() {
return statusDecisionStrategy;
}
+ public void setStatusDecisionStrategy(StatusDecisionStrategy statusDecisionStrategy) {
+ this.statusDecisionStrategy = statusDecisionStrategy;
+ }
+
@Override
public SeqGenerator getSeqGenerator() {
+ if (seqGenerator == null) {
+ synchronized (this) {
+ if (seqGenerator == null) {
+ seqGenerator = new SpringJvmUUIDSeqGenerator();
+ }
+ }
+ }
return seqGenerator;
}
+ public void setSeqGenerator(SeqGenerator seqGenerator) {
+ this.seqGenerator = seqGenerator;
+ }
+
@Override
public ProcessCtrlEventPublisher getProcessCtrlEventPublisher() {
return syncProcessCtrlEventPublisher;
@@ -256,6 +313,10 @@ public class DefaultStateMachineConfig implements StateMachineConfig, Applicatio
return asyncProcessCtrlEventPublisher;
}
+ public void setAsyncProcessCtrlEventPublisher(ProcessCtrlEventPublisher asyncProcessCtrlEventPublisher) {
+ this.asyncProcessCtrlEventPublisher = asyncProcessCtrlEventPublisher;
+ }
+
@Override
public ApplicationContext getApplicationContext() {
return applicationContext;
@@ -271,65 +332,36 @@ public class DefaultStateMachineConfig implements StateMachineConfig, Applicatio
return threadPoolExecutor;
}
+ public void setThreadPoolExecutor(ThreadPoolExecutor threadPoolExecutor) {
+ this.threadPoolExecutor = threadPoolExecutor;
+ }
+
@Override
public boolean isEnableAsync() {
return enableAsync;
}
- public void setStateLogStore(StateLogStore stateLogStore) {
- this.stateLogStore = stateLogStore;
- }
-
- public void setStateLangStore(StateLangStore stateLangStore) {
- this.stateLangStore = stateLangStore;
- }
-
- public void setExpressionFactoryManager(ExpressionFactoryManager expressionFactoryManager) {
- this.expressionFactoryManager = expressionFactoryManager;
- }
-
- public void setEvaluatorFactoryManager(EvaluatorFactoryManager evaluatorFactoryManager) {
- this.evaluatorFactoryManager = evaluatorFactoryManager;
- }
-
- public void setStateMachineRepository(StateMachineRepository stateMachineRepository) {
- this.stateMachineRepository = stateMachineRepository;
+ public void setEnableAsync(boolean enableAsync) {
+ this.enableAsync = enableAsync;
}
- public void setStatusDecisionStrategy(StatusDecisionStrategy statusDecisionStrategy) {
- this.statusDecisionStrategy = statusDecisionStrategy;
+ @Override
+ public StateLogRepository getStateLogRepository() {
+ return stateLogRepository;
}
- public void setSeqGenerator(SeqGenerator seqGenerator) {
- this.seqGenerator = seqGenerator;
+ public void setStateLogRepository(StateLogRepository stateLogRepository) {
+ this.stateLogRepository = stateLogRepository;
}
- public void setSyncProcessCtrlEventPublisher(
- ProcessCtrlEventPublisher syncProcessCtrlEventPublisher) {
+ public void setSyncProcessCtrlEventPublisher(ProcessCtrlEventPublisher syncProcessCtrlEventPublisher) {
this.syncProcessCtrlEventPublisher = syncProcessCtrlEventPublisher;
}
- public void setAsyncProcessCtrlEventPublisher(
- ProcessCtrlEventPublisher asyncProcessCtrlEventPublisher) {
- this.asyncProcessCtrlEventPublisher = asyncProcessCtrlEventPublisher;
- }
-
- public void setThreadPoolExecutor(ThreadPoolExecutor threadPoolExecutor) {
- this.threadPoolExecutor = threadPoolExecutor;
- }
-
- public void setEnableAsync(boolean enableAsync) {
- this.enableAsync = enableAsync;
- }
-
public void setResources(Resource[] resources) {
this.resources = resources;
}
- public void setCharset(String charset) {
- this.charset = charset;
- }
-
@Override
public ServiceInvokerManager getServiceInvokerManager() {
return serviceInvokerManager;
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java
index f41ce1b5d273b1d767fba374a1c1c4b6a0506541..1814987d7437c89a74a57aee5f50423e57fd3c60 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java
@@ -15,6 +15,11 @@
*/
package io.seata.saga.engine.impl;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.saga.engine.AsyncCallback;
@@ -22,10 +27,10 @@ import io.seata.saga.engine.StateMachineConfig;
import io.seata.saga.engine.StateMachineEngine;
import io.seata.saga.engine.exception.EngineExecutionException;
import io.seata.saga.engine.exception.ForwardInvalidException;
-import io.seata.saga.engine.pcext.utils.EngineUtils;
-import io.seata.saga.engine.utils.ProcessContextBuilder;
import io.seata.saga.engine.pcext.StateInstruction;
import io.seata.saga.engine.pcext.interceptors.ServiceTaskHandlerInterceptor;
+import io.seata.saga.engine.pcext.utils.EngineUtils;
+import io.seata.saga.engine.utils.ProcessContextBuilder;
import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.proctrl.ProcessType;
import io.seata.saga.statelang.domain.DomainConstants;
@@ -38,12 +43,6 @@ import io.seata.saga.statelang.domain.impl.AbstractTaskState;
import io.seata.saga.statelang.domain.impl.CompensationTriggerStateImpl;
import io.seata.saga.statelang.domain.impl.ServiceTaskStateImpl;
import io.seata.saga.statelang.domain.impl.StateMachineInstanceImpl;
-
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
@@ -59,62 +58,70 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
private StateMachineConfig stateMachineConfig;
+ private static void nullSafeCopy(Map<String, Object> srcMap, Map<String, Object> destMap) {
+ for (String key : srcMap.keySet()) {
+ Object value = srcMap.get(key);
+ if (value != null) {
+ destMap.put(key, value);
+ }
+ }
+ }
+
@Override
- public StateMachineInstance start(String stateMachineName, String tenantId, Map<String, Object> startParams) throws EngineExecutionException {
+ public StateMachineInstance start(String stateMachineName, String tenantId, Map<String, Object> startParams)
+ throws EngineExecutionException {
return startInternal(stateMachineName, tenantId, null, startParams, false, null);
}
@Override
- public StateMachineInstance startAsync(String stateMachineName, String tenantId, Map<String, Object> startParams, AsyncCallback callback)
- throws EngineExecutionException {
+ public StateMachineInstance startAsync(String stateMachineName, String tenantId, Map<String, Object> startParams,
+ AsyncCallback callback) throws EngineExecutionException {
return startInternal(stateMachineName, tenantId, null, startParams, true, callback);
}
@Override
- public StateMachineInstance startWithBusinessKey(String stateMachineName, String tenantId, String businessKey, Map<String, Object> startParams)
- throws EngineExecutionException {
+ public StateMachineInstance startWithBusinessKey(String stateMachineName, String tenantId, String businessKey,
+ Map<String, Object> startParams) throws EngineExecutionException {
return startInternal(stateMachineName, tenantId, businessKey, startParams, false, null);
}
@Override
- public StateMachineInstance startWithBusinessKeyAsync(String stateMachineName, String tenantId, String businessKey, Map<String, Object> startParams,
- AsyncCallback callback)
- throws EngineExecutionException {
+ public StateMachineInstance startWithBusinessKeyAsync(String stateMachineName, String tenantId, String businessKey,
+ Map<String, Object> startParams, AsyncCallback callback)
+ throws EngineExecutionException {
return startInternal(stateMachineName, tenantId, businessKey, startParams, true, callback);
}
- private StateMachineInstance startInternal(String stateMachineName, String tenantId, String businessKey, Map<String, Object> startParams, boolean async, AsyncCallback callback)
- throws EngineExecutionException {
+ private StateMachineInstance startInternal(String stateMachineName, String tenantId, String businessKey,
+ Map<String, Object> startParams, boolean async, AsyncCallback callback)
+ throws EngineExecutionException {
if (async && !stateMachineConfig.isEnableAsync()) {
- throw new EngineExecutionException("Asynchronous start is disabled. please set StateMachineConfig.enableAsync=true first.",
- FrameworkErrorCode.AsynchronousStartDisabled);
+ throw new EngineExecutionException(
+ "Asynchronous start is disabled. please set StateMachineConfig.enableAsync=true first.",
+ FrameworkErrorCode.AsynchronousStartDisabled);
}
- if(StringUtils.isEmpty(tenantId)){
+ if (StringUtils.isEmpty(tenantId)) {
tenantId = stateMachineConfig.getDefaultTenantId();
}
StateMachineInstance instance = createMachineInstance(stateMachineName, tenantId, businessKey, startParams);
ProcessContextBuilder contextBuilder = ProcessContextBuilder.create().withProcessType(ProcessType.STATE_LANG)
- .withOperationName(DomainConstants.OPERATION_NAME_START)
- .withAsyncCallback(callback)
- .withInstruction(new StateInstruction(stateMachineName, tenantId))
- .withStateMachineInstance(instance)
- .withStateMachineConfig(getStateMachineConfig())
- .withStateMachineEngine(this);
+ .withOperationName(DomainConstants.OPERATION_NAME_START).withAsyncCallback(callback).withInstruction(
+ new StateInstruction(stateMachineName, tenantId)).withStateMachineInstance(instance)
+ .withStateMachineConfig(getStateMachineConfig()).withStateMachineEngine(this);
Map<String, Object> contextVariables;
- if(startParams != null){
+ if (startParams != null) {
contextVariables = new ConcurrentHashMap<>(startParams.size());
nullSafeCopy(startParams, contextVariables);
- }
- else{
+ } else {
contextVariables = new ConcurrentHashMap<>();
}
instance.setContext(contextVariables);
@@ -126,11 +133,12 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
if (instance.getStateMachine().isPersist() && stateMachineConfig.getStateLogStore() != null) {
stateMachineConfig.getStateLogStore().recordStateMachineStarted(instance, processContext);
}
- if(StringUtils.isEmpty(instance.getId())){
- instance.setId(stateMachineConfig.getSeqGenerator().generate(DomainConstants.SEQ_ENTITY_STATE_MACHINE_INST));
+ if (StringUtils.isEmpty(instance.getId())) {
+ instance.setId(
+ stateMachineConfig.getSeqGenerator().generate(DomainConstants.SEQ_ENTITY_STATE_MACHINE_INST));
}
- if(async){
+ if (async) {
stateMachineConfig.getAsyncProcessCtrlEventPublisher().publish(processContext);
} else {
stateMachineConfig.getProcessCtrlEventPublisher().publish(processContext);
@@ -141,7 +149,8 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
private StateMachineInstance createMachineInstance(String stateMachineName, String tenantId, String businessKey,
Map<String, Object> startParams) {
- StateMachine stateMachine = stateMachineConfig.getStateMachineRepository().getStateMachine(stateMachineName, tenantId);
+ StateMachine stateMachine = stateMachineConfig.getStateMachineRepository().getStateMachine(stateMachineName,
+ tenantId);
if (stateMachine == null) {
throw new EngineExecutionException("StateMachine[" + stateMachineName + "] is not exists",
FrameworkErrorCode.ObjectNotExists);
@@ -158,7 +167,7 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
startParams.put(DomainConstants.VAR_NAME_BUSINESSKEY, businessKey);
}
- if(StringUtils.hasText((String)startParams.get(DomainConstants.VAR_NAME_PARENT_ID))) {
+ if (StringUtils.hasText((String)startParams.get(DomainConstants.VAR_NAME_PARENT_ID))) {
inst.setParentId((String)startParams.get(DomainConstants.VAR_NAME_PARENT_ID));
startParams.remove(DomainConstants.VAR_NAME_PARENT_ID);
}
@@ -175,60 +184,59 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
@Override
public StateMachineInstance forward(String stateMachineInstId, Map<String, Object> replaceParams)
- throws EngineExecutionException {
+ throws EngineExecutionException {
return forwardInternal(stateMachineInstId, replaceParams, false, false, null);
}
@Override
- public StateMachineInstance forwardAsync(String stateMachineInstId, Map<String, Object> replaceParams, AsyncCallback callback)
- throws EngineExecutionException {
+ public StateMachineInstance forwardAsync(String stateMachineInstId, Map<String, Object> replaceParams,
+ AsyncCallback callback) throws EngineExecutionException {
return forwardInternal(stateMachineInstId, replaceParams, false, true, callback);
}
- protected StateMachineInstance forwardInternal(String stateMachineInstId, Map<String, Object> replaceParams, boolean skip, boolean async, AsyncCallback callback)
- throws EngineExecutionException {
-
- StateMachineInstance stateMachineInstance = reloadStateMachineInstance(stateMachineInstId);
+ protected StateMachineInstance forwardInternal(String stateMachineInstId, Map<String, Object> replaceParams,
+ boolean skip, boolean async, AsyncCallback callback)
+ throws EngineExecutionException {
+ StateMachineInstance stateMachineInstance = reloadStateMachineInstance(stateMachineInstId);
- if(stateMachineInstance == null){
- throw new ForwardInvalidException("StateMachineInstance is not exits", FrameworkErrorCode.StateMachineInstanceNotExists);
+ if (stateMachineInstance == null) {
+ throw new ForwardInvalidException("StateMachineInstance is not exits",
+ FrameworkErrorCode.StateMachineInstanceNotExists);
}
- if(ExecutionStatus.SU.equals(stateMachineInstance.getStatus()) &&
- stateMachineInstance.getCompensationStatus() == null){
+ if (ExecutionStatus.SU.equals(stateMachineInstance.getStatus())
+ && stateMachineInstance.getCompensationStatus() == null) {
return stateMachineInstance;
}
- ExecutionStatus[] acceptStatus = new ExecutionStatus[]{ ExecutionStatus.FA, ExecutionStatus.UN };
+ ExecutionStatus[] acceptStatus = new ExecutionStatus[] {ExecutionStatus.FA, ExecutionStatus.UN};
checkStatus(stateMachineInstance, acceptStatus, null, stateMachineInstance.getStatus(), null, "forward");
List<StateInstance> actList = stateMachineInstance.getStateList();
- if(actList==null || actList.size()==0){
- throw new ForwardInvalidException("StateMachineInstance[id:"+stateMachineInstId+"] has no stateInstance, pls start a new StateMachine execution instead",
+ if (actList == null || actList.size() == 0) {
+ throw new ForwardInvalidException("StateMachineInstance[id:" + stateMachineInstId
+ + "] has no stateInstance, pls start a new StateMachine execution instead",
FrameworkErrorCode.OperationDenied);
}
StateInstance lastForwardState = findOutLastForwardStateInstance(actList);
- if(lastForwardState==null){
- throw new ForwardInvalidException("StateMachineInstance[id:"+stateMachineInstId+"] Cannot find last forward execution stateInstance",
+ if (lastForwardState == null) {
+ throw new ForwardInvalidException(
+ "StateMachineInstance[id:" + stateMachineInstId + "] Cannot find last forward execution stateInstance",
FrameworkErrorCode.OperationDenied);
}
ProcessContextBuilder contextBuilder = ProcessContextBuilder.create().withProcessType(ProcessType.STATE_LANG)
- .withOperationName(DomainConstants.OPERATION_NAME_FORWARD)
- .withAsyncCallback(callback)
- .withStateMachineInstance(stateMachineInstance)
- .withStateInstance(lastForwardState)
- .withStateMachineConfig(getStateMachineConfig())
- .withStateMachineEngine(this);
-
+ .withOperationName(DomainConstants.OPERATION_NAME_FORWARD).withAsyncCallback(callback)
+ .withStateMachineInstance(stateMachineInstance).withStateInstance(lastForwardState).withStateMachineConfig(
+ getStateMachineConfig()).withStateMachineEngine(this);
ProcessContext context = contextBuilder.build();
Map<String, Object> contextVariables = getStateMachineContextVariables(context, stateMachineInstance);
- if(replaceParams != null){
+ if (replaceParams != null) {
contextVariables.putAll(replaceParams);
}
putBusinesskeyToContextariables(stateMachineInstance, contextVariables);
@@ -239,19 +247,19 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
context.setVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT, concurrentContextVariables);
stateMachineInstance.setContext(concurrentContextVariables);
-
- context.setVariable(lastForwardState.getName() + DomainConstants.VAR_NAME_RETRIED_STATE_INST_ID, lastForwardState.getId());
- if(DomainConstants.STATE_TYPE_SUB_STATE_MACHINE.equals(lastForwardState.getType())
- && !ExecutionStatus.SU.equals(lastForwardState.getCompensationStatus())) {
+ context.setVariable(lastForwardState.getName() + DomainConstants.VAR_NAME_RETRIED_STATE_INST_ID,
+ lastForwardState.getId());
+ if (DomainConstants.STATE_TYPE_SUB_STATE_MACHINE.equals(lastForwardState.getType()) && !ExecutionStatus.SU
+ .equals(lastForwardState.getCompensationStatus())) {
context.setVariable(DomainConstants.VAR_NAME_IS_FOR_SUB_STATMACHINE_FORWARD, true);
}
- if (!ExecutionStatus.SU.equals(lastForwardState.getStatus())){
+ if (!ExecutionStatus.SU.equals(lastForwardState.getStatus())) {
lastForwardState.setIgnoreStatus(true);
}
- if(stateMachineInstance.getStateMachine().isPersist()) {
+ if (stateMachineInstance.getStateMachine().isPersist()) {
stateMachineConfig.getStateLogStore().recordStateMachineRestarted(stateMachineInstance, context);
}
@@ -263,11 +271,13 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
String next = null;
State state = stateMachineInstance.getStateMachine().getState(lastForwardState.getName());
- if(state != null && state instanceof AbstractTaskState){
+ if (state != null && state instanceof AbstractTaskState) {
next = ((AbstractTaskState)state).getNext();
}
- if(StringUtils.isEmpty(next)){
- LOGGER.warn("Last Forward execution StateInstance was succeed, and it has not Next State , skip forward operation");
+ if (StringUtils.isEmpty(next)) {
+ LOGGER.warn(
+ "Last Forward execution StateInstance was succeed, and it has not Next State , skip forward "
+ + "operation");
return stateMachineInstance;
}
inst.setStateName(next);
@@ -280,9 +290,9 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
stateMachineInstance.setStatus(ExecutionStatus.RU);
stateMachineInstance.setRunning(true);
- if(async){
+ if (async) {
stateMachineConfig.getAsyncProcessCtrlEventPublisher().publish(context);
- }else{
+ } else {
stateMachineConfig.getProcessCtrlEventPublisher().publish(context);
}
} catch (EngineExecutionException e) {
@@ -292,44 +302,53 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
return stateMachineInstance;
}
- private Map<String, Object> getStateMachineContextVariables(ProcessContext context, StateMachineInstance stateMachineInstance){
+ private Map<String, Object> getStateMachineContextVariables(ProcessContext context,
+ StateMachineInstance stateMachineInstance) {
Map<String, Object> contextVariables = stateMachineInstance.getEndParams();
- if(contextVariables == null || contextVariables.size() == 0){
+ if (contextVariables == null || contextVariables.size() == 0) {
contextVariables = stateMachineInstance.getStartParams();
}
- if(contextVariables == null){
+ if (contextVariables == null) {
contextVariables = new HashMap<>();
}
- if(stateMachineInstance.isRunning()){
+ if (stateMachineInstance.isRunning()) {
List<StateInstance> stateInstanceList = stateMachineInstance.getStateList();
- if(stateInstanceList == null || stateInstanceList.size() == 0){
+ if (stateInstanceList == null || stateInstanceList.size() == 0) {
return contextVariables;
}
- for(StateInstance stateInstance : stateInstanceList){
+ for (StateInstance stateInstance : stateInstanceList) {
Object serviceOutputParams = stateInstance.getOutputParams();
- if(serviceOutputParams != null){
- ServiceTaskStateImpl state = (ServiceTaskStateImpl)stateMachineInstance.getStateMachine().getState(stateInstance.getName());
- if(state == null){
- throw new EngineExecutionException("Cannot find State by state name ["+stateInstance.getName()+"], may be this is a bug",
+ if (serviceOutputParams != null) {
+ ServiceTaskStateImpl state = (ServiceTaskStateImpl)stateMachineInstance.getStateMachine().getState(
+ stateInstance.getName());
+ if (state == null) {
+ throw new EngineExecutionException(
+ "Cannot find State by state name [" + stateInstance.getName() + "], may be this is a bug",
FrameworkErrorCode.ObjectNotExists);
}
- if(state.getOutput() != null && state.getOutput().size() > 0){
+ if (state.getOutput() != null && state.getOutput().size() > 0) {
try {
- Map<String, Object> outputVariablesToContext = ServiceTaskHandlerInterceptor.createOutputParams(stateMachineConfig.getExpressionFactoryManager(), state, serviceOutputParams);
- if(outputVariablesToContext != null && outputVariablesToContext.size() > 0){
+ Map<String, Object> outputVariablesToContext = ServiceTaskHandlerInterceptor
+ .createOutputParams(stateMachineConfig.getExpressionFactoryManager(), state,
+ serviceOutputParams);
+ if (outputVariablesToContext != null && outputVariablesToContext.size() > 0) {
contextVariables.putAll(outputVariablesToContext);
}
- if(StringUtils.hasLength(stateInstance.getBusinessKey())){
+ if (StringUtils.hasLength(stateInstance.getBusinessKey())) {
- ((Map<String, Object>)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT)).put(state.getName()+DomainConstants.VAR_NAME_BUSINESSKEY, stateInstance.getBusinessKey());
+ ((Map<String, Object>)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT)).put(
+ state.getName() + DomainConstants.VAR_NAME_BUSINESSKEY,
+ stateInstance.getBusinessKey());
}
} catch (Exception e) {
- throw new EngineExecutionException(e, "Context variables replay faied", FrameworkErrorCode.ContextVariableReplayFailed);
+ throw new EngineExecutionException(e, "Context variables replay faied",
+ FrameworkErrorCode.ContextVariableReplayFailed);
}
}
@@ -348,41 +367,45 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
*/
public StateInstance findOutLastForwardStateInstance(List<StateInstance> stateInstanceList) {
StateInstance lastForwardStateInstance = null;
- for(int i = stateInstanceList.size()-1 ; i >= 0; i--){
+ for (int i = stateInstanceList.size() - 1; i >= 0; i--) {
StateInstance stateInstance = stateInstanceList.get(i);
- if(!stateInstance.isForCompensation()){
+ if (!stateInstance.isForCompensation()) {
- if(ExecutionStatus.SU.equals(stateInstance.getCompensationStatus())){
+ if (ExecutionStatus.SU.equals(stateInstance.getCompensationStatus())) {
continue;
}
- if(DomainConstants.STATE_TYPE_SUB_STATE_MACHINE.equals(stateInstance.getType())){
+ if (DomainConstants.STATE_TYPE_SUB_STATE_MACHINE.equals(stateInstance.getType())) {
StateInstance finalState = stateInstance;
while (StringUtils.hasText(finalState.getStateIdRetriedFor())) {
- finalState = stateMachineConfig.getStateLogStore().getStateInstance(finalState.getStateIdRetriedFor(), finalState.getMachineInstanceId());
+ finalState = stateMachineConfig.getStateLogStore().getStateInstance(
+ finalState.getStateIdRetriedFor(), finalState.getMachineInstanceId());
}
- List<StateMachineInstance> subInst = stateMachineConfig.getStateLogStore().queryStateMachineInstanceByParentId(EngineUtils.generateParentId(finalState));
- if(subInst!=null && subInst.size()>0){
+ List<StateMachineInstance> subInst = stateMachineConfig.getStateLogStore()
+ .queryStateMachineInstanceByParentId(EngineUtils.generateParentId(finalState));
+ if (subInst != null && subInst.size() > 0) {
- if(ExecutionStatus.SU.equals(subInst.get(0).getCompensationStatus())){
+ if (ExecutionStatus.SU.equals(subInst.get(0).getCompensationStatus())) {
continue;
}
- if(ExecutionStatus.UN.equals(subInst.get(0).getCompensationStatus())){
- throw new ForwardInvalidException("Last forward execution state instance is SubStateMachine and compensation status is [UN], Operation[forward] denied, stateInstanceId:"+ stateInstance.getId(),
- FrameworkErrorCode.OperationDenied);
+ if (ExecutionStatus.UN.equals(subInst.get(0).getCompensationStatus())) {
+ throw new ForwardInvalidException(
+ "Last forward execution state instance is SubStateMachine and compensation status is "
+ + "[UN], Operation[forward] denied, stateInstanceId:"
+ + stateInstance.getId(), FrameworkErrorCode.OperationDenied);
}
}
- }
+ } else if (ExecutionStatus.UN.equals(stateInstance.getCompensationStatus())) {
- else if(ExecutionStatus.UN.equals(stateInstance.getCompensationStatus())){
-
- throw new ForwardInvalidException("Last forward execution state instance compensation status is [UN], Operation[forward] denied, stateInstanceId:"+ stateInstance.getId(),
- FrameworkErrorCode.OperationDenied);
+ throw new ForwardInvalidException(
+ "Last forward execution state instance compensation status is [UN], Operation[forward] "
+ + "denied, stateInstanceId:"
+ + stateInstance.getId(), FrameworkErrorCode.OperationDenied);
}
lastForwardStateInstance = stateInstance;
@@ -393,49 +416,52 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
}
@Override
- public StateMachineInstance compensate(String stateMachineInstId, Map<String, Object> replaceParams) throws EngineExecutionException {
+ public StateMachineInstance compensate(String stateMachineInstId, Map<String, Object> replaceParams)
+ throws EngineExecutionException {
return compensateInternal(stateMachineInstId, replaceParams, false, null);
}
@Override
- public StateMachineInstance compensateAsync(String stateMachineInstId, Map<String, Object> replaceParams, AsyncCallback callback) throws EngineExecutionException {
+ public StateMachineInstance compensateAsync(String stateMachineInstId, Map<String, Object> replaceParams,
+ AsyncCallback callback) throws EngineExecutionException {
return compensateInternal(stateMachineInstId, replaceParams, true, callback);
}
- public StateMachineInstance compensateInternal(String stateMachineInstId, Map<String, Object> replaceParams, boolean async, AsyncCallback callback) throws EngineExecutionException {
+ public StateMachineInstance compensateInternal(String stateMachineInstId, Map<String, Object> replaceParams,
+ boolean async, AsyncCallback callback)
+ throws EngineExecutionException {
- StateMachineInstance stateMachineInstance = reloadStateMachineInstance(stateMachineInstId);
+ StateMachineInstance stateMachineInstance = reloadStateMachineInstance(stateMachineInstId);
- if(stateMachineInstance == null){
- throw new EngineExecutionException("StateMachineInstance is not exits", FrameworkErrorCode.StateMachineInstanceNotExists);
+ if (stateMachineInstance == null) {
+ throw new EngineExecutionException("StateMachineInstance is not exits",
+ FrameworkErrorCode.StateMachineInstanceNotExists);
}
- if(ExecutionStatus.SU.equals(stateMachineInstance.getCompensationStatus())){
+ if (ExecutionStatus.SU.equals(stateMachineInstance.getCompensationStatus())) {
return stateMachineInstance;
}
- if(stateMachineInstance.getCompensationStatus() != null) {
- ExecutionStatus[] denyStatus = new ExecutionStatus[]{ ExecutionStatus.SU };
- checkStatus(stateMachineInstance, null, denyStatus, null, stateMachineInstance.getCompensationStatus(), "compensate");
+ if (stateMachineInstance.getCompensationStatus() != null) {
+ ExecutionStatus[] denyStatus = new ExecutionStatus[] {ExecutionStatus.SU};
+ checkStatus(stateMachineInstance, null, denyStatus, null, stateMachineInstance.getCompensationStatus(),
+ "compensate");
}
- if(replaceParams!=null){
+ if (replaceParams != null) {
stateMachineInstance.getEndParams().putAll(replaceParams);
}
ProcessContextBuilder contextBuilder = ProcessContextBuilder.create().withProcessType(ProcessType.STATE_LANG)
- .withOperationName(DomainConstants.OPERATION_NAME_COMPENSATE)
- .withAsyncCallback(callback)
- .withStateMachineInstance(stateMachineInstance)
- .withStateMachineConfig(getStateMachineConfig())
- .withStateMachineEngine(this);
-
+ .withOperationName(DomainConstants.OPERATION_NAME_COMPENSATE).withAsyncCallback(callback)
+ .withStateMachineInstance(stateMachineInstance).withStateMachineConfig(getStateMachineConfig())
+ .withStateMachineEngine(this);
ProcessContext context = contextBuilder.build();
Map<String, Object> contextVariables = getStateMachineContextVariables(context, stateMachineInstance);
- if(replaceParams != null){
+ if (replaceParams != null) {
contextVariables.putAll(replaceParams);
}
putBusinesskeyToContextariables(stateMachineInstance, contextVariables);
@@ -450,7 +476,7 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
tempCompensationTriggerState.setStateMachine(stateMachineInstance.getStateMachine());
stateMachineInstance.setRunning(true);
- if(stateMachineInstance.getStateMachine().isPersist()) {
+ if (stateMachineInstance.getStateMachine().isPersist()) {
stateMachineConfig.getStateLogStore().recordStateMachineRestarted(stateMachineInstance, context);
}
try {
@@ -461,9 +487,9 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
context.setInstruction(inst);
- if(async){
+ if (async) {
stateMachineConfig.getAsyncProcessCtrlEventPublisher().publish(context);
- }else{
+ } else {
stateMachineConfig.getProcessCtrlEventPublisher().publish(context);
}
@@ -481,33 +507,36 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
}
@Override
- public StateMachineInstance skipAndForwardAsync(String stateMachineInstId, AsyncCallback callback) throws EngineExecutionException {
+ public StateMachineInstance skipAndForwardAsync(String stateMachineInstId, AsyncCallback callback)
+ throws EngineExecutionException {
return forwardInternal(stateMachineInstId, null, false, true, callback);
}
/**
- * 重新装载状态机实例
+ * override state machine instance
+ *
* @param instId
* @return
*/
- protected StateMachineInstance reloadStateMachineInstance(String instId){
+ protected StateMachineInstance reloadStateMachineInstance(String instId) {
StateMachineInstance inst = stateMachineConfig.getStateLogStore().getStateMachineInstance(instId);
- if(inst != null){
+ if (inst != null) {
StateMachine stateMachine = inst.getStateMachine();
- if(stateMachine == null){
+ if (stateMachine == null) {
stateMachine = stateMachineConfig.getStateMachineRepository().getStateMachineById(inst.getMachineId());
inst.setStateMachine(stateMachine);
}
- if(stateMachine == null){
- throw new EngineExecutionException("StateMachine[id:"+inst.getMachineId()+"] not exist.", FrameworkErrorCode.ObjectNotExists);
+ if (stateMachine == null) {
+ throw new EngineExecutionException("StateMachine[id:" + inst.getMachineId() + "] not exist.",
+ FrameworkErrorCode.ObjectNotExists);
}
List<StateInstance> stateList = inst.getStateList();
- if(stateList == null || stateList.size() == 0){
+ if (stateList == null || stateList.size() == 0) {
stateList = stateMachineConfig.getStateLogStore().queryStateInstanceListByMachineInstanceId(instId);
- if(stateList!=null && stateList.size()>0){
- for(StateInstance tmpStateInstance : stateList){
+ if (stateList != null && stateList.size() > 0) {
+ for (StateInstance tmpStateInstance : stateList) {
inst.putStateInstance(tmpStateInstance.getId(), tmpStateInstance);
}
}
@@ -518,6 +547,7 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
/**
* Check if the status is legal
+ *
* @param stateMachineInstance
* @param acceptStatus
* @param denyStatus
@@ -526,43 +556,47 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
* @param operation
* @return
*/
- protected boolean checkStatus(StateMachineInstance stateMachineInstance, ExecutionStatus[] acceptStatus, ExecutionStatus[] denyStatus,
- ExecutionStatus status, ExecutionStatus compenStatus, String operation) {
- if(status != null && compenStatus != null) {
- throw new EngineExecutionException("status and compensationStatus are not supported at the same time", FrameworkErrorCode.InvalidParameter);
+ protected boolean checkStatus(StateMachineInstance stateMachineInstance, ExecutionStatus[] acceptStatus,
+ ExecutionStatus[] denyStatus, ExecutionStatus status, ExecutionStatus compenStatus,
+ String operation) {
+ if (status != null && compenStatus != null) {
+ throw new EngineExecutionException("status and compensationStatus are not supported at the same time",
+ FrameworkErrorCode.InvalidParameter);
}
- if(status == null && compenStatus == null) {
- throw new EngineExecutionException("status and compensationStatus must input at least one", FrameworkErrorCode.InvalidParameter);
+ if (status == null && compenStatus == null) {
+ throw new EngineExecutionException("status and compensationStatus must input at least one",
+ FrameworkErrorCode.InvalidParameter);
}
- if(ExecutionStatus.SU.equals(compenStatus)) {
- String message = buildExceptionMessage(stateMachineInstance, null, null, null, ExecutionStatus.SU, operation);
+ if (ExecutionStatus.SU.equals(compenStatus)) {
+ String message = buildExceptionMessage(stateMachineInstance, null, null, null, ExecutionStatus.SU,
+ operation);
throw new EngineExecutionException(message, FrameworkErrorCode.OperationDenied);
}
- if(stateMachineInstance.isRunning()) {
- throw new EngineExecutionException("StateMachineInstance[id:" + stateMachineInstance.getId() + "]is running，operation[" + operation + "] denied",
- FrameworkErrorCode.OperationDenied);
+ if (stateMachineInstance.isRunning()) {
+ throw new EngineExecutionException(
+ "StateMachineInstance [id:" + stateMachineInstance.getId() + "]is running, operation[" + operation
+ + "] denied", FrameworkErrorCode.OperationDenied);
}
- if((denyStatus == null ||denyStatus.length == 0)
- && (acceptStatus == null || acceptStatus.length == 0)) {
- throw new EngineExecutionException("StateMachineInstance[id:" + stateMachineInstance.getId() + "], acceptable status and deny status must input at least one",
- FrameworkErrorCode.InvalidParameter);
+ if ((denyStatus == null || denyStatus.length == 0) && (acceptStatus == null || acceptStatus.length == 0)) {
+ throw new EngineExecutionException("StateMachineInstance[id:" + stateMachineInstance.getId()
+ + "], acceptable status and deny status must input at least one", FrameworkErrorCode.InvalidParameter);
}
ExecutionStatus currentStatus = (status != null) ? status : compenStatus;
-
if (!(denyStatus == null || denyStatus.length == 0)) {
for (ExecutionStatus tempDenyStatus : denyStatus) {
if (tempDenyStatus.compareTo(currentStatus) == 0) {
- String message = buildExceptionMessage(stateMachineInstance, acceptStatus, denyStatus, status, compenStatus, operation);
+ String message = buildExceptionMessage(stateMachineInstance, acceptStatus, denyStatus, status,
+ compenStatus, operation);
throw new EngineExecutionException(message, FrameworkErrorCode.OperationDenied);
}
}
}
- if(acceptStatus == null || acceptStatus.length == 0) {
+ if (acceptStatus == null || acceptStatus.length == 0) {
return true;
} else {
for (ExecutionStatus tempStatus : acceptStatus) {
@@ -572,14 +606,16 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
}
}
- String message = buildExceptionMessage(stateMachineInstance, acceptStatus, denyStatus, status, compenStatus, operation);
+ String message = buildExceptionMessage(stateMachineInstance, acceptStatus, denyStatus, status, compenStatus,
+ operation);
throw new EngineExecutionException(message, FrameworkErrorCode.OperationDenied);
}
- private String buildExceptionMessage(StateMachineInstance stateMachineInstance, ExecutionStatus[] acceptStatus, ExecutionStatus[] denyStatus,
- ExecutionStatus status, ExecutionStatus compenStatus, String operation) {
+ private String buildExceptionMessage(StateMachineInstance stateMachineInstance, ExecutionStatus[] acceptStatus,
+ ExecutionStatus[] denyStatus, ExecutionStatus status,
+ ExecutionStatus compenStatus, String operation) {
StringBuilder stringBuilder = new StringBuilder();
- stringBuilder.append("StateMachineInstance[id:" + stateMachineInstance.getId() + "]");
+ stringBuilder.append("StateMachineInstance[id:").append(stateMachineInstance.getId()).append("]");
if (acceptStatus != null) {
stringBuilder.append(",acceptable status :");
for (ExecutionStatus tempStatus : acceptStatus) {
@@ -602,26 +638,18 @@ public class ProcessCtrlStateMachineEngine implements StateMachineEngine {
stringBuilder.append(",current compensation status:");
stringBuilder.append(compenStatus.toString());
}
- stringBuilder.append(",so operation [" + operation + "] denied");
+ stringBuilder.append(",so operation [").append(operation).append("] denied");
return stringBuilder.toString();
}
- private void putBusinesskeyToContextariables(StateMachineInstance stateMachineInstance, Map<String, Object> contextVariables) {
- if(StringUtils.hasText(stateMachineInstance.getBusinessKey()) &&
- !contextVariables.containsKey(DomainConstants.VAR_NAME_BUSINESSKEY)) {
+ private void putBusinesskeyToContextariables(StateMachineInstance stateMachineInstance,
+ Map<String, Object> contextVariables) {
+ if (StringUtils.hasText(stateMachineInstance.getBusinessKey()) && !contextVariables.containsKey(
+ DomainConstants.VAR_NAME_BUSINESSKEY)) {
contextVariables.put(DomainConstants.VAR_NAME_BUSINESSKEY, stateMachineInstance.getBusinessKey());
}
}
- private static void nullSafeCopy(Map<String, Object> srcMap, Map<String, Object> destMap){
- for(String key : srcMap.keySet()){
- Object value = srcMap.get(key);
- if(value != null){
- destMap.put(key, value);
- }
- }
- }
-
@Override
public StateMachineConfig getStateMachineConfig() {
return stateMachineConfig;
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/ServiceInvoker.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/ServiceInvoker.java
index 73cb966d17ec5b7f352939ac447562fbef623166..9e0735b59b6822c45267462a6136cf4f1ec01170 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/ServiceInvoker.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/ServiceInvoker.java
@@ -24,5 +24,12 @@ import io.seata.saga.statelang.domain.ServiceTaskState;
*/
public interface ServiceInvoker {
- Object invoke(ServiceTaskState serviceTaskState, Object... input);
+ /**
+ * invoke service
+ * @param serviceTaskState
+ * @param input
+ * @return
+ * @throws Throwable
+ */
+ Object invoke(ServiceTaskState serviceTaskState, Object... input) throws Throwable;
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/ServiceInvokerManager.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/ServiceInvokerManager.java
index e3629ce8e6a9653abcdeb8add2f2bb461e26c4ed..d1651164322b490a9aecd5a1e5ddd2afcc7f0d29 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/ServiceInvokerManager.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/ServiceInvokerManager.java
@@ -15,15 +15,13 @@
*/
package io.seata.saga.engine.invoker;
-import io.seata.saga.engine.invoker.impl.SpringBeanServiceInvoker;
-import io.seata.saga.statelang.domain.DomainConstants;
-import org.springframework.util.StringUtils;
-
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import io.seata.saga.statelang.domain.DomainConstants;
+import org.springframework.util.StringUtils;
+
/**
- *
* Service Invoker Manager
*
* @author lorne.cl
@@ -32,18 +30,14 @@ public class ServiceInvokerManager {
private Map<String, ServiceInvoker> serviceInvokerMap = new ConcurrentHashMap<>();
- public ServiceInvokerManager(){
- serviceInvokerMap.put(DomainConstants.SERVICE_TYPE_SPRING_BEAN, new SpringBeanServiceInvoker());
- }
-
- public ServiceInvoker getServiceInvoker(String serviceType){
- if(StringUtils.isEmpty(serviceType)){
+ public ServiceInvoker getServiceInvoker(String serviceType) {
+ if (StringUtils.isEmpty(serviceType)) {
serviceType = DomainConstants.SERVICE_TYPE_SPRING_BEAN;
}
return serviceInvokerMap.get(serviceType);
}
- public void putServiceInvoker(String serviceType, ServiceInvoker serviceInvoker){
+ public void putServiceInvoker(String serviceType, ServiceInvoker serviceInvoker) {
serviceInvokerMap.put(serviceType, serviceInvoker);
}
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/impl/SpringBeanServiceInvoker.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/impl/SpringBeanServiceInvoker.java
index 5c2a1baff79a68974030811e9f7441c8441e8537..1301d4abd6a1cbf9acb1fbe90722874020456fc0 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/impl/SpringBeanServiceInvoker.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/invoker/impl/SpringBeanServiceInvoker.java
@@ -15,12 +15,28 @@
*/
package io.seata.saga.engine.invoker.impl;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.math.BigDecimal;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicInteger;
+
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.parser.Feature;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.saga.engine.exception.EngineExecutionException;
import io.seata.saga.engine.invoker.ServiceInvoker;
+import io.seata.saga.engine.pcext.handlers.ServiceTaskStateHandler;
+import io.seata.saga.engine.utils.ExceptionUtils;
import io.seata.saga.statelang.domain.ServiceTaskState;
+import io.seata.saga.statelang.domain.TaskState.Retry;
import io.seata.saga.statelang.domain.impl.ServiceTaskStateImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -28,15 +44,8 @@ import org.springframework.beans.BeanUtils;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.util.List;
-
/**
- * SpringBean Service Invoker
+ * SpringBean Service Invoker
*
* @author lorne.cl
*/
@@ -45,21 +54,53 @@ public class SpringBeanServiceInvoker implements ServiceInvoker, ApplicationCont
private static final Logger LOGGER = LoggerFactory.getLogger(SpringBeanServiceInvoker.class);
private ApplicationContext applicationContext;
+ private ThreadPoolExecutor threadPoolExecutor;
@Override
- public Object invoke(ServiceTaskState serviceTaskState, Object... input) {
-
+ public Object invoke(ServiceTaskState serviceTaskState, Object... input) throws Throwable {
ServiceTaskStateImpl state = (ServiceTaskStateImpl) serviceTaskState;
+ if (state.isAsync()) {
+ if (threadPoolExecutor == null) {
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn(
+ "threadPoolExecutor is null, Service[{}.{}] cannot execute asynchronously, executing "
+ + "synchronously now. stateName: {}",
+ state.getServiceName(), state.getServiceMethod(), state.getName());
+ }
+ return doInvoke(state, input);
+ }
+
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("Submit Service[{}.{}] to asynchronously executing. stateName: {}", state.getServiceName(),
+ state.getServiceMethod(), state.getName());
+ }
+ threadPoolExecutor.execute(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ doInvoke(state, input);
+ } catch (Throwable e) {
+ LOGGER.error("Invoke Service[" + state.getServiceName() + "." + state.getServiceMethod() + "] failed.", e);
+ }
+ }
+ });
+ return null;
+ } else {
+ return doInvoke(state, input);
+ }
+ }
+
+ protected Object doInvoke(ServiceTaskStateImpl state, Object[] input) throws Throwable {
Object bean = applicationContext.getBean(state.getServiceName());
Method method = state.getMethod();
- if(method == null){
- synchronized (state){
+ if (method == null) {
+ synchronized (state) {
method = state.getMethod();
- if(method == null){
+ if (method == null) {
method = findMethod(bean.getClass(), state.getServiceMethod(), state.getParameterTypes());
- if(method != null){
+ if (method != null) {
state.setMethod(method);
}
}
@@ -67,23 +108,132 @@ public class SpringBeanServiceInvoker implements ServiceInvoker, ApplicationCont
}
if (method == null) {
- throw new EngineExecutionException("No such method[" + state.getServiceMethod() + "] on BeanClass[" + bean.getClass() + "]", FrameworkErrorCode.NoSuchMethod);
+ throw new EngineExecutionException(
+ "No such method[" + state.getServiceMethod() + "] on BeanClass[" + bean.getClass() + "]",
+ FrameworkErrorCode.NoSuchMethod);
+
}
Object[] args = new Object[method.getParameterCount()];
try {
Class[] paramTypes = method.getParameterTypes();
- if(input != null && input.length > 0) {
+ if (input != null && input.length > 0) {
int len = input.length < paramTypes.length ? input.length : paramTypes.length;
- for(int i = 0; i < len; i++){
+ for (int i = 0; i < len; i++) {
args[i] = toJavaObject(input[i], paramTypes[i]);
}
}
} catch (Exception e) {
- throw new EngineExecutionException(e, "Input to java object error, Method[" + state.getServiceMethod() + "] on BeanClass[" + bean.getClass() + "]", FrameworkErrorCode.InvalidParameter);
+ throw new EngineExecutionException(e,
+ "Input to java object error, Method[" + state.getServiceMethod() + "] on BeanClass[" + bean.getClass()
+ + "]", FrameworkErrorCode.InvalidParameter);
}
- return invokeMethod(bean, method, args);
+ if (!Modifier.isPublic(method.getModifiers())) {
+ throw new EngineExecutionException("Method[" + method.getName() + "] must be public",
+ FrameworkErrorCode.MethodNotPublic);
+ }
+
+ Map<Retry, AtomicInteger> retryCountMap = new HashMap<>();
+ while (true) {
+
+ try {
+ return invokeMethod(bean, method, args);
+ } catch (Throwable e) {
+
+ Retry matchedRetryConfig = matchRetryConfig(state.getRetry(), e);
+ if (matchedRetryConfig == null) {
+ throw e;
+ }
+
+ if (!retryCountMap.containsKey(matchedRetryConfig)) {
+ retryCountMap.put(matchedRetryConfig, new AtomicInteger(0));
+ }
+
+ AtomicInteger retryCount = retryCountMap.get(matchedRetryConfig);
+ if (retryCount.intValue() >= matchedRetryConfig.getMaxAttempts()) {
+ throw e;
+ }
+
+ double intervalSeconds = matchedRetryConfig.getIntervalSeconds();
+ double backoffRate = matchedRetryConfig.getBackoffRate();
+ long currentInterval = (long) (retryCount.intValue() > 0 ?
+ (intervalSeconds * backoffRate * retryCount.intValue() * 1000) : (intervalSeconds * 1000));
+
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Invoke Service[" + state.getServiceName() + "." + state.getServiceMethod() + "] failed, will retry after "
+ + currentInterval + " millis, current retry count: " + retryCount.intValue(), e);
+ }
+ try {
+ Thread.sleep(currentInterval);
+ } catch (InterruptedException e1) {
+ LOGGER.warn("Retry interval sleep error", e1);
+ }
+ retryCount.incrementAndGet();
+ }
+ }
+ }
+
+ private Retry matchRetryConfig(List<Retry> retryList, Throwable e) {
+
+ if (retryList != null && retryList.size() > 0) {
+ for (Retry retryConfig : retryList) {
+
+ List<String> exceptions = retryConfig.getExceptions();
+ if (exceptions == null || exceptions.size() == 0) {
+ // Exceptions not configured, Match current exception if it is NetException.
+ if (ExceptionUtils.isNetException(e)) {
+ return retryConfig;
+ }
+ } else {
+
+ List<Class<? extends Exception>> exceptionClasses = retryConfig.getExceptionClasses();
+ if (exceptionClasses == null) {
+ synchronized (retryConfig) {
+ exceptionClasses = retryConfig.getExceptionClasses();
+ if (exceptionClasses == null) {
+
+ exceptionClasses = new ArrayList<>(exceptions.size());
+ for (String expStr : exceptions) {
+
+ Class<? extends Exception> expClass = null;
+ try {
+ expClass = (Class<? extends Exception>) ServiceTaskStateHandler.class
+ .getClassLoader().loadClass(expStr);
+ } catch (Exception e1) {
+
+ LOGGER.warn("Cannot Load Exception Class by getClass().getClassLoader()", e1);
+
+ try {
+ expClass = (Class<? extends Exception>) Thread.currentThread()
+ .getContextClassLoader().loadClass(expStr);
+ } catch (Exception e2) {
+ LOGGER.warn(
+ "Cannot Load Exception Class by Thread.currentThread()"
+ + ".getContextClassLoader()",
+ e2);
+ }
+ }
+
+ if (expClass != null) {
+ exceptionClasses.add(expClass);
+ }
+ }
+ retryConfig.setExceptionClasses(exceptionClasses);
+ }
+ }
+ }
+
+ for (Class<? extends Exception> expClass : exceptionClasses) {
+ if (expClass.isAssignableFrom(e.getClass())) {
+ return retryConfig;
+ }
+ }
+
+ }
+ }
+ }
+ return null;
}
@Override
@@ -91,30 +241,33 @@ public class SpringBeanServiceInvoker implements ServiceInvoker, ApplicationCont
this.applicationContext = applicationContext;
}
- protected Method findMethod(Class<?> clazz, String methodName, List<String> parameterTypes){
+ public void setThreadPoolExecutor(ThreadPoolExecutor threadPoolExecutor) {
+ this.threadPoolExecutor = threadPoolExecutor;
+ }
+
+ protected Method findMethod(Class<?> clazz, String methodName, List<String> parameterTypes) {
- if(parameterTypes == null || parameterTypes.size() == 0){
+ if (parameterTypes == null || parameterTypes.size() == 0) {
return BeanUtils.findDeclaredMethodWithMinimalParameters(clazz, methodName);
- }
- else{
+ } else {
Class[] paramClassTypes = new Class[parameterTypes.size()];
- for(int i = 0; i < parameterTypes.size(); i++){
+ for (int i = 0; i < parameterTypes.size(); i++) {
paramClassTypes[i] = classForName(parameterTypes.get(i));
}
return BeanUtils.findDeclaredMethod(clazz, methodName, paramClassTypes);
}
}
- protected Class classForName(String className){
+ protected Class classForName(String className) {
Class clazz = getPrimitiveClass(className);
- if(clazz == null) {
+ if (clazz == null) {
try {
clazz = Class.forName(className);
} catch (ClassNotFoundException e) {
LOGGER.error(e.getMessage(), e);
}
}
- if(clazz == null){
+ if (clazz == null) {
try {
clazz = Class.forName(className, true, Thread.currentThread().getContextClassLoader());
} catch (ClassNotFoundException e) {
@@ -122,49 +275,35 @@ public class SpringBeanServiceInvoker implements ServiceInvoker, ApplicationCont
}
}
if (clazz == null) {
- throw new EngineExecutionException("Parameter class not found [" + className + "]", FrameworkErrorCode.ObjectNotExists);
+ throw new EngineExecutionException("Parameter class not found [" + className + "]",
+ FrameworkErrorCode.ObjectNotExists);
}
return clazz;
}
- protected Object invokeMethod(Object serviceBean, Method method, Object... input) {
-
- if (!Modifier.isPublic(method.getModifiers())) {
- throw new EngineExecutionException("Method[" + method.getName() + "] must be public", FrameworkErrorCode.MethodNotPublic);
- }
+ protected Object invokeMethod(Object serviceBean, Method method, Object... input) throws Throwable {
try {
return method.invoke(serviceBean, input);
- }
- catch (InvocationTargetException e) {
+ } catch (InvocationTargetException e) {
Throwable targetExp = e.getTargetException();
- if(targetExp==null){
- throw new EngineExecutionException(e, e.getMessage(), FrameworkErrorCode.MethodInvokeError);
+ if (targetExp == null) {
+ throw new EngineExecutionException(e, e.getMessage(), FrameworkErrorCode.MethodInvokeError);
}
- if (targetExp instanceof RuntimeException) {
- throw (RuntimeException) targetExp;
- }
- else {
- throw new EngineExecutionException(targetExp, targetExp.getMessage(), FrameworkErrorCode.MethodInvokeError);
- }
- }
- catch (Exception e) {
- throw new EngineExecutionException(e, e.getMessage(), FrameworkErrorCode.MethodInvokeError);
+ throw targetExp;
}
}
- protected Object toJavaObject(Object value, Class paramType){
- if(value == null){
+ protected Object toJavaObject(Object value, Class paramType) {
+ if (value == null) {
return value;
}
- if(paramType.isAssignableFrom(value.getClass())){
+ if (paramType.isAssignableFrom(value.getClass())) {
return value;
- }
- else if(isPrimitive(paramType)){
+ } else if (isPrimitive(paramType)) {
return value;
- }
- else{
+ } else {
String jsonValue = JSON.toJSONString(value);
return JSON.parseObject(jsonValue, paramType, Feature.SupportAutoType);
}
@@ -193,31 +332,23 @@ public class SpringBeanServiceInvoker implements ServiceInvoker, ApplicationCont
protected Class getPrimitiveClass(String className) {
- if(boolean.class.getName().equals(className)){
+ if (boolean.class.getName().equals(className)) {
return boolean.class;
- }
- else if(char.class.getName().equals(className)){
+ } else if (char.class.getName().equals(className)) {
return char.class;
- }
- else if(byte.class.getName().equals(className)){
+ } else if (byte.class.getName().equals(className)) {
return byte.class;
- }
- else if(short.class.getName().equals(className)){
+ } else if (short.class.getName().equals(className)) {
return short.class;
- }
- else if(int.class.getName().equals(className)){
+ } else if (int.class.getName().equals(className)) {
return int.class;
- }
- else if(long.class.getName().equals(className)){
+ } else if (long.class.getName().equals(className)) {
return long.class;
- }
- else if(float.class.getName().equals(className)){
+ } else if (float.class.getName().equals(className)) {
return float.class;
- }
- else if(double.class.getName().equals(className)){
+ } else if (double.class.getName().equals(className)) {
return double.class;
- }
- else {
+ } else {
return null;
}
}
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateInstruction.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateInstruction.java
index a8142728698d56e136d44fa1184954bbde7bf9d3..8a82392b5c7128148fcb229fb51517ac0e6eee6f 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateInstruction.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateInstruction.java
@@ -28,14 +28,14 @@ import org.springframework.util.StringUtils;
/**
* State Instruction
*
- * @see Instruction
* @author lorne.cl
+ * @see Instruction
*/
public class StateInstruction implements Instruction {
- private String stateName;
- private String stateMachineName;
- private String tenantId;
+ private String stateName;
+ private String stateMachineName;
+ private String tenantId;
private boolean end;
/**
@@ -51,9 +51,9 @@ public class StateInstruction implements Instruction {
this.tenantId = tenantId;
}
- public State getState(ProcessContext context){
+ public State getState(ProcessContext context) {
- if(getTemporaryState() != null){
+ if (getTemporaryState() != null) {
return temporaryState;
}
@@ -66,14 +66,15 @@ public class StateInstruction implements Instruction {
throw new EngineExecutionException("StateMachineName is required", FrameworkErrorCode.ParameterRequired);
}
- StateMachineConfig stateMachineConfig = (StateMachineConfig) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
- StateMachine stateMachine = stateMachineConfig.getStateMachineRepository().getStateMachine(stateMachineName, tenantId);
+ StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+ StateMachine stateMachine = stateMachineConfig.getStateMachineRepository().getStateMachine(stateMachineName,
+ tenantId);
if (stateMachine == null) {
- throw new EngineExecutionException("StateMachine[" + stateMachineName + "] is not exist", FrameworkErrorCode.ObjectNotExists);
+ throw new EngineExecutionException("StateMachine[" + stateMachineName + "] is not exist",
+ FrameworkErrorCode.ObjectNotExists);
}
-
-
if (StringUtils.isEmpty(stateName)) {
stateName = stateMachine.getStartState();
@@ -82,7 +83,8 @@ public class StateInstruction implements Instruction {
State state = stateMachine.getStates().get(stateName);
if (state == null) {
- throw new EngineExecutionException("State[" + stateName + "] is not exist", FrameworkErrorCode.ObjectNotExists);
+ throw new EngineExecutionException("State[" + stateName + "] is not exist",
+ FrameworkErrorCode.ObjectNotExists);
}
return state;
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateMachineProcessHandler.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateMachineProcessHandler.java
index 28b77a139be856cd44e0ab71043e12ab6451513b..f7f383d474797ec1d7de1748aa83949d4779e21c 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateMachineProcessHandler.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateMachineProcessHandler.java
@@ -15,6 +15,10 @@
*/
package io.seata.saga.engine.pcext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import io.seata.common.exception.FrameworkException;
import io.seata.saga.engine.pcext.handlers.ChoiceStateHandler;
@@ -28,16 +32,12 @@ import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.proctrl.handler.ProcessHandler;
import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.State;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
/**
* StateMachine ProcessHandler
*
- * @see ProcessHandler
* @author lorne.cl
+ * @see ProcessHandler
*/
public class StateMachineProcessHandler implements ProcessHandler {
@@ -53,7 +53,7 @@ public class StateMachineProcessHandler implements ProcessHandler {
List<StateHandlerInterceptor> interceptors = null;
if (stateHandler instanceof InterceptibleStateHandler) {
- interceptors = ((InterceptibleStateHandler) stateHandler).getInterceptors();
+ interceptors = ((InterceptibleStateHandler)stateHandler).getInterceptors();
}
List<StateHandlerInterceptor> executedInterceptors = null;
@@ -84,8 +84,8 @@ public class StateMachineProcessHandler implements ProcessHandler {
}
- public void initDefaultHandlers(){
- if(stateHandlers.size() == 0){
+ public void initDefaultHandlers() {
+ if (stateHandlers.size() == 0) {
//ServiceTask
ServiceTaskStateHandler serviceTaskStateHandler = new ServiceTaskStateHandler();
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateMachineProcessRouter.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateMachineProcessRouter.java
index b10c3b150914f251f414a7549b119641ccee735c..7541508e50afe51851cdc6631ae58960eacaf742 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateMachineProcessRouter.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateMachineProcessRouter.java
@@ -15,6 +15,11 @@
*/
package io.seata.saga.engine.pcext;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import io.seata.common.exception.FrameworkException;
import io.seata.saga.engine.StateMachineConfig;
import io.seata.saga.engine.pcext.interceptors.EndStateRouterInterceptor;
@@ -27,16 +32,12 @@ import io.seata.saga.proctrl.ProcessRouter;
import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.State;
import io.seata.saga.statelang.domain.StateMachine;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
/**
* StateMachine ProcessRouter
*
- * @see ProcessRouter
* @author lorne.cl
+ * @see ProcessRouter
*/
public class StateMachineProcessRouter implements ProcessRouter {
@@ -48,17 +49,17 @@ public class StateMachineProcessRouter implements ProcessRouter {
StateInstruction stateInstruction = context.getInstruction(StateInstruction.class);
State state;
- if(stateInstruction.getTemporaryState() != null){
+ if (stateInstruction.getTemporaryState() != null) {
state = stateInstruction.getTemporaryState();
stateInstruction.setTemporaryState(null);
- }
- else{
- StateMachineConfig stateMachineConfig = (StateMachineConfig) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
- StateMachine stateMachine = stateMachineConfig.getStateMachineRepository().getStateMachine(stateInstruction.getStateMachineName(), stateInstruction.getTenantId());
+ } else {
+ StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+ StateMachine stateMachine = stateMachineConfig.getStateMachineRepository().getStateMachine(
+ stateInstruction.getStateMachineName(), stateInstruction.getTenantId());
state = stateMachine.getStates().get(stateInstruction.getStateName());
}
-
String stateType = state.getType();
StateRouter router = stateRouters.get(stateType);
@@ -67,7 +68,7 @@ public class StateMachineProcessRouter implements ProcessRouter {
List<StateRouterInterceptor> interceptors = null;
if (router instanceof InterceptibleStateRouter) {
- interceptors = ((InterceptibleStateRouter) router).getInterceptors();
+ interceptors = ((InterceptibleStateRouter)router).getInterceptors();
}
List<StateRouterInterceptor> executedInterceptors = null;
@@ -96,7 +97,7 @@ public class StateMachineProcessRouter implements ProcessRouter {
}
//if 'Succeed' or 'Fail' State did not configured, we must end the state machine
- if(instruction == null && !stateInstruction.isEnd()){
+ if (instruction == null && !stateInstruction.isEnd()) {
EngineUtils.endStateMachine(context);
}
}
@@ -104,8 +105,8 @@ public class StateMachineProcessRouter implements ProcessRouter {
return instruction;
}
- public void initDefaultStateRouters(){
- if(this.stateRouters.size() == 0){
+ public void initDefaultStateRouters() {
+ if (this.stateRouters.size() == 0) {
TaskStateRouter taskStateRouter = new TaskStateRouter();
this.stateRouters.put(DomainConstants.STATE_TYPE_SERVICE_TASK, taskStateRouter);
this.stateRouters.put(DomainConstants.STATE_TYPE_CHOICE, taskStateRouter);
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateRouterInterceptor.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateRouterInterceptor.java
index f3fc8c5f0e09e3f1176aafe5bb7733613b59d2ac..2a829575e98a2da24e76fc895642a6d9f9ffa32c 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateRouterInterceptor.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/StateRouterInterceptor.java
@@ -23,8 +23,8 @@ import io.seata.saga.statelang.domain.State;
/**
* StateRouter Interceptor
*
- * @see StateRouter
* @author lorne.cl
+ * @see StateRouter
*/
public interface StateRouterInterceptor {
@@ -46,5 +46,6 @@ public interface StateRouterInterceptor {
* @param e
* @throws EngineExecutionException
*/
- void postRoute(ProcessContext context, State state, Instruction instruction, Exception e) throws EngineExecutionException;
+ void postRoute(ProcessContext context, State state, Instruction instruction, Exception e)
+ throws EngineExecutionException;
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/ChoiceStateHandler.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/ChoiceStateHandler.java
index 0ced324f78352fbd498e9235bd0aea57aa4ce4b5..8b5d907e46301b4f43348c89fa6b3e450639f820 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/ChoiceStateHandler.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/ChoiceStateHandler.java
@@ -15,6 +15,10 @@
*/
package io.seata.saga.engine.pcext.handlers;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
import io.seata.saga.engine.StateMachineConfig;
import io.seata.saga.engine.evaluation.Evaluator;
import io.seata.saga.engine.evaluation.EvaluatorFactory;
@@ -27,12 +31,9 @@ import io.seata.saga.statelang.domain.ChoiceState;
import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.impl.ChoiceStateImpl;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
/**
* ChoiceState Handler
+ *
* @author lorne.cl
*/
public class ChoiceStateHandler implements StateHandler {
@@ -44,18 +45,17 @@ public class ChoiceStateHandler implements StateHandler {
ChoiceStateImpl choiceState = (ChoiceStateImpl)instruction.getState(context);
Map<Object, String> choiceEvaluators = choiceState.getChoiceEvaluators();
- if(choiceEvaluators == null){
- synchronized (choiceState){
+ if (choiceEvaluators == null) {
+ synchronized (choiceState) {
choiceEvaluators = choiceState.getChoiceEvaluators();
- if(choiceEvaluators == null){
+ if (choiceEvaluators == null) {
List<ChoiceState.Choice> choices = choiceState.getChoices();
- if(choices == null){
+ if (choices == null) {
choiceEvaluators = new LinkedHashMap<>(0);
- }
- else{
+ } else {
choiceEvaluators = new LinkedHashMap<>(choices.size());
- for(ChoiceState.Choice choice : choices){
+ for (ChoiceState.Choice choice : choices) {
Evaluator evaluator = getEvaluatorFactory(context).createEvaluator(choice.getExpression());
choiceEvaluators.put(evaluator, choice.getNext());
}
@@ -65,9 +65,9 @@ public class ChoiceStateHandler implements StateHandler {
}
}
- for(Object choiceEvaluatorObj : choiceEvaluators.keySet()){
- Evaluator evaluator = (Evaluator) choiceEvaluatorObj;
- if(evaluator.evaluate(context.getVariables())){
+ for (Object choiceEvaluatorObj : choiceEvaluators.keySet()) {
+ Evaluator evaluator = (Evaluator)choiceEvaluatorObj;
+ if (evaluator.evaluate(context.getVariables())) {
context.setVariable(DomainConstants.VAR_NAME_CURRENT_CHOICE, choiceEvaluators.get(evaluator));
return;
}
@@ -77,7 +77,9 @@ public class ChoiceStateHandler implements StateHandler {
}
public EvaluatorFactory getEvaluatorFactory(ProcessContext context) {
- StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
- return stateMachineConfig.getEvaluatorFactoryManager().getEvaluatorFactory(EvaluatorFactoryManager.EVALUATOR_TYPE_DEFAULT);
+ StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+ return stateMachineConfig.getEvaluatorFactoryManager().getEvaluatorFactory(
+ EvaluatorFactoryManager.EVALUATOR_TYPE_DEFAULT);
}
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/CompensationTriggerStateHandler.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/CompensationTriggerStateHandler.java
index bd0b01d0adde94bdc2a9549fbc1c9ab09ae4535f..bd696714b464c049af2cc8d3d1b174f95504e88e 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/CompensationTriggerStateHandler.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/CompensationTriggerStateHandler.java
@@ -15,6 +15,8 @@
*/
package io.seata.saga.engine.pcext.handlers;
+import java.util.List;
+import java.util.Stack;
import io.seata.saga.engine.StateMachineConfig;
import io.seata.saga.engine.exception.EngineExecutionException;
@@ -27,8 +29,6 @@ import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.ExecutionStatus;
import io.seata.saga.statelang.domain.StateInstance;
import io.seata.saga.statelang.domain.StateMachineInstance;
-import java.util.List;
-import java.util.Stack;
/**
* CompensationTriggerState Handler
@@ -43,39 +43,44 @@ public class CompensationTriggerStateHandler implements StateHandler {
StateInstruction instruction = context.getInstruction(StateInstruction.class);
- StateMachineInstance stateMachineInstance = (StateMachineInstance) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_INST);
- StateMachineConfig stateMachineConfig = (StateMachineConfig) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+ StateMachineInstance stateMachineInstance = (StateMachineInstance)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_INST);
+ StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
List<StateInstance> stateInstanceList = null;
if (stateMachineInstance != null) {
stateInstanceList = stateMachineInstance.getStateList();
- }
- else if (stateMachineConfig.getStateLogStore() != null) {
- stateInstanceList = stateMachineConfig.getStateLogStore().queryStateInstanceListByMachineInstanceId(stateMachineInstance.getId());
+ } else if (stateMachineConfig.getStateLogStore() != null) {
+ stateInstanceList = stateMachineConfig.getStateLogStore().queryStateInstanceListByMachineInstanceId(
+ stateMachineInstance.getId());
}
- List<StateInstance> stateListToBeCompensated = CompensationHolder.findStateInstListToBeCompensated(context, stateInstanceList);
- if(stateListToBeCompensated != null && stateListToBeCompensated.size() > 0){
+ List<StateInstance> stateListToBeCompensated = CompensationHolder.findStateInstListToBeCompensated(context,
+ stateInstanceList);
+ if (stateListToBeCompensated != null && stateListToBeCompensated.size() > 0) {
//Clear exceptions that occur during forward execution
context.removeVariable(DomainConstants.VAR_NAME_CURRENT_EXCEPTION);
- Stack<StateInstance> stateStackToBeCompensated = CompensationHolder.getCurrent(context, true).getStateStackNeedCompensation();
+ Stack<StateInstance> stateStackToBeCompensated = CompensationHolder.getCurrent(context, true)
+ .getStateStackNeedCompensation();
stateStackToBeCompensated.addAll(stateListToBeCompensated);
-
//If the forward running state is empty or running,
// it indicates that the compensation state is automatically initiated in the state machine,
// and the forward state needs to be changed to the UN state.
- //If the forward status is not the two states, then the compensation operation should be initiated by server recovery,
+ //If the forward status is not the two states, then the compensation operation should be initiated by
+ // server recovery,
// and the forward state should not be modified.
- if(stateMachineInstance.getStatus() == null || ExecutionStatus.RU.equals(stateMachineInstance.getStatus())) {
+ if (stateMachineInstance.getStatus() == null || ExecutionStatus.RU.equals(
+ stateMachineInstance.getStatus())) {
stateMachineInstance.setStatus(ExecutionStatus.UN);
}
- //Record the status of the state machine as "compensating", and the subsequent routing logic will route to the compensation state
+ //Record the status of the state machine as "compensating", and the subsequent routing logic will route
+ // to the compensation state
stateMachineInstance.setCompensationStatus(ExecutionStatus.RU);
context.setVariable(DomainConstants.VAR_NAME_CURRENT_COMPEN_TRIGGER_STATE, instruction.getState(context));
- }
- else{
+ } else {
EngineUtils.endStateMachine(context);
}
}
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/FailEndStateHandler.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/FailEndStateHandler.java
index 656ada93143af0103afdc64157942e5e9ad32691..19249ebcc628e58f99626b8d78fd4949ffb5a2b8 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/FailEndStateHandler.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/FailEndStateHandler.java
@@ -15,6 +15,7 @@
*/
package io.seata.saga.engine.pcext.handlers;
+import java.util.Map;
import io.seata.saga.engine.exception.EngineExecutionException;
import io.seata.saga.engine.pcext.StateHandler;
@@ -23,10 +24,9 @@ import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.FailEndState;
-import java.util.Map;
-
/**
* FailEndState Handler
+ *
* @author lorne.cl
*/
public class FailEndStateHandler implements StateHandler {
@@ -37,8 +37,9 @@ public class FailEndStateHandler implements StateHandler {
context.setVariable(DomainConstants.VAR_NAME_FAIL_END_STATE_FLAG, true);
StateInstruction instruction = context.getInstruction(StateInstruction.class);
- FailEndState state = (FailEndState) instruction.getState(context);
- Map<String, Object> contextVariables = (Map<String, Object>) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT);
+ FailEndState state = (FailEndState)instruction.getState(context);
+ Map<String, Object> contextVariables = (Map<String, Object>)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT);
contextVariables.put(DomainConstants.VAR_NAME_STATEMACHINE_ERROR_CODE, state.getErrorCode());
contextVariables.put(DomainConstants.VAR_NAME_STATEMACHINE_ERROR_MSG, state.getMessage());
}
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/ServiceTaskStateHandler.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/ServiceTaskStateHandler.java
index 545dd468a07543af97263e5b968d122c92406c68..f6cc45112ba684cb5614e4f6c5ef61496adbff58 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/ServiceTaskStateHandler.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/ServiceTaskStateHandler.java
@@ -15,6 +15,11 @@
*/
package io.seata.saga.engine.pcext.handlers;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.saga.engine.StateMachineConfig;
import io.seata.saga.engine.StateMachineEngine;
@@ -35,10 +40,6 @@ import io.seata.saga.statelang.domain.StateMachineInstance;
import io.seata.saga.statelang.domain.TaskState;
import io.seata.saga.statelang.domain.impl.AbstractTaskState;
import io.seata.saga.statelang.domain.impl.ServiceTaskStateImpl;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.ApplicationContextAware;
@@ -46,6 +47,7 @@ import org.springframework.util.StringUtils;
/**
* ServiceTaskState Handler
+ *
* @author lorne.cl
*/
public class ServiceTaskStateHandler implements StateHandler, InterceptibleStateHandler {
@@ -54,6 +56,67 @@ public class ServiceTaskStateHandler implements StateHandler, InterceptibleState
private List<StateHandlerInterceptor> interceptors;
+ public static void handleException(ProcessContext context, AbstractTaskState state, Throwable e) {
+ List<TaskState.ExceptionMatch> catches = state.getCatches();
+ if (catches != null && catches.size() > 0) {
+ for (TaskState.ExceptionMatch exceptionMatch : catches) {
+
+ List<String> exceptions = exceptionMatch.getExceptions();
+ List<Class<? extends Exception>> exceptionClasses = exceptionMatch.getExceptionClasses();
+ if (exceptions != null && exceptions.size() > 0) {
+
+ if (exceptionClasses == null) {
+ synchronized (exceptionMatch) {
+ exceptionClasses = exceptionMatch.getExceptionClasses();
+ if (exceptionClasses == null) {
+
+ exceptionClasses = new ArrayList<>(exceptions.size());
+ for (String expStr : exceptions) {
+
+ Class<? extends Exception> expClass = null;
+ try {
+ expClass = (Class<? extends Exception>) ServiceTaskStateHandler.class
+ .getClassLoader().loadClass(expStr);
+ } catch (Exception e1) {
+
+ LOGGER.warn("Cannot Load Exception Class by getClass().getClassLoader()", e1);
+
+ try {
+ expClass = (Class<? extends Exception>) Thread.currentThread()
+ .getContextClassLoader().loadClass(expStr);
+ } catch (Exception e2) {
+ LOGGER.warn(
+ "Cannot Load Exception Class by Thread.currentThread()"
+ + ".getContextClassLoader()",
+ e2);
+ }
+ }
+
+ if (expClass != null) {
+ exceptionClasses.add(expClass);
+ }
+ }
+ exceptionMatch.setExceptionClasses(exceptionClasses);
+ }
+ }
+ }
+
+ for (Class<? extends Exception> expClass : exceptionClasses) {
+ if (expClass.isAssignableFrom(e.getClass())) {
+ ((HierarchicalProcessContext) context).setVariableLocally(
+ DomainConstants.VAR_NAME_CURRENT_EXCEPTION_ROUTE, exceptionMatch.getNext());
+ return;
+ }
+ }
+
+ }
+ }
+ }
+
+ LOGGER.error("Task execution failed and no catches configured");
+ ((HierarchicalProcessContext) context).setVariableLocally(DomainConstants.VAR_NAME_IS_EXCEPTION_NOT_CATCH, true);
+ }
+
@Override
public void process(ProcessContext context) throws EngineExecutionException {
@@ -67,149 +130,110 @@ public class ServiceTaskStateHandler implements StateHandler, InterceptibleState
Object result;
try {
- List<Object> input = (List<Object>)context.getVariable(DomainConstants.VAR_NAME_INPUT_PARAMS);
+ List<Object> input = (List<Object>) context.getVariable(DomainConstants.VAR_NAME_INPUT_PARAMS);
//Set the current task execution status to RU (Running)
stateInstance.setStatus(ExecutionStatus.RU);
- if(LOGGER.isInfoEnabled()){
- LOGGER.info(">>>>>>>>>>>>>>>>>>>>>> Start to execute State[" + state.getName() + "], ServiceName[" + serviceName + "], Method["
- + methodName + "], Input:" + input);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(">>>>>>>>>>>>>>>>>>>>>> Start to execute State[{}], ServiceName[{}], Method[{}], Input:{}",
+ state.getName(), serviceName, methodName, input);
}
- if(state instanceof CompensateSubStateMachineState){
+ if (state instanceof CompensateSubStateMachineState) {
//If it is the compensation of the substate machine,
// directly call the state machine's compensate method
- result = compensateSubStateMachine(context, state, input, stateInstance, (StateMachineEngine) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_ENGINE));
- }
- else{
- StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
-
- ServiceInvoker serviceInvoker = stateMachineConfig.getServiceInvokerManager().getServiceInvoker(state.getServiceType());
- if(serviceInvoker == null){
- throw new EngineExecutionException("No such ServiceInvoker[" + state.getServiceType() + "]", FrameworkErrorCode.ObjectNotExists);
+ result = compensateSubStateMachine(context, state, input, stateInstance,
+ (StateMachineEngine) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_ENGINE));
+ } else {
+ StateMachineConfig stateMachineConfig = (StateMachineConfig) context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+
+ ServiceInvoker serviceInvoker = stateMachineConfig.getServiceInvokerManager().getServiceInvoker(
+ state.getServiceType());
+ if (serviceInvoker == null) {
+ throw new EngineExecutionException("No such ServiceInvoker[" + state.getServiceType() + "]",
+ FrameworkErrorCode.ObjectNotExists);
}
- if(serviceInvoker instanceof ApplicationContextAware){
- ((ApplicationContextAware)serviceInvoker).setApplicationContext(stateMachineConfig.getApplicationContext());
+ if (serviceInvoker instanceof ApplicationContextAware) {
+ ((ApplicationContextAware) serviceInvoker).setApplicationContext(
+ stateMachineConfig.getApplicationContext());
}
result = serviceInvoker.invoke(state, input.toArray());
}
- if(LOGGER.isInfoEnabled()){
- LOGGER.info("<<<<<<<<<<<<<<<<<<<<<< State[" + state.getName() + "], ServiceName[" + serviceName + "], Method[" + methodName
- + "] Execute finish. result: " + result);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("<<<<<<<<<<<<<<<<<<<<<< State[{}], ServiceName[{}], Method[{}] Execute finish. result: {}",
+ state.getName(), serviceName, methodName, result);
}
- if(result != null){
- ((HierarchicalProcessContext)context).setVariableLocally(DomainConstants.VAR_NAME_OUTPUT_PARAMS, result);
+ if (result != null) {
+ stateInstance.setOutputParams(result);
+ ((HierarchicalProcessContext) context).setVariableLocally(DomainConstants.VAR_NAME_OUTPUT_PARAMS,
+ result);
}
- } catch (Exception e) {
+ } catch (Throwable e) {
- LOGGER.error("<<<<<<<<<<<<<<<<<<<<<< State[" + state.getName() + "], ServiceName[" + serviceName + "], Method[" + methodName + "] Execute failed.", e);
+ LOGGER.error("<<<<<<<<<<<<<<<<<<<<<< State[{}], ServiceName[{}], Method[{}] Execute failed.",
+ state.getName(), serviceName, methodName, e);
- ((HierarchicalProcessContext)context).setVariableLocally(DomainConstants.VAR_NAME_CURRENT_EXCEPTION, e);
+ ((HierarchicalProcessContext) context).setVariableLocally(DomainConstants.VAR_NAME_CURRENT_EXCEPTION, e);
handleException(context, state, e);
}
}
- private Object compensateSubStateMachine(ProcessContext context, ServiceTaskState state, Object input, StateInstance stateInstance, StateMachineEngine engine){
+ private Object compensateSubStateMachine(ProcessContext context, ServiceTaskState state, Object input,
+ StateInstance stateInstance, StateMachineEngine engine) {
- String subStateMachineParentId = (String) context.getVariable(state.getName()+DomainConstants.VAR_NAME_SUB_MACHINE_PARENT_ID);
- if(StringUtils.isEmpty(subStateMachineParentId)){
- throw new EngineExecutionException("sub statemachine parentId is required", FrameworkErrorCode.ObjectNotExists);
+ String subStateMachineParentId = (String) context.getVariable(
+ state.getName() + DomainConstants.VAR_NAME_SUB_MACHINE_PARENT_ID);
+ if (StringUtils.isEmpty(subStateMachineParentId)) {
+ throw new EngineExecutionException("sub statemachine parentId is required",
+ FrameworkErrorCode.ObjectNotExists);
}
- StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
- List<StateMachineInstance> subInst = stateMachineConfig.getStateLogStore().queryStateMachineInstanceByParentId(subStateMachineParentId);
- if(subInst==null || subInst.size() <= 0){
- throw new EngineExecutionException("cannot find sub statemachine instance by parentId:"+subStateMachineParentId, FrameworkErrorCode.ObjectNotExists);
+ StateMachineConfig stateMachineConfig = (StateMachineConfig) context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+ List<StateMachineInstance> subInst = stateMachineConfig.getStateLogStore().queryStateMachineInstanceByParentId(
+ subStateMachineParentId);
+ if (subInst == null || subInst.size() <= 0) {
+ throw new EngineExecutionException(
+ "cannot find sub statemachine instance by parentId:" + subStateMachineParentId,
+ FrameworkErrorCode.ObjectNotExists);
}
String subStateMachineInstId = subInst.get(0).getId();
- if(LOGGER.isInfoEnabled()){
- LOGGER.info(">>>>>>>>>>>>>>>>>>>>>> Start to compensate sub statemachine [id:"+ subStateMachineInstId +"]");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(">>>>>>>>>>>>>>>>>>>>>> Start to compensate sub statemachine [id:{}]", subStateMachineInstId);
}
Map<String, Object> startParams = new HashMap<>(0);
- if(input instanceof List){
+ if (input instanceof List) {
List<Object> listInputParams = (List<Object>) input;
- if(listInputParams.size() > 0){
+ if (listInputParams.size() > 0) {
startParams = (Map<String, Object>) listInputParams.get(0);
}
- }
- else if(input instanceof Map){
+ } else if (input instanceof Map) {
startParams = (Map<String, Object>) input;
}
StateMachineInstance compensateInst = engine.compensate(subStateMachineInstId, startParams);
stateInstance.setStatus(compensateInst.getCompensationStatus());
- if(LOGGER.isInfoEnabled()){
- LOGGER.info(">>>>>>>>>>>>>>>>>>>>>> Compensate sub statemachine [id:"+ subStateMachineInstId +"] finished with status["+compensateInst.getStatus()+"], compensateState["+ compensateInst.getCompensationStatus() +"]");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(
+ "<<<<<<<<<<<<<<<<<<<<<< Compensate sub statemachine [id:{}] finished with status[{}], "
+ + "compensateState[{}]",
+ subStateMachineInstId, compensateInst.getStatus(), compensateInst.getCompensationStatus());
}
return compensateInst.getEndParams();
}
- public static void handleException(ProcessContext context, AbstractTaskState state, Exception e) {
- List<TaskState.ExceptionMatch> catches = state.getCatches();
- if(catches != null && catches.size() > 0){
- for(TaskState.ExceptionMatch exceptionMatch : catches){
-
- List<String> exceptions = exceptionMatch.getExceptions();
- List<Class<? extends Exception>> exceptionClasses = exceptionMatch.getExceptionClasses();
- if(exceptions != null && exceptions.size() > 0){
-
- if(exceptionClasses == null){
- synchronized (exceptionMatch) {
- exceptionClasses = exceptionMatch.getExceptionClasses();
- if(exceptionClasses == null){
-
- exceptionClasses = new ArrayList<>(exceptions.size());
- for(String expStr : exceptions){
-
- Class<? extends Exception> expClass = null;
- try {
- expClass = (Class<? extends Exception>) ServiceTaskStateHandler.class.getClassLoader().loadClass(expStr);
- } catch (Exception e1) {
-
- LOGGER.warn("Cannot Load Exception Class by getClass().getClassLoader()", e1);
-
- try {
- expClass = (Class<? extends Exception>) Thread.currentThread().getContextClassLoader().loadClass(expStr);
- } catch (Exception e2) {
- LOGGER.warn("Cannot Load Exception Class by Thread.currentThread().getContextClassLoader()", e2);
- }
- }
-
- if(expClass != null){
- exceptionClasses.add(expClass);
- }
- }
-
- }
- }
- }
-
- for(Class<? extends Exception> expClass : exceptionClasses){
- if(expClass.isAssignableFrom(e.getClass())){
- ((HierarchicalProcessContext)context).setVariableLocally(DomainConstants.VAR_NAME_CURRENT_EXCEPTION_ROUTE, exceptionMatch.getNext());
- return;
- }
- }
-
- }
- }
- }
-
- LOGGER.error("Task execution failed and no catches configured");
- ((HierarchicalProcessContext)context).setVariableLocally(DomainConstants.VAR_NAME_IS_EXCEPTION_NOT_CATCH, true);
- }
-
@Override
public List<StateHandlerInterceptor> getInterceptors() {
return interceptors;
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/SubStateMachineHandler.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/SubStateMachineHandler.java
index 35f0bf64482edc46e20af8ec9da6e70ebd41629f..e508264972c47b09f1b29ec8e073e1c32f062a2e 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/SubStateMachineHandler.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/SubStateMachineHandler.java
@@ -15,6 +15,10 @@
*/
package io.seata.saga.engine.pcext.handlers;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.saga.engine.StateMachineConfig;
import io.seata.saga.engine.StateMachineEngine;
@@ -25,6 +29,7 @@ import io.seata.saga.engine.pcext.StateHandler;
import io.seata.saga.engine.pcext.StateHandlerInterceptor;
import io.seata.saga.engine.pcext.StateInstruction;
import io.seata.saga.engine.pcext.utils.EngineUtils;
+import io.seata.saga.engine.store.StateLogStore;
import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.ExecutionStatus;
@@ -32,16 +37,13 @@ import io.seata.saga.statelang.domain.StateInstance;
import io.seata.saga.statelang.domain.StateMachineInstance;
import io.seata.saga.statelang.domain.SubStateMachine;
import io.seata.saga.statelang.domain.impl.SubStateMachineImpl;
-import io.seata.saga.engine.store.StateLogStore;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
/**
* SubStateMachine Handler
+ *
* @author lorne.cl
*/
public class SubStateMachineHandler implements StateHandler, InterceptibleStateHandler {
@@ -50,62 +52,84 @@ public class SubStateMachineHandler implements StateHandler, InterceptibleStateH
private List<StateHandlerInterceptor> interceptors;
+ private static ExecutionStatus decideStatus(StateMachineInstance stateMachineInstance, boolean isForward) {
+
+ if (isForward && ExecutionStatus.SU.equals(stateMachineInstance.getStatus())) {
+ return ExecutionStatus.SU;
+ } else if (stateMachineInstance.getCompensationStatus() == null || ExecutionStatus.FA.equals(
+ stateMachineInstance.getCompensationStatus())) {
+ return stateMachineInstance.getStatus();
+ } else if (ExecutionStatus.SU.equals(stateMachineInstance.getCompensationStatus())) {
+ return ExecutionStatus.FA;
+ } else {
+ return ExecutionStatus.UN;
+ }
+ }
+
@Override
public void process(ProcessContext context) throws EngineExecutionException {
StateInstruction instruction = context.getInstruction(StateInstruction.class);
- SubStateMachineImpl subStateMachine = (SubStateMachineImpl) instruction.getState(context);
+ SubStateMachineImpl subStateMachine = (SubStateMachineImpl)instruction.getState(context);
- StateMachineEngine engine = (StateMachineEngine) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_ENGINE);
- StateMachineInstance stateMachineInstance = (StateMachineInstance) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_INST);
- StateInstance stateInstance = (StateInstance) context.getVariable(DomainConstants.VAR_NAME_STATE_INST);
+ StateMachineEngine engine = (StateMachineEngine)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_ENGINE);
+ StateMachineInstance stateMachineInstance = (StateMachineInstance)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_INST);
+ StateInstance stateInstance = (StateInstance)context.getVariable(DomainConstants.VAR_NAME_STATE_INST);
Object inputParamsObj = context.getVariable(DomainConstants.VAR_NAME_INPUT_PARAMS);
Map<String, Object> startParams = new HashMap<>(0);
- if(inputParamsObj instanceof List){
- List<Object> listInputParams = (List<Object>) inputParamsObj;
- if(listInputParams.size() > 0){
- startParams = (Map<String, Object>) listInputParams.get(0);
+ if (inputParamsObj instanceof List) {
+ List<Object> listInputParams = (List<Object>)inputParamsObj;
+ if (listInputParams.size() > 0) {
+ startParams = (Map<String, Object>)listInputParams.get(0);
}
- }
- else if(inputParamsObj instanceof Map){
- startParams = (Map<String, Object>) inputParamsObj;
+ } else if (inputParamsObj instanceof Map) {
+ startParams = (Map<String, Object>)inputParamsObj;
}
startParams.put(DomainConstants.VAR_NAME_PARENT_ID, EngineUtils.generateParentId(stateInstance));
try {
- if(LOGGER.isInfoEnabled()){
- LOGGER.info(">>>>>>>>>>>>>>>>>>>>>> Start to execute SubStateMachine ["+ subStateMachine.getStateMachineName() +"] by state["+subStateMachine.getName()+"]");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(">>>>>>>>>>>>>>>>>>>>>> Start to execute SubStateMachine [{}] by state[{}]",
+ subStateMachine.getStateMachineName(), subStateMachine.getName());
}
- StateMachineInstance subStateMachineInstance = callSubStateMachine(startParams, engine, context, stateInstance, subStateMachine);
+ StateMachineInstance subStateMachineInstance = callSubStateMachine(startParams, engine, context,
+ stateInstance, subStateMachine);
Map<String, Object> outputParams = subStateMachineInstance.getEndParams();
- boolean isForward = DomainConstants.VAR_NAME_OPERATION_NAME.equals(context.getVariable(DomainConstants.VAR_NAME_OPERATION_NAME));
+ boolean isForward = DomainConstants.VAR_NAME_OPERATION_NAME.equals(
+ context.getVariable(DomainConstants.VAR_NAME_OPERATION_NAME));
ExecutionStatus callSubMachineStatus = decideStatus(subStateMachineInstance, isForward);
stateInstance.setStatus(callSubMachineStatus);
outputParams.put(DomainConstants.VAR_NAME_SUB_STATEMACHINE_EXEC_STATUE, callSubMachineStatus.toString());
context.setVariable(DomainConstants.VAR_NAME_OUTPUT_PARAMS, outputParams);
stateInstance.setOutputParams(outputParams);
- if(LOGGER.isInfoEnabled()){
- LOGGER.info("<<<<<<<<<<<<<<<<<<<<<< SubStateMachine["+ subStateMachine.getStateMachineName() +"] execute finish with status["+ subStateMachineInstance.getStatus() +"], compensateStatus["+subStateMachineInstance.getCompensationStatus()+"]");
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(
+ "<<<<<<<<<<<<<<<<<<<<<< SubStateMachine[{}] execute finish with status[{}], compensateStatus[{}]",
+ subStateMachine.getStateMachineName(), subStateMachineInstance.getStatus(),
+ subStateMachineInstance.getCompensationStatus());
}
} catch (Exception e) {
- LOGGER.error("SubStateMachine["+subStateMachine.getStateMachineName()+"] execute failed by state[name:"+subStateMachine.getName()+"]", e);
+ LOGGER.error("SubStateMachine[{}] execute failed by state[name:{}]", subStateMachine.getStateMachineName(),
+ subStateMachine.getName(), e);
- if(e instanceof ForwardInvalidException) {
+ if (e instanceof ForwardInvalidException) {
String retriedId = stateInstance.getStateIdRetriedFor();
StateInstance stateToBeRetried = null;
- for(StateInstance stateInst : stateMachineInstance.getStateList()) {
- if(retriedId.equals(stateInst.getId())) {
+ for (StateInstance stateInst : stateMachineInstance.getStateList()) {
+ if (retriedId.equals(stateInst.getId())) {
stateToBeRetried = stateInst;
break;
}
}
- if(stateToBeRetried != null) {
+ if (stateToBeRetried != null) {
stateInstance.setStatus(stateToBeRetried.getStatus());
}
}
@@ -116,8 +140,10 @@ public class SubStateMachineHandler implements StateHandler, InterceptibleStateH
}
}
- private StateMachineInstance callSubStateMachine(Map<String, Object> startParams, StateMachineEngine engine, ProcessContext context, StateInstance stateInstance, SubStateMachine subStateMachine){
- if(!context.hasVariable(DomainConstants.VAR_NAME_IS_FOR_SUB_STATMACHINE_FORWARD)) {
+ private StateMachineInstance callSubStateMachine(Map<String, Object> startParams, StateMachineEngine engine,
+ ProcessContext context, StateInstance stateInstance,
+ SubStateMachine subStateMachine) {
+ if (!context.hasVariable(DomainConstants.VAR_NAME_IS_FOR_SUB_STATMACHINE_FORWARD)) {
return startNewStateMachine(startParams, engine, stateInstance, subStateMachine);
} else {
context.removeVariable(DomainConstants.VAR_NAME_IS_FOR_SUB_STATMACHINE_FORWARD);
@@ -126,50 +152,46 @@ public class SubStateMachineHandler implements StateHandler, InterceptibleStateH
}
}
- private static ExecutionStatus decideStatus(StateMachineInstance stateMachineInstance, boolean isForward) {
-
- if(isForward && ExecutionStatus.SU.equals(stateMachineInstance.getStatus())){
- return ExecutionStatus.SU;
- }
- else if(stateMachineInstance.getCompensationStatus() == null || ExecutionStatus.FA.equals(stateMachineInstance.getCompensationStatus())) {
- return stateMachineInstance.getStatus();
- } else if(ExecutionStatus.SU.equals(stateMachineInstance.getCompensationStatus())) {
- return ExecutionStatus.FA;
- } else {
- return ExecutionStatus.UN;
- }
- }
-
- private StateMachineInstance startNewStateMachine(Map<String, Object> startParams, StateMachineEngine engine, StateInstance stateInstance, SubStateMachine subStateMachine){
+ private StateMachineInstance startNewStateMachine(Map<String, Object> startParams, StateMachineEngine engine,
+ StateInstance stateInstance, SubStateMachine subStateMachine) {
StateMachineInstance subStateMachineInstance;
if (stateInstance.getBusinessKey() != null) {
- subStateMachineInstance = engine.startWithBusinessKey(subStateMachine.getStateMachineName(), stateInstance.getStateMachineInstance().getTenantId(), stateInstance.getBusinessKey(), startParams);
+ subStateMachineInstance = engine.startWithBusinessKey(subStateMachine.getStateMachineName(),
+ stateInstance.getStateMachineInstance().getTenantId(), stateInstance.getBusinessKey(), startParams);
} else {
- subStateMachineInstance = engine.start(subStateMachine.getStateMachineName(), stateInstance.getStateMachineInstance().getTenantId(), startParams);
+ subStateMachineInstance = engine.start(subStateMachine.getStateMachineName(),
+ stateInstance.getStateMachineInstance().getTenantId(), startParams);
}
return subStateMachineInstance;
}
- private StateMachineInstance forwardStateMachine(Map<String, Object> startParams, StateMachineEngine engine, ProcessContext context, StateInstance stateInstance, SubStateMachine subStateMachine){
- StateMachineConfig stateMachineConfig = (StateMachineConfig) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+ private StateMachineInstance forwardStateMachine(Map<String, Object> startParams, StateMachineEngine engine,
+ ProcessContext context, StateInstance stateInstance,
+ SubStateMachine subStateMachine) {
+ StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
StateLogStore statePersister = stateMachineConfig.getStateLogStore();
- if(statePersister == null){
+ if (statePersister == null) {
throw new ForwardInvalidException("StatePersister is not configured", FrameworkErrorCode.ObjectNotExists);
}
StateInstance originalStateInst = stateInstance;
do {
- originalStateInst = statePersister.getStateInstance(originalStateInst.getStateIdRetriedFor(), originalStateInst.getMachineInstanceId());
+ originalStateInst = statePersister.getStateInstance(originalStateInst.getStateIdRetriedFor(),
+ originalStateInst.getMachineInstanceId());
} while (StringUtils.hasText(originalStateInst.getStateIdRetriedFor()));
- List<StateMachineInstance> subInst = statePersister.queryStateMachineInstanceByParentId(EngineUtils.generateParentId(originalStateInst));
- if(subInst.size() > 0) {
+ List<StateMachineInstance> subInst = statePersister.queryStateMachineInstanceByParentId(
+ EngineUtils.generateParentId(originalStateInst));
+ if (subInst.size() > 0) {
String subInstId = subInst.get(0).getId();
return engine.forward(subInstId, startParams);
} else {
- throw new ForwardInvalidException("Cannot find sub statemachine ["+subStateMachine.getStateMachineName()+"]", FrameworkErrorCode.ObjectNotExists);
+ throw new ForwardInvalidException(
+ "Cannot find sub statemachine [" + subStateMachine.getStateMachineName() + "]",
+ FrameworkErrorCode.ObjectNotExists);
}
}
@@ -181,4 +203,4 @@ public class SubStateMachineHandler implements StateHandler, InterceptibleStateH
public void setInterceptors(List<StateHandlerInterceptor> interceptors) {
this.interceptors = interceptors;
}
-}
\ No newline at end of file
+}
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/SucceedEndStateHandler.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/SucceedEndStateHandler.java
index 75e7226b74a7093ac34f6f09b95fc4f0bbcf022e..6da4d16c49ed6baad7b009ce352a92a470522485 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/SucceedEndStateHandler.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/SucceedEndStateHandler.java
@@ -21,6 +21,7 @@ import io.seata.saga.proctrl.ProcessContext;
/**
* SucceedEndState Handler
+ *
* @author lorne.cl
*/
public class SucceedEndStateHandler implements StateHandler {
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/EndStateRouterInterceptor.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/EndStateRouterInterceptor.java
index a1f3ac3a5c0bfffeda352182bd54e4e3f6c10929..b94777bc434b2692a018c341c83d0026f8531bdd 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/EndStateRouterInterceptor.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/EndStateRouterInterceptor.java
@@ -24,6 +24,7 @@ import io.seata.saga.statelang.domain.State;
/**
* EndStateRouter Interceptor
+ *
* @author lorne.cl
*/
public class EndStateRouterInterceptor implements StateRouterInterceptor {
@@ -34,7 +35,8 @@ public class EndStateRouterInterceptor implements StateRouterInterceptor {
}
@Override
- public void postRoute(ProcessContext context, State state, Instruction instruction, Exception e) throws EngineExecutionException {
+ public void postRoute(ProcessContext context, State state, Instruction instruction, Exception e)
+ throws EngineExecutionException {
EngineUtils.endStateMachine(context);
}
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/ServiceTaskHandlerInterceptor.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/ServiceTaskHandlerInterceptor.java
index e39ec0f976071335fd08286a6e23c4bcd1b90d14..079ae58a818473f2e8a98da57be74d5f787a3363 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/ServiceTaskHandlerInterceptor.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/interceptors/ServiceTaskHandlerInterceptor.java
@@ -15,6 +15,12 @@
*/
package io.seata.saga.engine.pcext.interceptors;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.saga.engine.StateMachineConfig;
import io.seata.saga.engine.evaluation.Evaluator;
@@ -39,46 +45,186 @@ import io.seata.saga.statelang.domain.StateInstance;
import io.seata.saga.statelang.domain.StateMachineInstance;
import io.seata.saga.statelang.domain.impl.ServiceTaskStateImpl;
import io.seata.saga.statelang.domain.impl.StateInstanceImpl;
-
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
/**
* ServiceTaskHandler Interceptor
+ *
* @author lorne.cl
*/
public class ServiceTaskHandlerInterceptor implements StateHandlerInterceptor {
private static final Logger LOGGER = LoggerFactory.getLogger(ServiceTaskHandlerInterceptor.class);
+ private static List<Object> createInputParams(ExpressionFactoryManager expressionFactoryManager,
+ StateInstanceImpl stateInstance,
+ ServiceTaskStateImpl serviceTaskState, Object variablesFrom) {
+
+ List<Object> inputAssignments = serviceTaskState.getInput();
+ if (inputAssignments == null || inputAssignments.size() == 0) {
+ return new ArrayList<>(0);
+ }
+
+ List<Object> inputExpressions = serviceTaskState.getInputExpressions();
+ if (inputExpressions == null) {
+ synchronized (serviceTaskState) {
+ inputExpressions = serviceTaskState.getInputExpressions();
+ if (inputExpressions == null) {
+ inputExpressions = new ArrayList<>(inputAssignments.size());
+ for (Object inputAssignment : inputAssignments) {
+ inputExpressions.add(createValueExpression(expressionFactoryManager, inputAssignment));
+ }
+ }
+ serviceTaskState.setInputExpressions(inputExpressions);
+ }
+ }
+ List<Object> inputValues = new ArrayList<>(inputExpressions.size());
+ for (Object valueExpression : inputExpressions) {
+ Object value = getValue(valueExpression, variablesFrom, stateInstance);
+ inputValues.add(value);
+ }
+
+ return inputValues;
+ }
+
+ public static Map<String, Object> createOutputParams(ExpressionFactoryManager expressionFactoryManager,
+ ServiceTaskStateImpl serviceTaskState, Object variablesFrom) {
+
+ Map<String, Object> outputAssignments = serviceTaskState.getOutput();
+ if (outputAssignments == null || outputAssignments.size() == 0) {
+ return new LinkedHashMap<>(0);
+ }
+
+ Map<String, Object> outputExpressions = serviceTaskState.getOutputExpressions();
+ if (outputExpressions == null) {
+ synchronized (serviceTaskState) {
+ outputExpressions = serviceTaskState.getOutputExpressions();
+ if (outputExpressions == null) {
+ outputExpressions = new LinkedHashMap<>(outputAssignments.size());
+ for (String paramName : outputAssignments.keySet()) {
+ outputExpressions.put(paramName,
+ createValueExpression(expressionFactoryManager, outputAssignments.get(paramName)));
+ }
+ }
+ serviceTaskState.setOutputExpressions(outputExpressions);
+ }
+ }
+ Map<String, Object> outputValues = new LinkedHashMap<>(outputExpressions.size());
+ for (String paramName : outputExpressions.keySet()) {
+ outputValues.put(paramName, getValue(outputExpressions.get(paramName), variablesFrom, null));
+ }
+ return outputValues;
+ }
+
+ private static Object getValue(Object valueExpression, Object variablesFrom, StateInstance stateInstance) {
+ if (valueExpression instanceof Expression) {
+ Object value = ((Expression)valueExpression).getValue(variablesFrom);
+ if (value != null && stateInstance != null && StringUtils.isEmpty(stateInstance.getBusinessKey())
+ && valueExpression instanceof SequenceExpression) {
+ stateInstance.setBusinessKey(String.valueOf(value));
+ }
+ return value;
+ } else if (valueExpression instanceof Map) {
+ Map<String, Object> mapValueExpression = (Map<String, Object>)valueExpression;
+ Map<String, Object> mapValue = new LinkedHashMap<>();
+ for (String paramName : mapValueExpression.keySet()) {
+ Object value = getValue(mapValueExpression.get(paramName), variablesFrom, stateInstance);
+ if (value != null) {
+ mapValue.put(paramName, value);
+ }
+ }
+ return mapValue;
+ } else if (valueExpression instanceof List) {
+ List<Object> listValueExpression = (List<Object>)valueExpression;
+ List<Object> listValue = new ArrayList<>(listValueExpression.size());
+ for (Object aValueExpression : listValueExpression) {
+ listValue.add(getValue(aValueExpression, variablesFrom, stateInstance));
+ }
+ return listValue;
+ } else {
+ return valueExpression;
+ }
+ }
+
+ private static Object createValueExpression(ExpressionFactoryManager expressionFactoryManager,
+ Object paramAssignment) {
+
+ Object valueExpression;
+
+ if (paramAssignment instanceof Expression) {
+ valueExpression = paramAssignment;
+ } else if (paramAssignment instanceof Map) {
+ Map<String, Object> paramMapAssignment = (Map<String, Object>)paramAssignment;
+ Map<String, Object> paramMap = new LinkedHashMap<>(paramMapAssignment.size());
+ for (String paramName : paramMapAssignment.keySet()) {
+ Object valueAssignment = paramMapAssignment.get(paramName);
+ paramMap.put(paramName, createValueExpression(expressionFactoryManager, valueAssignment));
+ }
+ valueExpression = paramMap;
+ } else if (paramAssignment instanceof List) {
+ List<Object> paramListAssignment = (List<Object>)paramAssignment;
+ List<Object> paramList = new ArrayList<>(paramListAssignment.size());
+ for (Object aParamAssignment : paramListAssignment) {
+ paramList.add(createValueExpression(expressionFactoryManager, aParamAssignment));
+ }
+ valueExpression = paramList;
+ } else if (paramAssignment instanceof String && ((String)paramAssignment).startsWith("$")) {
+
+ String expressionStr = (String)paramAssignment;
+ int expTypeStart = expressionStr.indexOf("$");
+ int expTypeEnd = expressionStr.indexOf(".", expTypeStart);
+
+ String expressionType = null;
+ if (expTypeStart >= 0 && expTypeEnd > expTypeStart) {
+ expressionType = expressionStr.substring(expTypeStart + 1, expTypeEnd);
+ }
+
+ int expEnd = expressionStr.length();
+ String expressionContent = null;
+ if (expTypeEnd > 0 && expEnd > expTypeEnd) {
+ expressionContent = expressionStr.substring(expTypeEnd + 1, expEnd);
+ }
+
+ ExpressionFactory expressionFactory = expressionFactoryManager.getExpressionFactory(expressionType);
+ if (expressionFactory == null) {
+ throw new IllegalArgumentException("Cannot get ExpressionFactory by Type[" + expressionType + "]");
+ }
+ valueExpression = expressionFactory.createExpression(expressionContent);
+ } else {
+ valueExpression = paramAssignment;
+ }
+ return valueExpression;
+ }
+
@Override
public void preProcess(ProcessContext context) throws EngineExecutionException {
StateInstruction instruction = context.getInstruction(StateInstruction.class);
- StateMachineInstance stateMachineInstance = (StateMachineInstance) context.getVariable(
- DomainConstants.VAR_NAME_STATEMACHINE_INST);
- StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+ StateMachineInstance stateMachineInstance = (StateMachineInstance)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_INST);
+ StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
StateInstanceImpl stateInstance = new StateInstanceImpl();
- Map<String, Object> contextVariables = (Map<String, Object>) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT);
- ServiceTaskStateImpl state = (ServiceTaskStateImpl) instruction.getState(context);
+ Map<String, Object> contextVariables = (Map<String, Object>)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT);
+ ServiceTaskStateImpl state = (ServiceTaskStateImpl)instruction.getState(context);
List<Object> serviceInputParams = null;
if (contextVariables != null) {
try {
- serviceInputParams = createInputParams(stateMachineConfig.getExpressionFactoryManager(), stateInstance, state, contextVariables);
+ serviceInputParams = createInputParams(stateMachineConfig.getExpressionFactoryManager(), stateInstance,
+ state, contextVariables);
} catch (Exception e) {
- String message = "Task [" + state.getName() + "] input parameters assign failed, please check from/to expression:" + e.getMessage();
+ String message = "Task [" + state.getName()
+ + "] input parameters assign failed, please check from/to expression:" + e.getMessage();
- EngineExecutionException exception = ExceptionUtils.createEngineExecutionException(e, FrameworkErrorCode.VariablesAssignError, message, stateMachineInstance, state.getName());
+ EngineExecutionException exception = ExceptionUtils.createEngineExecutionException(e,
+ FrameworkErrorCode.VariablesAssignError, message, stateMachineInstance, state.getName());
EngineUtils.failStateMachine(context, exception);
@@ -86,7 +232,8 @@ public class ServiceTaskHandlerInterceptor implements StateHandlerInterceptor {
}
}
- ((HierarchicalProcessContext)context).setVariableLocally(DomainConstants.VAR_NAME_INPUT_PARAMS, serviceInputParams);
+ ((HierarchicalProcessContext)context).setVariableLocally(DomainConstants.VAR_NAME_INPUT_PARAMS,
+ serviceInputParams);
stateInstance.setMachineInstanceId(stateMachineInstance.getId());
stateInstance.setStateMachineInstance(stateMachineInstance);
@@ -94,11 +241,13 @@ public class ServiceTaskHandlerInterceptor implements StateHandlerInterceptor {
stateInstance.setGmtStarted(new Date());
stateInstance.setStatus(ExecutionStatus.RU);
- stateInstance.setStateIdRetriedFor((String)context.getVariable(state.getName() + DomainConstants.VAR_NAME_RETRIED_STATE_INST_ID));
+ stateInstance.setStateIdRetriedFor(
+ (String)context.getVariable(state.getName() + DomainConstants.VAR_NAME_RETRIED_STATE_INST_ID));
- if(StringUtils.hasLength(stateInstance.getBusinessKey())) {
+ if (StringUtils.hasLength(stateInstance.getBusinessKey())) {
- ((Map<String, Object>)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT)).put(state.getName()+DomainConstants.VAR_NAME_BUSINESSKEY, stateInstance.getBusinessKey());
+ ((Map<String, Object>)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT)).put(
+ state.getName() + DomainConstants.VAR_NAME_BUSINESSKEY, stateInstance.getBusinessKey());
}
stateInstance.setType(state.getType());
@@ -108,32 +257,31 @@ public class ServiceTaskHandlerInterceptor implements StateHandlerInterceptor {
stateInstance.setServiceMethod(state.getServiceMethod());
stateInstance.setServiceType(state.getServiceType());
-
Object isForCompensation = state.isForCompensation();
- if (isForCompensation != null && (Boolean) isForCompensation) {
+ if (isForCompensation != null && (Boolean)isForCompensation) {
CompensationHolder compensationHolder = CompensationHolder.getCurrent(context, true);
StateInstance stateToBeCompensated = compensationHolder.getStatesNeedCompensation().get(state.getName());
- if(stateToBeCompensated!=null){
+ if (stateToBeCompensated != null) {
stateToBeCompensated.setCompensationState(stateInstance);
stateInstance.setStateIdCompensatedFor(stateToBeCompensated.getId());
+ } else {
+ LOGGER.error("Compensation State[{}] has no state to compensate, maybe this is a bug.",
+ state.getName());
}
- else{
- LOGGER.error("Compensation State["+state.getName()+"] has no state to compensate, maybe this is a bug.");
- }
- CompensationHolder.getCurrent(context, true).addForCompensationState(stateInstance.getName(), stateInstance);
+ CompensationHolder.getCurrent(context, true).addForCompensationState(stateInstance.getName(),
+ stateInstance);
}
- if(DomainConstants.OPERATION_NAME_FORWARD.equals(context.getVariable(DomainConstants.VAR_NAME_OPERATION_NAME))
- && StringUtils.isEmpty(stateInstance.getStateIdRetriedFor())
- && !state.isForCompensation()){
+ if (DomainConstants.OPERATION_NAME_FORWARD.equals(context.getVariable(DomainConstants.VAR_NAME_OPERATION_NAME))
+ && StringUtils.isEmpty(stateInstance.getStateIdRetriedFor()) && !state.isForCompensation()) {
List<StateInstance> stateList = stateMachineInstance.getStateList();
- if(stateList!=null && stateList.size()>0){
- for(int i=stateList.size()-1; i>=0; i--){
+ if (stateList != null && stateList.size() > 0) {
+ for (int i = stateList.size() - 1; i >= 0; i--) {
StateInstance executedState = stateList.get(i);
- if(stateInstance.getName().equals(executedState.getName())){
+ if (stateInstance.getName().equals(executedState.getName())) {
stateInstance.setStateIdRetriedFor(executedState.getId());
executedState.setIgnoreStatus(true);
break;
@@ -144,12 +292,13 @@ public class ServiceTaskHandlerInterceptor implements StateHandlerInterceptor {
stateInstance.setInputParams(serviceInputParams);
- if(stateMachineInstance.getStateMachine().isPersist() && state.isPersist() && stateMachineConfig.getStateLogStore() != null){
+ if (stateMachineInstance.getStateMachine().isPersist() && state.isPersist()
+ && stateMachineConfig.getStateLogStore() != null) {
stateMachineConfig.getStateLogStore().recordStateStarted(stateInstance, context);
}
- if(StringUtils.isEmpty(stateInstance.getId())){
+ if (StringUtils.isEmpty(stateInstance.getId())) {
stateInstance.setId(stateMachineConfig.getSeqGenerator().generate(DomainConstants.SEQ_ENTITY_STATE_INST));
}
stateMachineInstance.putStateInstance(stateInstance.getId(), stateInstance);
@@ -160,19 +309,20 @@ public class ServiceTaskHandlerInterceptor implements StateHandlerInterceptor {
public void postProcess(ProcessContext context, Exception exp) throws EngineExecutionException {
StateInstruction instruction = context.getInstruction(StateInstruction.class);
- ServiceTaskStateImpl state = (ServiceTaskStateImpl) instruction.getState(context);
+ ServiceTaskStateImpl state = (ServiceTaskStateImpl)instruction.getState(context);
- StateMachineInstance stateMachineInstance = (StateMachineInstance) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_INST);
- StateInstance stateInstance = (StateInstance) context.getVariable(DomainConstants.VAR_NAME_STATE_INST);
- if(stateInstance == null){
+ StateMachineInstance stateMachineInstance = (StateMachineInstance)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_INST);
+ StateInstance stateInstance = (StateInstance)context.getVariable(DomainConstants.VAR_NAME_STATE_INST);
+ if (stateInstance == null) {
return;
}
- StateMachineConfig stateMachineConfig = (StateMachineConfig) context.getVariable(
- DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+ StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
- if(exp == null){
- exp = (Exception) context.getVariable(DomainConstants.VAR_NAME_CURRENT_EXCEPTION);
+ if (exp == null) {
+ exp = (Exception)context.getVariable(DomainConstants.VAR_NAME_CURRENT_EXCEPTION);
}
stateInstance.setException(exp);
@@ -180,24 +330,33 @@ public class ServiceTaskHandlerInterceptor implements StateHandlerInterceptor {
if (ExecutionStatus.SU.equals(stateInstance.getStatus()) && exp != null) {
- if (LOGGER.isInfoEnabled()) { LOGGER.info("Although an exception occurs, the execution status map to SU, and the exception is ignored when the execution status decision."); }
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(
+ "Although an exception occurs, the execution status map to SU, and the exception is ignored when "
+ + "the execution status decision.");
+ }
context.removeVariable(DomainConstants.VAR_NAME_CURRENT_EXCEPTION);
}
- Map<String, Object> contextVariables = (Map<String, Object>)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT);
+ Map<String, Object> contextVariables = (Map<String, Object>)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT);
Object serviceOutputParams = context.getVariable(DomainConstants.VAR_NAME_OUTPUT_PARAMS);
if (serviceOutputParams != null) {
try {
- Map<String, Object> outputVariablesToContext = createOutputParams(stateMachineConfig.getExpressionFactoryManager(), state, serviceOutputParams);
- if(outputVariablesToContext != null && outputVariablesToContext.size() > 0){
+ Map<String, Object> outputVariablesToContext = createOutputParams(
+ stateMachineConfig.getExpressionFactoryManager(), state, serviceOutputParams);
+ if (outputVariablesToContext != null && outputVariablesToContext.size() > 0) {
contextVariables.putAll(outputVariablesToContext);
}
} catch (Exception e) {
- String message = "Task [" + state.getName() + "] output parameters assign failed, please check from/to expression:" + e .getMessage();
+ String message = "Task [" + state.getName()
+ + "] output parameters assign failed, please check from/to expression:" + e.getMessage();
- EngineExecutionException exception = ExceptionUtils.createEngineExecutionException(e, FrameworkErrorCode.VariablesAssignError, message, stateMachineInstance, stateInstance);
+ EngineExecutionException exception = ExceptionUtils.createEngineExecutionException(e,
+ FrameworkErrorCode.VariablesAssignError, message, stateMachineInstance, stateInstance);
- if(stateMachineInstance.getStateMachine().isPersist() && state.isPersist() && stateMachineConfig.getStateLogStore() != null){
+ if (stateMachineInstance.getStateMachine().isPersist() && state.isPersist()
+ && stateMachineConfig.getStateLogStore() != null) {
stateMachineConfig.getStateLogStore().recordStateFinished(stateInstance, context);
}
@@ -213,11 +372,14 @@ public class ServiceTaskHandlerInterceptor implements StateHandlerInterceptor {
stateInstance.setGmtEnd(new Date());
- if(stateMachineInstance.getStateMachine().isPersist() && state.isPersist() && stateMachineConfig.getStateLogStore() != null){
+ if (stateMachineInstance.getStateMachine().isPersist() && state.isPersist()
+ && stateMachineConfig.getStateLogStore() != null) {
stateMachineConfig.getStateLogStore().recordStateFinished(stateInstance, context);
}
- if(exp != null && context.getVariable(DomainConstants.VAR_NAME_IS_EXCEPTION_NOT_CATCH)!=null && (Boolean) context.getVariable(DomainConstants.VAR_NAME_IS_EXCEPTION_NOT_CATCH)){//如果存在异常没有catch则需要退出状态机执行
+ if (exp != null && context.getVariable(DomainConstants.VAR_NAME_IS_EXCEPTION_NOT_CATCH) != null
+ && (Boolean)context.getVariable(DomainConstants.VAR_NAME_IS_EXCEPTION_NOT_CATCH)) {
+ //If there is an exception and there is no catch, need to exit the state machine to execute.
context.removeVariable(DomainConstants.VAR_NAME_IS_EXCEPTION_NOT_CATCH);
EngineUtils.failStateMachine(context, exp);
@@ -225,208 +387,81 @@ public class ServiceTaskHandlerInterceptor implements StateHandlerInterceptor {
}
- private static List<Object> createInputParams(ExpressionFactoryManager expressionFactoryManager, StateInstanceImpl stateInstance, ServiceTaskStateImpl serviceTaskState, Object variablesFrom){
-
- List<Object> inputAssignments = serviceTaskState.getInput();
- if(inputAssignments == null || inputAssignments.size() == 0){
- return new ArrayList<>(0);
- }
-
- List<Object> inputExpressions = serviceTaskState.getInputExpressions();
- if(inputExpressions == null){
- synchronized (serviceTaskState){
- inputExpressions = serviceTaskState.getInputExpressions();
- if(inputExpressions == null){
- inputExpressions = new ArrayList<>(inputAssignments.size());
- for(Object inputAssignment : inputAssignments){
- inputExpressions.add(createValueExpression(expressionFactoryManager, inputAssignment));
- }
- }
- serviceTaskState.setInputExpressions(inputExpressions);
- }
- }
- List<Object> inputValues = new ArrayList<>(inputExpressions.size());
- for(Object valueExpression : inputExpressions){
- Object value = getValue(valueExpression, variablesFrom, stateInstance);
- inputValues.add(value);
- }
-
- return inputValues;
- }
-
- public static Map<String, Object> createOutputParams(ExpressionFactoryManager expressionFactoryManager, ServiceTaskStateImpl serviceTaskState, Object variablesFrom){
-
- Map<String, Object> outputAssignments = serviceTaskState.getOutput();
- if(outputAssignments == null || outputAssignments.size() == 0){
- return new LinkedHashMap<>(0);
- }
-
- Map<String, Object> outputExpressions = serviceTaskState.getOutputExpressions();
- if(outputExpressions == null){
- synchronized (serviceTaskState){
- outputExpressions = serviceTaskState.getOutputExpressions();
- if(outputExpressions == null){
- outputExpressions = new LinkedHashMap<>(outputAssignments.size());
- for(String paramName : outputAssignments.keySet()){
- outputExpressions.put(paramName, createValueExpression(expressionFactoryManager, outputAssignments.get(paramName)));
- }
- }
- serviceTaskState.setOutputExpressions(outputExpressions);
- }
- }
- Map<String, Object> outputValues = new LinkedHashMap<>(outputExpressions.size());
- for(String paramName : outputExpressions.keySet()){
- outputValues.put(paramName, getValue(outputExpressions.get(paramName), variablesFrom, null));
- }
- return outputValues;
- }
-
- private static Object getValue(Object valueExpression, Object variablesFrom, StateInstance stateInstance){
- if(valueExpression instanceof Expression){
- Object value = ((Expression)valueExpression).getValue(variablesFrom);
- if(value != null && stateInstance != null
- && StringUtils.isEmpty(stateInstance.getBusinessKey())
- && valueExpression instanceof SequenceExpression){
- stateInstance.setBusinessKey(String.valueOf(value));
- }
- return value;
- }
- else if(valueExpression instanceof Map){
- Map<String, Object> mapValueExpression = (Map<String, Object>) valueExpression;
- Map<String, Object> mapValue = new LinkedHashMap<>();
- for(String paramName : mapValueExpression.keySet()){
- Object value = getValue(mapValueExpression.get(paramName), variablesFrom, stateInstance);
- if(value != null){
- mapValue.put(paramName, value);
- }
- }
- return mapValue;
- }
- else if(valueExpression instanceof List){
- List<Object> listValueExpression = (List<Object>) valueExpression;
- List<Object> listValue = new ArrayList<>(listValueExpression.size());
- for(Object aValueExpression : listValueExpression){
- listValue.add(getValue(aValueExpression, variablesFrom, stateInstance));
- }
- return listValue;
- }
- else{
- return valueExpression;
- }
- }
-
- private static Object createValueExpression(ExpressionFactoryManager expressionFactoryManager, Object paramAssignment){
-
- Object valueExpression;
-
- if(paramAssignment instanceof Expression){
- valueExpression = paramAssignment;
- }
- else if(paramAssignment instanceof Map){
- Map<String, Object> paramMapAssignment = (Map<String, Object>)paramAssignment;
- Map<String, Object> paramMap = new LinkedHashMap<>(paramMapAssignment.size());
- for(String paramName : paramMapAssignment.keySet()){
- Object valueAssignment = paramMapAssignment.get(paramName);
- paramMap.put(paramName, createValueExpression(expressionFactoryManager, valueAssignment));
- }
- valueExpression = paramMap;
- }
- else if(paramAssignment instanceof List){
- List<Object> paramListAssignment = (List<Object>)paramAssignment;
- List<Object> paramList = new ArrayList<>(paramListAssignment.size());
- for(Object aParamAssignment : paramListAssignment){
- paramList.add(createValueExpression(expressionFactoryManager, aParamAssignment));
- }
- valueExpression = paramList;
- }
- else if(paramAssignment instanceof String && ((String)paramAssignment).startsWith("$")){
-
- String expressionStr = (String) paramAssignment;
- int expTypeStart = expressionStr.indexOf("$");
- int expTypeEnd = expressionStr.indexOf(".", expTypeStart);
-
- String expressionType = null;
- if(expTypeStart >=0 && expTypeEnd > expTypeStart){
- expressionType = expressionStr.substring(expTypeStart + 1, expTypeEnd);
- }
-
- int expEnd = expressionStr.length();
- String expressionContent = null;
- if(expTypeEnd > 0 && expEnd > expTypeEnd){
- expressionContent = expressionStr.substring(expTypeEnd + 1, expEnd);
- }
-
- ExpressionFactory expressionFactory = expressionFactoryManager.getExpressionFactory(expressionType);
- if (expressionFactory == null) {
- throw new IllegalArgumentException("Cannot get ExpressionFactory by Type[" + expressionType + "]");
- }
- valueExpression = expressionFactory.createExpression(expressionContent);
- }
- else {
- valueExpression = paramAssignment;
- }
- return valueExpression;
- }
-
-
- private void decideExecutionStatus(ProcessContext context, StateInstance stateInstance, ServiceTaskStateImpl state, Exception exp) {
+ private void decideExecutionStatus(ProcessContext context, StateInstance stateInstance, ServiceTaskStateImpl state,
+ Exception exp) {
Map<String, String> statusMatchList = state.getStatus();
if (statusMatchList != null && statusMatchList.size() > 0) {
- StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
-
- Map<Object, String> statusEvaluators = state.getStatusEvaluators();
- if(statusEvaluators == null){
- synchronized (state){
- statusEvaluators = state.getStatusEvaluators();
- if(statusEvaluators == null){
- statusEvaluators = new LinkedHashMap<>(statusMatchList.size());
- for(String expressionStr : statusMatchList.keySet()){
+ if (state.isAsync()) {
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn(
+ "Service[{}.{}] is execute asynchronously, null return value collected, so user defined "
+ + "Status Matching skipped. stateName: {}, branchId: {}", state.getServiceName(),
+ state.getServiceMethod(), state.getName(), stateInstance.getId());
+ }
+ } else {
- String statusVal = statusMatchList.get(expressionStr);
- Evaluator evaluator = createEvaluator(stateMachineConfig.getEvaluatorFactoryManager(), expressionStr);
- if(evaluator != null){
- statusEvaluators.put(evaluator, statusVal);
+ StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+
+ Map<Object, String> statusEvaluators = state.getStatusEvaluators();
+ if (statusEvaluators == null) {
+ synchronized (state) {
+ statusEvaluators = state.getStatusEvaluators();
+ if (statusEvaluators == null) {
+ statusEvaluators = new LinkedHashMap<>(statusMatchList.size());
+ for (String expressionStr : statusMatchList.keySet()) {
+
+ String statusVal = statusMatchList.get(expressionStr);
+ Evaluator evaluator = createEvaluator(stateMachineConfig.getEvaluatorFactoryManager(),
+ expressionStr);
+ if (evaluator != null) {
+ statusEvaluators.put(evaluator, statusVal);
+ }
}
}
+ state.setStatusEvaluators(statusEvaluators);
}
- state.setStatusEvaluators(statusEvaluators);
}
- }
- for(Object evaluatorObj : statusEvaluators.keySet()){
- Evaluator evaluator = (Evaluator) evaluatorObj;
- String statusVal = statusEvaluators.get(evaluator);
- if (evaluator.evaluate(context.getVariables())) {
- stateInstance.setStatus(ExecutionStatus.valueOf(statusVal));
- break;
+ for (Object evaluatorObj : statusEvaluators.keySet()) {
+ Evaluator evaluator = (Evaluator)evaluatorObj;
+ String statusVal = statusEvaluators.get(evaluator);
+ if (evaluator.evaluate(context.getVariables())) {
+ stateInstance.setStatus(ExecutionStatus.valueOf(statusVal));
+ break;
+ }
}
- }
- if (exp == null && (stateInstance.getStatus() == null || ExecutionStatus.RU.equals(stateInstance.getStatus()))) {
+ if (exp == null && (stateInstance.getStatus() == null || ExecutionStatus.RU.equals(
+ stateInstance.getStatus()))) {
- if (state.isForUpdate()) {
- stateInstance.setStatus(ExecutionStatus.UN);
- } else {
- stateInstance.setStatus(ExecutionStatus.FA);
- }
- stateInstance.setGmtEnd(new Date());
+ if (state.isForUpdate()) {
+ stateInstance.setStatus(ExecutionStatus.UN);
+ } else {
+ stateInstance.setStatus(ExecutionStatus.FA);
+ }
+ stateInstance.setGmtEnd(new Date());
- StateMachineInstance stateMachineInstance = stateInstance.getStateMachineInstance();
+ StateMachineInstance stateMachineInstance = stateInstance.getStateMachineInstance();
- if(stateMachineInstance.getStateMachine().isPersist() && state.isPersist() && stateMachineConfig.getStateLogStore() != null){
- stateMachineConfig.getStateLogStore().recordStateFinished(stateInstance, context);
- }
+ if (stateMachineInstance.getStateMachine().isPersist() && state.isPersist()
+ && stateMachineConfig.getStateLogStore() != null) {
+ stateMachineConfig.getStateLogStore().recordStateFinished(stateInstance, context);
+ }
- EngineExecutionException exception = new EngineExecutionException("State [" + state.getName() + "] execute finished, but cannot matching status, pls check its status manually",
- FrameworkErrorCode.NoMatchedStatus);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("State[" + state.getName() + "] execute finish with status[" + stateInstance.getStatus() + "]");
- }
- EngineUtils.failStateMachine(context, exception);
+ EngineExecutionException exception = new EngineExecutionException("State [" + state.getName()
+ + "] execute finished, but cannot matching status, pls check its status manually",
+ FrameworkErrorCode.NoMatchedStatus);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("State[{}] execute finish with status[{}]", state.getName(),
+ stateInstance.getStatus());
+ }
+ EngineUtils.failStateMachine(context, exception);
- throw exception;
+ throw exception;
+ }
}
}
@@ -454,29 +489,29 @@ public class ServiceTaskHandlerInterceptor implements StateHandlerInterceptor {
}
}
- if (LOGGER.isDebugEnabled()) { LOGGER.debug("State[" + state.getName() + "] finish with status[" + stateInstance.getStatus() + "]"); }
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("State[{}] finish with status[{}]", state.getName(), stateInstance.getStatus());
+ }
}
private Evaluator createEvaluator(EvaluatorFactoryManager evaluatorFactoryManager, String expressionStr) {
String expressionType = null;
String expressionContent = null;
Evaluator evaluator = null;
- if(StringUtils.hasLength(expressionStr)){
- if(expressionStr.startsWith("$")){
+ if (StringUtils.hasLength(expressionStr)) {
+ if (expressionStr.startsWith("$")) {
int expTypeStart = expressionStr.indexOf("$");
int expTypeEnd = expressionStr.indexOf("{", expTypeStart);
-
- if(expTypeStart >=0 && expTypeEnd > expTypeStart){
+ if (expTypeStart >= 0 && expTypeEnd > expTypeStart) {
expressionType = expressionStr.substring(expTypeStart + 1, expTypeEnd);
}
int expEnd = expressionStr.lastIndexOf("}");
- if(expTypeEnd > 0 && expEnd > expTypeEnd){
+ if (expTypeEnd > 0 && expEnd > expTypeEnd) {
expressionContent = expressionStr.substring(expTypeEnd + 1, expEnd);
}
- }
- else{
+ } else {
expressionContent = expressionStr;
}
@@ -486,9 +521,9 @@ public class ServiceTaskHandlerInterceptor implements StateHandlerInterceptor {
}
evaluator = evaluatorFactory.createEvaluator(expressionContent);
if (evaluator instanceof ExpressionEvaluator) {
- ((ExpressionEvaluator) evaluator).setRootObjectName(DomainConstants.VAR_NAME_OUTPUT_PARAMS);
+ ((ExpressionEvaluator)evaluator).setRootObjectName(DomainConstants.VAR_NAME_OUTPUT_PARAMS);
}
}
return evaluator;
}
-}
\ No newline at end of file
+}
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/routers/EndStateRouter.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/routers/EndStateRouter.java
index 8fe288158c00041312a7b48248f8e453a1f399eb..fdf8d3824638d666d4d5b6f371fc72d91282e1e0 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/routers/EndStateRouter.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/routers/EndStateRouter.java
@@ -15,6 +15,8 @@
*/
package io.seata.saga.engine.pcext.routers;
+import java.util.List;
+
import io.seata.saga.engine.exception.EngineExecutionException;
import io.seata.saga.engine.pcext.InterceptibleStateRouter;
import io.seata.saga.engine.pcext.StateRouter;
@@ -22,10 +24,10 @@ import io.seata.saga.engine.pcext.StateRouterInterceptor;
import io.seata.saga.proctrl.Instruction;
import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.statelang.domain.State;
-import java.util.List;
/**
* EndState Router
+ *
* @author lorne.cl
*/
public class EndStateRouter implements StateRouter, InterceptibleStateRouter {
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/routers/TaskStateRouter.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/routers/TaskStateRouter.java
index f65bf84e3b001819ac236b3181d64816609bbbb6..588f7d1842526f5ff3c7fce4cb396d6192cdc9b8 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/routers/TaskStateRouter.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/routers/TaskStateRouter.java
@@ -15,6 +15,8 @@
*/
package io.seata.saga.engine.pcext.routers;
+import java.util.Stack;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.saga.engine.exception.EngineExecutionException;
import io.seata.saga.engine.pcext.StateInstruction;
@@ -32,13 +34,13 @@ import io.seata.saga.statelang.domain.StateInstance;
import io.seata.saga.statelang.domain.StateMachine;
import io.seata.saga.statelang.domain.SubStateMachine;
import io.seata.saga.statelang.domain.impl.AbstractTaskState;
-import java.util.Stack;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
/**
* TaskState Router
+ *
* @author lorne.cl
*/
public class TaskStateRouter implements StateRouter {
@@ -49,44 +51,48 @@ public class TaskStateRouter implements StateRouter {
public Instruction route(ProcessContext context, State state) throws EngineExecutionException {
StateInstruction stateInstruction = context.getInstruction(StateInstruction.class);
- if(stateInstruction.isEnd()){
- if(LOGGER.isInfoEnabled()){
- LOGGER.info("StateInstruction is ended, Stop the StateMachine executing. StateMachine[" + stateInstruction.getStateMachineName() + "]Current State[" + state.getName() + "]");
+ if (stateInstruction.isEnd()) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info(
+ "StateInstruction is ended, Stop the StateMachine executing. StateMachine[{}] Current State[{}]",
+ stateInstruction.getStateMachineName(), state.getName());
}
return null;
}
- //The current CompensationTriggerState can mark the compensation process is started and perform compensation route processing.
- State compensationTriggerState = (State) context.getVariable(DomainConstants.VAR_NAME_CURRENT_COMPEN_TRIGGER_STATE);
- if(compensationTriggerState != null){
+ //The current CompensationTriggerState can mark the compensation process is started and perform compensation
+ // route processing.
+ State compensationTriggerState = (State)context.getVariable(
+ DomainConstants.VAR_NAME_CURRENT_COMPEN_TRIGGER_STATE);
+ if (compensationTriggerState != null) {
return compensateRoute(context, compensationTriggerState);
}
//There is an exception route, indicating that an exception is thrown, and the exception route is prioritized.
String next = (String)context.getVariable(DomainConstants.VAR_NAME_CURRENT_EXCEPTION_ROUTE);
- if(StringUtils.hasLength(next)){
+ if (StringUtils.hasLength(next)) {
context.removeVariable(DomainConstants.VAR_NAME_CURRENT_EXCEPTION_ROUTE);
- }
- else{
+ } else {
next = state.getNext();
}
//If next is empty, the state selected by the Choice state was taken.
- if(!StringUtils.hasLength(next) && context.hasVariable(DomainConstants.VAR_NAME_CURRENT_CHOICE)){
+ if (!StringUtils.hasLength(next) && context.hasVariable(DomainConstants.VAR_NAME_CURRENT_CHOICE)) {
next = (String)context.getVariable(DomainConstants.VAR_NAME_CURRENT_CHOICE);
context.removeVariable(DomainConstants.VAR_NAME_CURRENT_CHOICE);
}
- if(!StringUtils.hasLength(next)){
+ if (!StringUtils.hasLength(next)) {
return null;
}
StateMachine stateMachine = state.getStateMachine();
State nextState = stateMachine.getState(next);
- if(nextState == null){
- throw new EngineExecutionException("Next state["+next+"] is not exits", FrameworkErrorCode.ObjectNotExists);
+ if (nextState == null) {
+ throw new EngineExecutionException("Next state[" + next + "] is not exits",
+ FrameworkErrorCode.ObjectNotExists);
}
stateInstruction.setStateName(next);
@@ -94,64 +100,68 @@ public class TaskStateRouter implements StateRouter {
return stateInstruction;
}
-
private Instruction compensateRoute(ProcessContext context, State compensationTriggerState) {
//If there is already a compensation state that has been executed,
// it is judged whether it is wrong or unsuccessful,
// and the compensation process is interrupted.
- if(Boolean.TRUE.equals(context.getVariable(DomainConstants.VAR_NAME_FIRST_COMPENSATION_STATE_STARTED))){
+ if (Boolean.TRUE.equals(context.getVariable(DomainConstants.VAR_NAME_FIRST_COMPENSATION_STATE_STARTED))) {
- Exception exception = (Exception) context.getVariable(DomainConstants.VAR_NAME_CURRENT_EXCEPTION);
- if(exception != null){
+ Exception exception = (Exception)context.getVariable(DomainConstants.VAR_NAME_CURRENT_EXCEPTION);
+ if (exception != null) {
EngineUtils.endStateMachine(context);
return null;
}
- StateInstance stateInstance = (StateInstance) context.getVariable(DomainConstants.VAR_NAME_STATE_INST);
- if(stateInstance != null && (!ExecutionStatus.SU.equals(stateInstance.getStatus()))) {
+ StateInstance stateInstance = (StateInstance)context.getVariable(DomainConstants.VAR_NAME_STATE_INST);
+ if (stateInstance != null && (!ExecutionStatus.SU.equals(stateInstance.getStatus()))) {
EngineUtils.endStateMachine(context);
return null;
}
}
- Stack<StateInstance> stateStackToBeCompensated = CompensationHolder.getCurrent(context, true).getStateStackNeedCompensation();
+ Stack<StateInstance> stateStackToBeCompensated = CompensationHolder.getCurrent(context, true)
+ .getStateStackNeedCompensation();
if (!stateStackToBeCompensated.isEmpty()) {
StateInstance stateToBeCompensated = stateStackToBeCompensated.pop();
- StateMachine stateMachine = (StateMachine) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE);
+ StateMachine stateMachine = (StateMachine)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE);
State state = stateMachine.getState(stateToBeCompensated.getName());
if (state != null && state instanceof AbstractTaskState) {
- AbstractTaskState taskState = (AbstractTaskState) state;
+ AbstractTaskState taskState = (AbstractTaskState)state;
StateInstruction instruction = context.getInstruction(StateInstruction.class);
State compensateState = null;
String compensateStateName = taskState.getCompensateState();
- if(StringUtils.hasLength(compensateStateName)){
+ if (StringUtils.hasLength(compensateStateName)) {
compensateState = stateMachine.getState(compensateStateName);
}
- if(compensateState == null && (taskState instanceof SubStateMachine)){
+ if (compensateState == null && (taskState instanceof SubStateMachine)) {
compensateState = ((SubStateMachine)taskState).getCompensateStateObject();
instruction.setTemporaryState(compensateState);
}
- if(compensateState == null){
+ if (compensateState == null) {
EngineUtils.endStateMachine(context);
return null;
}
instruction.setStateName(compensateState.getName());
- CompensationHolder.getCurrent(context, true).addToBeCompensatedState(compensateState.getName(), stateToBeCompensated);
+ CompensationHolder.getCurrent(context, true).addToBeCompensatedState(compensateState.getName(),
+ stateToBeCompensated);
- ((HierarchicalProcessContext)context).setVariableLocally(DomainConstants.VAR_NAME_FIRST_COMPENSATION_STATE_STARTED, true);
+ ((HierarchicalProcessContext)context).setVariableLocally(
+ DomainConstants.VAR_NAME_FIRST_COMPENSATION_STATE_STARTED, true);
- if(compensateState instanceof CompensateSubStateMachineState){
- ((HierarchicalProcessContext)context).setVariableLocally(compensateState.getName() + DomainConstants.VAR_NAME_SUB_MACHINE_PARENT_ID, EngineUtils.generateParentId(stateToBeCompensated));
+ if (compensateState instanceof CompensateSubStateMachineState) {
+ ((HierarchicalProcessContext)context).setVariableLocally(
+ compensateState.getName() + DomainConstants.VAR_NAME_SUB_MACHINE_PARENT_ID,
+ EngineUtils.generateParentId(stateToBeCompensated));
}
return instruction;
@@ -161,7 +171,7 @@ public class TaskStateRouter implements StateRouter {
context.removeVariable(DomainConstants.VAR_NAME_CURRENT_COMPEN_TRIGGER_STATE);
String compensationTriggerStateNext = compensationTriggerState.getNext();
- if(StringUtils.isEmpty(compensationTriggerStateNext)){
+ if (StringUtils.isEmpty(compensationTriggerStateNext)) {
EngineUtils.endStateMachine(context);
return null;
}
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/utils/CompensationHolder.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/utils/CompensationHolder.java
index d59c2526acc449b781caecdc459a5767f023b16f..293ac3b019e90f03fdbd191db14acd57e58b4bcd 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/utils/CompensationHolder.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/utils/CompensationHolder.java
@@ -15,6 +15,12 @@
*/
package io.seata.saga.engine.pcext.utils;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.concurrent.ConcurrentHashMap;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.common.util.StringUtils;
import io.seata.saga.engine.exception.EngineExecutionException;
@@ -28,12 +34,6 @@ import io.seata.saga.statelang.domain.StateMachine;
import io.seata.saga.statelang.domain.StateMachineInstance;
import io.seata.saga.statelang.domain.impl.AbstractTaskState;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Stack;
-import java.util.concurrent.ConcurrentHashMap;
-
/**
* CompensationHolder
*
@@ -49,7 +49,6 @@ public class CompensationHolder {
/**
* states used to compensation
- *
* key: stateName
*/
private Map<String, StateInstance> statesForCompensation = new ConcurrentHashMap<>();
@@ -59,15 +58,16 @@ public class CompensationHolder {
*/
private Stack<StateInstance> stateStackNeedCompensation = new Stack<>();
+ public static CompensationHolder getCurrent(ProcessContext context, boolean forceCreate) {
- public static CompensationHolder getCurrent(ProcessContext context, boolean forceCreate){
-
- CompensationHolder compensationholder = (CompensationHolder)context.getVariable(DomainConstants.VAR_NAME_CURRENT_COMPENSATION_HOLDER);
- if(compensationholder == null && forceCreate){
+ CompensationHolder compensationholder = (CompensationHolder)context.getVariable(
+ DomainConstants.VAR_NAME_CURRENT_COMPENSATION_HOLDER);
+ if (compensationholder == null && forceCreate) {
synchronized (context) {
- compensationholder = (CompensationHolder)context.getVariable(DomainConstants.VAR_NAME_CURRENT_COMPENSATION_HOLDER);
- if(compensationholder == null){
+ compensationholder = (CompensationHolder)context.getVariable(
+ DomainConstants.VAR_NAME_CURRENT_COMPENSATION_HOLDER);
+ if (compensationholder == null) {
compensationholder = new CompensationHolder();
context.setVariable(DomainConstants.VAR_NAME_CURRENT_COMPENSATION_HOLDER, compensationholder);
}
@@ -76,35 +76,41 @@ public class CompensationHolder {
return compensationholder;
}
- public static List<StateInstance> findStateInstListToBeCompensated(ProcessContext context, List<StateInstance> stateInstanceList) {
+ public static List<StateInstance> findStateInstListToBeCompensated(ProcessContext context,
+ List<StateInstance> stateInstanceList) {
List<StateInstance> stateListToBeCompensated = null;
- if(stateInstanceList!=null && stateInstanceList.size()>0){
+ if (stateInstanceList != null && stateInstanceList.size() > 0) {
stateListToBeCompensated = new ArrayList<>(stateInstanceList.size());
- StateMachine stateMachine = (StateMachine) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE);
- StateMachineInstance stateMachineInstance = (StateMachineInstance) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_INST);
+ StateMachine stateMachine = (StateMachine)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE);
+ StateMachineInstance stateMachineInstance = (StateMachineInstance)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_INST);
- for(StateInstance stateInstance : stateInstanceList){
+ for (StateInstance stateInstance : stateInstanceList) {
if (stateNeedToCompensate(stateInstance)) {
State state = stateMachine.getState(stateInstance.getName());
AbstractTaskState taskState = null;
- if(state instanceof AbstractTaskState){
+ if (state instanceof AbstractTaskState) {
taskState = (AbstractTaskState)state;
}
//The data update service is not configured with the compensation state,
// The state machine needs to exit directly without compensation.
- if(stateInstance.isForUpdate() && taskState != null && StringUtils.isBlank(taskState.getCompensateState())) {
+ if (stateInstance.isForUpdate() && taskState != null && StringUtils.isBlank(
+ taskState.getCompensateState())) {
- String message = "StateMachineInstance[" + stateMachineInstance.getId() + ":" + stateMachine.getName() + "] have a state [" + stateInstance.getName() + "] is a service for update data，but no compensateState found.";
- EngineExecutionException exception = ExceptionUtils.createEngineExecutionException(FrameworkErrorCode.CompensationStateNotFound, message, stateMachineInstance, stateInstance);
+ String message = "StateMachineInstance[" + stateMachineInstance.getId() + ":" + stateMachine
+ .getName() + "] have a state [" + stateInstance.getName()
+ + "] is a service for update data, but no compensateState found.";
+ EngineExecutionException exception = ExceptionUtils.createEngineExecutionException(
+ FrameworkErrorCode.CompensationStateNotFound, message, stateMachineInstance, stateInstance);
EngineUtils.failStateMachine(context, exception);
throw exception;
}
- if(taskState!=null && StringUtils.isNotBlank(taskState.getCompensateState())){
+ if (taskState != null && StringUtils.isNotBlank(taskState.getCompensateState())) {
stateListToBeCompensated.add(stateInstance);
}
}
@@ -115,24 +121,22 @@ public class CompensationHolder {
private static boolean stateNeedToCompensate(StateInstance stateInstance) {
//If it has been retried, it will not be compensated
- if(stateInstance.isIgnoreStatus()){
+ if (stateInstance.isIgnoreStatus()) {
return false;
}
- if(DomainConstants.STATE_TYPE_SUB_STATE_MACHINE.equals(stateInstance.getType())){
+ if (DomainConstants.STATE_TYPE_SUB_STATE_MACHINE.equals(stateInstance.getType())) {
- return (!ExecutionStatus.FA.equals(stateInstance.getStatus()))
- && (!ExecutionStatus.SU.equals(stateInstance.getCompensationStatus()));
- }
- else{
+ return (!ExecutionStatus.FA.equals(stateInstance.getStatus())) && (!ExecutionStatus.SU.equals(
+ stateInstance.getCompensationStatus()));
+ } else {
- return DomainConstants.STATE_TYPE_SERVICE_TASK.equals(stateInstance.getType())
- && !stateInstance.isForCompensation()
- && (!ExecutionStatus.FA.equals(stateInstance.getStatus()))
- && (!ExecutionStatus.SU.equals(stateInstance.getCompensationStatus()));
+ return DomainConstants.STATE_TYPE_SERVICE_TASK.equals(stateInstance.getType()) && !stateInstance
+ .isForCompensation() && (!ExecutionStatus.FA.equals(stateInstance.getStatus())) && (!ExecutionStatus.SU
+ .equals(stateInstance.getCompensationStatus()));
}
}
- public static void clearCurrent(ProcessContext context){
+ public static void clearCurrent(ProcessContext context) {
context.removeVariable(DomainConstants.VAR_NAME_CURRENT_COMPENSATION_HOLDER);
}
@@ -140,22 +144,18 @@ public class CompensationHolder {
return statesNeedCompensation;
}
-
public void addToBeCompensatedState(String stateName, StateInstance toBeCompensatedState) {
this.statesNeedCompensation.put(stateName, toBeCompensatedState);
}
-
public Map<String, StateInstance> getStatesForCompensation() {
return statesForCompensation;
}
-
public void addForCompensationState(String stateName, StateInstance forCompensationState) {
this.statesForCompensation.put(stateName, forCompensationState);
}
-
public Stack<StateInstance> getStateStackNeedCompensation() {
return stateStackNeedCompensation;
}
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/utils/EngineUtils.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/utils/EngineUtils.java
index 59f3d746ee9da30c2e869ff390734a76c102061b..9a13fd2b6f72c41bafe63d74bcdd87875bef49f4 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/utils/EngineUtils.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/utils/EngineUtils.java
@@ -15,6 +15,9 @@
*/
package io.seata.saga.engine.pcext.utils;
+import java.util.Date;
+import java.util.Map;
+
import io.seata.saga.engine.AsyncCallback;
import io.seata.saga.engine.StateMachineConfig;
import io.seata.saga.engine.pcext.StateInstruction;
@@ -23,13 +26,10 @@ import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.StateInstance;
import io.seata.saga.statelang.domain.StateMachineInstance;
-import java.util.Date;
-import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- *
* @author lorne.cl
*/
public class EngineUtils {
@@ -42,21 +42,23 @@ public class EngineUtils {
* @param stateInstance
* @return
*/
- public static String generateParentId(StateInstance stateInstance){
- return stateInstance.getMachineInstanceId() + ":" + stateInstance.getId();
+ public static String generateParentId(StateInstance stateInstance) {
+ return stateInstance.getMachineInstanceId() + DomainConstants.SEPERATOR_PARENT_ID + stateInstance.getId();
}
/**
* end StateMachine
+ *
* @param context
*/
public static void endStateMachine(ProcessContext context) {
- StateMachineInstance stateMachineInstance = (StateMachineInstance) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_INST);
+ StateMachineInstance stateMachineInstance = (StateMachineInstance)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_INST);
stateMachineInstance.setGmtEnd(new Date());
- Exception exp = (Exception) context.getVariable(DomainConstants.VAR_NAME_CURRENT_EXCEPTION);
+ Exception exp = (Exception)context.getVariable(DomainConstants.VAR_NAME_CURRENT_EXCEPTION);
if (exp != null) {
stateMachineInstance.setException(exp);
if (LOGGER.isDebugEnabled()) {
@@ -64,27 +66,29 @@ public class EngineUtils {
}
}
- StateMachineConfig stateMachineConfig = (StateMachineConfig) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+ StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
stateMachineConfig.getStatusDecisionStrategy().decideOnEndState(context, stateMachineInstance, exp);
stateMachineInstance.setRunning(false);
- stateMachineInstance.getEndParams().putAll((Map<String, Object>) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT));
+ stateMachineInstance.getEndParams().putAll(
+ (Map<String, Object>)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT));
StateInstruction instruction = context.getInstruction(StateInstruction.class);
instruction.setEnd(true);
if (stateMachineInstance.getStateMachine().isPersist() && stateMachineConfig.getStateLogStore() != null) {
- stateMachineInstance.getEndParams().putAll((Map<String, Object>) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT));
+ stateMachineInstance.getEndParams().putAll(
+ (Map<String, Object>)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT));
stateMachineConfig.getStateLogStore().recordStateMachineFinished(stateMachineInstance, context);
}
- AsyncCallback callback = (AsyncCallback) context.getVariable(DomainConstants.VAR_NAME_ASYNC_CALLBACK);
- if(callback != null){
- if(exp != null){
+ AsyncCallback callback = (AsyncCallback)context.getVariable(DomainConstants.VAR_NAME_ASYNC_CALLBACK);
+ if (callback != null) {
+ if (exp != null) {
callback.onError(context, stateMachineInstance, exp);
- }
- else{
+ } else {
callback.onFinished(context, stateMachineInstance);
}
}
@@ -92,28 +96,32 @@ public class EngineUtils {
/**
* fail StateMachine
+ *
* @param context
* @param exp
*/
public static void failStateMachine(ProcessContext context, Exception exp) {
- StateMachineInstance stateMachineInstance = (StateMachineInstance) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_INST);
+ StateMachineInstance stateMachineInstance = (StateMachineInstance)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_INST);
- StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
+ StateMachineConfig stateMachineConfig = (StateMachineConfig)context.getVariable(
+ DomainConstants.VAR_NAME_STATEMACHINE_CONFIG);
stateMachineConfig.getStatusDecisionStrategy().decideOnTaskStateFail(context, stateMachineInstance, exp);
- stateMachineInstance.getEndParams().putAll((Map<String, Object>) context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT));
+ stateMachineInstance.getEndParams().putAll(
+ (Map<String, Object>)context.getVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT));
StateInstruction instruction = context.getInstruction(StateInstruction.class);
instruction.setEnd(true);
- if(stateMachineInstance.getStateMachine().isPersist() && stateMachineConfig.getStateLogStore() != null){
+ if (stateMachineInstance.getStateMachine().isPersist() && stateMachineConfig.getStateLogStore() != null) {
stateMachineConfig.getStateLogStore().recordStateMachineFinished(stateMachineInstance, context);
}
- AsyncCallback callback = (AsyncCallback) context.getVariable(DomainConstants.VAR_NAME_ASYNC_CALLBACK);
- if(callback != null){
+ AsyncCallback callback = (AsyncCallback)context.getVariable(DomainConstants.VAR_NAME_ASYNC_CALLBACK);
+ if (callback != null) {
callback.onError(context, stateMachineInstance, exp);
}
}
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/StateLogRepository.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/StateLogRepository.java
new file mode 100644
index 0000000000000000000000000000000000000000..0a3b17173a91aabbcce6fb5f2d85e6f73c73d5a0
--- /dev/null
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/StateLogRepository.java
@@ -0,0 +1,71 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.saga.engine.repo;
+
+import java.util.List;
+
+import io.seata.saga.statelang.domain.StateInstance;
+import io.seata.saga.statelang.domain.StateMachineInstance;
+
+/**
+ * State Log Repository
+ *
+ * @author lorne.cl
+ */
+public interface StateLogRepository {
+
+ /**
+ * Get state machine instance
+ *
+ * @param stateMachineInstanceId
+ * @return
+ */
+ StateMachineInstance getStateMachineInstance(String stateMachineInstanceId);
+
+ /**
+ * Get state machine instance by businessKey
+ *
+ * @param businessKey
+ * @param tenantId
+ * @return
+ */
+ StateMachineInstance getStateMachineInstanceByBusinessKey(String businessKey, String tenantId);
+
+ /**
+ * Query the list of state machine instances by parent id
+ *
+ * @param parentId
+ * @return
+ */
+ List<StateMachineInstance> queryStateMachineInstanceByParentId(String parentId);
+
+ /**
+ * Get state instance
+ *
+ * @param stateInstanceId
+ * @param machineInstId
+ * @return
+ */
+ StateInstance getStateInstance(String stateInstanceId, String machineInstId);
+
+ /**
+ * Get a list of state instances by state machine instance id
+ *
+ * @param stateMachineInstanceId
+ * @return
+ */
+ List<StateInstance> queryStateInstanceListByMachineInstanceId(String stateMachineInstanceId);
+}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/StateMachineRepository.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/StateMachineRepository.java
index 3013c3249eabb80db2c83ff973f73e13ccbdcfb8..e865152f9515f826c06d06b49aff7e91d726f50e 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/StateMachineRepository.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/StateMachineRepository.java
@@ -15,13 +15,14 @@
*/
package io.seata.saga.engine.repo;
+import java.io.IOException;
+
import io.seata.saga.statelang.domain.StateMachine;
import org.springframework.core.io.Resource;
-import java.io.IOException;
-
/**
* StateMachineRepository
+ *
* @author lorne.cl
*/
public interface StateMachineRepository {
@@ -38,7 +39,7 @@ public interface StateMachineRepository {
* Gets get state machine.
*
* @param stateMachineName the state machine name
- * @param tenantId the tenant id
+ * @param tenantId the tenant id
* @return the get state machine
*/
StateMachine getStateMachine(String stateMachineName, String tenantId);
@@ -47,20 +48,22 @@ public interface StateMachineRepository {
* Gets get state machine.
*
* @param stateMachineName the state machine name
- * @param tenantId the tenant id
- * @param version the version
+ * @param tenantId the tenant id
+ * @param version the version
* @return the get state machine
*/
StateMachine getStateMachine(String stateMachineName, String tenantId, String version);
/**
* Register the state machine to the repository (if the same version already exists, return the existing version)
+ *
* @param stateMachine
*/
StateMachine registryStateMachine(StateMachine stateMachine);
/**
* registry by resources
+ *
* @param resources
* @param tenantId
*/
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/impl/StateLogRepositoryImpl.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/impl/StateLogRepositoryImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..a036e330b9234864fbdcb7e43904adc69cc662da
--- /dev/null
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/impl/StateLogRepositoryImpl.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.saga.engine.repo.impl;
+
+import java.util.List;
+
+import io.seata.saga.engine.repo.StateLogRepository;
+import io.seata.saga.engine.store.StateLogStore;
+import io.seata.saga.statelang.domain.StateInstance;
+import io.seata.saga.statelang.domain.StateMachineInstance;
+
+/**
+ * State Log Repository
+ *
+ * @author lorne.cl
+ */
+public class StateLogRepositoryImpl implements StateLogRepository {
+
+ private StateLogStore stateLogStore;
+
+ @Override
+ public StateMachineInstance getStateMachineInstance(String stateMachineInstanceId) {
+ if (stateLogStore == null) {
+ return null;
+ }
+ return stateLogStore.getStateMachineInstance(stateMachineInstanceId);
+ }
+
+ @Override
+ public StateMachineInstance getStateMachineInstanceByBusinessKey(String businessKey, String tenantId) {
+ if (stateLogStore == null) {
+ return null;
+ }
+ return stateLogStore.getStateMachineInstanceByBusinessKey(businessKey, tenantId);
+ }
+
+ @Override
+ public List<StateMachineInstance> queryStateMachineInstanceByParentId(String parentId) {
+ if (stateLogStore == null) {
+ return null;
+ }
+ return stateLogStore.queryStateMachineInstanceByParentId(parentId);
+ }
+
+ @Override
+ public StateInstance getStateInstance(String stateInstanceId, String machineInstId) {
+ if (stateLogStore == null) {
+ return null;
+ }
+ return stateLogStore.getStateInstance(stateInstanceId, machineInstId);
+ }
+
+ @Override
+ public List<StateInstance> queryStateInstanceListByMachineInstanceId(String stateMachineInstanceId) {
+ if (stateLogStore == null) {
+ return null;
+ }
+ return stateLogStore.queryStateInstanceListByMachineInstanceId(stateMachineInstanceId);
+ }
+
+ public void setStateLogStore(StateLogStore stateLogStore) {
+ this.stateLogStore = stateLogStore;
+ }
+}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/impl/StateMachineRepositoryImpl.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/impl/StateMachineRepositoryImpl.java
index c523aa48e534c124c897e74a8a4d5c7d7f2c6a52..c6c423f0de20405c17232835376e889b5df8a0f8 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/impl/StateMachineRepositoryImpl.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/impl/StateMachineRepositoryImpl.java
@@ -15,86 +15,70 @@
*/
package io.seata.saga.engine.repo.impl;
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import io.seata.common.util.StringUtils;
-import io.seata.saga.engine.store.StateLangStore;
import io.seata.saga.engine.repo.StateMachineRepository;
+import io.seata.saga.engine.sequence.SeqGenerator;
+import io.seata.saga.engine.sequence.SpringJvmUUIDSeqGenerator;
+import io.seata.saga.engine.store.StateLangStore;
import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.StateMachine;
import io.seata.saga.statelang.parser.StateMachineParserFactory;
-import io.seata.saga.engine.sequence.SeqGenerator;
-import io.seata.saga.engine.sequence.SpringJvmUUIDSeqGenerator;
import io.seata.saga.statelang.parser.utils.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.core.io.Resource;
-import java.io.IOException;
-import java.io.UnsupportedEncodingException;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
/**
* StateMachineRepository Implementation
+ *
* @author lorne.cl
*/
public class StateMachineRepositoryImpl implements StateMachineRepository {
- private Map<String/** Name_Tenant **/, Item> stateMachineMapByNameAndTenant = new ConcurrentHashMap<>();
- private Map<String/** Id **/, Item> stateMachineMapById = new ConcurrentHashMap<>();
-
private static final Logger LOGGER = LoggerFactory.getLogger(StateMachineRepositoryImpl.class);
-
- private StateLangStore stateLangStore;
- private SeqGenerator seqGenerator = new SpringJvmUUIDSeqGenerator();
- private String charset = "UTF-8";
- private String defaultTenantId;
-
- private static class Item {
-
- private StateMachine value;
-
- private Item(){}
-
- private Item(StateMachine value) {
- this.value = value;
- }
-
- public StateMachine getValue() {
- return value;
- }
-
- public void setValue(StateMachine value) {
- this.value = value;
- }
- }
+ private Map<String/** Name_Tenant **/, Item> stateMachineMapByNameAndTenant = new ConcurrentHashMap<>();
+ private Map<String/** Id **/, Item> stateMachineMapById = new ConcurrentHashMap<>();
+ private StateLangStore stateLangStore;
+ private SeqGenerator seqGenerator = new SpringJvmUUIDSeqGenerator();
+ private String charset = "UTF-8";
+ private String defaultTenantId;
@Override
public StateMachine getStateMachineById(String stateMachineId) {
Item item = stateMachineMapById.get(stateMachineId);
- if(item == null){
+ if (item == null) {
Item newItem = new Item();
item = stateMachineMapById.putIfAbsent(stateMachineId, newItem);
- if(item == null){
+ if (item == null) {
item = newItem;
}
}
- if(item.getValue() == null && stateLangStore!=null){
- synchronized (item){
- if(item.getValue() == null && stateLangStore!=null){
+ if (item.getValue() == null && stateLangStore != null) {
+ synchronized (item) {
+ if (item.getValue() == null && stateLangStore != null) {
StateMachine stateMachine = stateLangStore.getStateMachineById(stateMachineId);
- if(stateMachine != null){
- StateMachine parsedStatMachine = StateMachineParserFactory.getStateMachineParser().parse(stateMachine.getContent());
- if(parsedStatMachine == null){
- throw new RuntimeException("Parse State Language failed, stateMachineId："+stateMachine.getId()+", name:"+stateMachine.getName());
+ if (stateMachine != null) {
+ StateMachine parsedStatMachine = StateMachineParserFactory.getStateMachineParser().parse(
+ stateMachine.getContent());
+ if (parsedStatMachine == null) {
+ throw new RuntimeException(
+ "Parse State Language failed, stateMachineId:" + stateMachine.getId() + ", name:"
+ + stateMachine.getName());
}
stateMachine.setStartState(parsedStatMachine.getStartState());
stateMachine.getStates().putAll(parsedStatMachine.getStates());
item.setValue(stateMachine);
- stateMachineMapByNameAndTenant.put(stateMachine.getName() + "_" + stateMachine.getTenantId(), item);
+ stateMachineMapByNameAndTenant.put(stateMachine.getName() + "_" + stateMachine.getTenantId(),
+ item);
}
}
@@ -106,21 +90,24 @@ public class StateMachineRepositoryImpl implements StateMachineRepository {
@Override
public StateMachine getStateMachine(String stateMachineName, String tenantId) {
Item item = stateMachineMapByNameAndTenant.get(stateMachineName + "_" + tenantId);
- if(item == null){
+ if (item == null) {
Item newItem = new Item();
item = stateMachineMapByNameAndTenant.putIfAbsent(stateMachineName + "_" + tenantId, newItem);
- if(item == null){
+ if (item == null) {
item = newItem;
}
}
- if(item.getValue() == null && stateLangStore!=null){
- synchronized (item){
- if(item.getValue() == null && stateLangStore!=null){
+ if (item.getValue() == null && stateLangStore != null) {
+ synchronized (item) {
+ if (item.getValue() == null && stateLangStore != null) {
StateMachine stateMachine = stateLangStore.getLastVersionStateMachine(stateMachineName, tenantId);
- if(stateMachine != null){
- StateMachine parsedStatMachine = StateMachineParserFactory.getStateMachineParser().parse(stateMachine.getContent());
- if(parsedStatMachine == null){
- throw new RuntimeException("Parse State Language failed, stateMachineId："+stateMachine.getId()+", name:"+stateMachine.getName());
+ if (stateMachine != null) {
+ StateMachine parsedStatMachine = StateMachineParserFactory.getStateMachineParser().parse(
+ stateMachine.getContent());
+ if (parsedStatMachine == null) {
+ throw new RuntimeException(
+ "Parse State Language failed, stateMachineId:" + stateMachine.getId() + ", name:"
+ + stateMachine.getName());
}
stateMachine.setStartState(parsedStatMachine.getStartState());
stateMachine.getStates().putAll(parsedStatMachine.getStates());
@@ -145,7 +132,7 @@ public class StateMachineRepositoryImpl implements StateMachineRepository {
String stateMachineName = stateMachine.getName();
String tenantId = stateMachine.getTenantId();
- if(stateLangStore != null){
+ if (stateLangStore != null) {
StateMachine oldStateMachine = stateLangStore.getLastVersionStateMachine(stateMachineName, tenantId);
if (oldStateMachine != null) {
@@ -157,10 +144,10 @@ public class StateMachineRepositoryImpl implements StateMachineRepository {
} catch (UnsupportedEncodingException e) {
LOGGER.error(e.getMessage(), e);
}
- if (Arrays.equals(bytesContent, oldBytesContent) && stateMachine.getVersion() != null && stateMachine.getVersion().equals(
- oldStateMachine.getVersion())) {
+ if (Arrays.equals(bytesContent, oldBytesContent) && stateMachine.getVersion() != null && stateMachine
+ .getVersion().equals(oldStateMachine.getVersion())) {
- LOGGER.info("StateMachine[" + stateMachineName + "] is already exist a same version");
+ LOGGER.info("StateMachine[{}] is already exist a same version", stateMachineName);
stateMachine.setId(oldStateMachine.getId());
stateMachine.setGmtCreate(oldStateMachine.getGmtCreate());
@@ -176,7 +163,7 @@ public class StateMachineRepositoryImpl implements StateMachineRepository {
stateLangStore.storeStateMachine(stateMachine);
}
- if(StringUtils.isBlank(stateMachine.getId())){
+ if (StringUtils.isBlank(stateMachine.getId())) {
stateMachine.setId(seqGenerator.generate(DomainConstants.SEQ_ENTITY_STATE_MACHINE));
}
@@ -194,12 +181,13 @@ public class StateMachineRepositoryImpl implements StateMachineRepository {
StateMachine stateMachine = StateMachineParserFactory.getStateMachineParser().parse(json);
if (stateMachine != null) {
stateMachine.setContent(json);
- if(StringUtils.isBlank(stateMachine.getTenantId())){
+ if (StringUtils.isBlank(stateMachine.getTenantId())) {
stateMachine.setTenantId(tenantId);
}
registryStateMachine(stateMachine);
-
- LOGGER.info("===== StateMachine Loaded: \n" + json);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("===== StateMachine Loaded: \n{}", json);
+ }
}
}
}
@@ -228,4 +216,24 @@ public class StateMachineRepositoryImpl implements StateMachineRepository {
public void setDefaultTenantId(String defaultTenantId) {
this.defaultTenantId = defaultTenantId;
}
+
+ private static class Item {
+
+ private StateMachine value;
+
+ private Item() {
+ }
+
+ private Item(StateMachine value) {
+ this.value = value;
+ }
+
+ public StateMachine getValue() {
+ return value;
+ }
+
+ public void setValue(StateMachine value) {
+ this.value = value;
+ }
+ }
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/sequence/SeqGenerator.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/sequence/SeqGenerator.java
index c8b45581dd99302a30f556884f671e05e1286446..bf312980eac5ac55a623236254b66cccee194962 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/sequence/SeqGenerator.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/sequence/SeqGenerator.java
@@ -19,6 +19,7 @@ import java.util.List;
/**
* SeqGenerator
+ *
* @author lorne.cl
*/
public interface SeqGenerator {
@@ -34,7 +35,7 @@ public interface SeqGenerator {
/**
* Generate string.
*
- * @param entity the entity
+ * @param entity the entity
* @param shardingParameters the sharding parameters
* @return the string
*/
@@ -43,8 +44,8 @@ public interface SeqGenerator {
/**
* Generate string.
*
- * @param entity the entity
- * @param ruleName the rule name
+ * @param entity the entity
+ * @param ruleName the rule name
* @param shardingParameters the sharding parameters
* @return the string
*/
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/sequence/SpringJvmUUIDSeqGenerator.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/sequence/SpringJvmUUIDSeqGenerator.java
index 6d289435f2acbfb74302890536fa2433472a9368..48d3bdf502801aa8aef545b2dc216df28cd0334b 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/sequence/SpringJvmUUIDSeqGenerator.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/sequence/SpringJvmUUIDSeqGenerator.java
@@ -15,13 +15,14 @@
*/
package io.seata.saga.engine.sequence;
+import java.util.List;
+
import org.springframework.util.AlternativeJdkIdGenerator;
import org.springframework.util.IdGenerator;
-import java.util.List;
-
/**
* Based On Spring AlternativeJdkIdGenerator
+ *
* @author lorne.cl
*/
public class SpringJvmUUIDSeqGenerator implements SeqGenerator {
@@ -31,8 +32,8 @@ public class SpringJvmUUIDSeqGenerator implements SeqGenerator {
@Override
public String generate(String entity, String ruleName, List<Object> shardingParameters) {
String uuid = idGenerator.generateId().toString();
- StringBuffer buf = new StringBuffer(uuid.length()-4);
- for(String seg : uuid.split("-")){
+ StringBuffer buf = new StringBuffer(uuid.length() - 4);
+ for (String seg : uuid.split("-")) {
buf.append(seg);
}
return buf.toString();
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/store/StateLangStore.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/store/StateLangStore.java
index 2d25a1c2a9dd73d32b2317532209cf752d77ae30..9b730b3da59c01f509d5aff40bdca60baafc35ce 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/store/StateLangStore.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/store/StateLangStore.java
@@ -26,6 +26,7 @@ public interface StateLangStore {
/**
* Query the state machine definition by id
+ *
* @param stateMachineId
* @return
*/
@@ -33,6 +34,7 @@ public interface StateLangStore {
/**
* Get the latest version of the state machine by state machine name
+ *
* @param stateMachineName
* @param tenantId
* @return
@@ -41,6 +43,7 @@ public interface StateLangStore {
/**
* Storage state machine definition
+ *
* @param stateMachine
* @return
*/
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/store/StateLogStore.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/store/StateLogStore.java
index f705f759d7d73a0cc799e194a44090b274639d24..ccef3142dec0c330253e6f2c23ecd3ed894da4bf 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/store/StateLogStore.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/store/StateLogStore.java
@@ -15,12 +15,12 @@
*/
package io.seata.saga.engine.store;
+import java.util.List;
+
import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.statelang.domain.StateInstance;
import io.seata.saga.statelang.domain.StateMachineInstance;
-import java.util.List;
-
/**
* StateMachine engine log store
*
@@ -30,36 +30,42 @@ public interface StateLogStore {
/**
* Record state machine startup events
+ *
* @param machineInstance
*/
void recordStateMachineStarted(StateMachineInstance machineInstance, ProcessContext context);
/**
* Record status end event
+ *
* @param machineInstance
*/
void recordStateMachineFinished(StateMachineInstance machineInstance, ProcessContext context);
/**
* Record state machine restarted
+ *
* @param machineInstance
*/
void recordStateMachineRestarted(StateMachineInstance machineInstance, ProcessContext context);
/**
* Record state start execution event
+ *
* @param stateInstance
*/
void recordStateStarted(StateInstance stateInstance, ProcessContext context);
/**
* Record state execution end event
+ *
* @param stateInstance
*/
void recordStateFinished(StateInstance stateInstance, ProcessContext context);
/**
* Get state machine instance
+ *
* @param stateMachineInstanceId
* @return
*/
@@ -67,6 +73,7 @@ public interface StateLogStore {
/**
* Get state machine instance by businessKey
+ *
* @param businessKey
* @param tenantId
* @return
@@ -75,6 +82,7 @@ public interface StateLogStore {
/**
* Query the list of state machine instances by parent id
+ *
* @param parentId
* @return
*/
@@ -82,6 +90,7 @@ public interface StateLogStore {
/**
* Get state instance
+ *
* @param stateInstanceId
* @param machineInstId
* @return
@@ -90,6 +99,7 @@ public interface StateLogStore {
/**
* Get a list of state instances by state machine instance id
+ *
* @param stateMachineInstanceId
* @return
*/
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/StatusDecisionStrategy.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/strategy/StatusDecisionStrategy.java
similarity index 89%
rename from saga/seata-saga-engine/src/main/java/io/seata/saga/engine/StatusDecisionStrategy.java
rename to saga/seata-saga-engine/src/main/java/io/seata/saga/engine/strategy/StatusDecisionStrategy.java
index c59660568667a3aa583c4a65916e80f0a0a21ea5..4069e321d23a86ed6ef0aa7695670189f1443518 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/StatusDecisionStrategy.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/strategy/StatusDecisionStrategy.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.seata.saga.engine;
+package io.seata.saga.engine.strategy;
import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.statelang.domain.StateMachineInstance;
@@ -22,7 +22,8 @@ import io.seata.saga.statelang.domain.StateMachineInstance;
* Default state machine execution status decision strategy.
* The strategy is to traverse the execution state of each state executed.
* If all state are successfully executed the state machine is successfully executed,
- * if there is a state that fails to execute which is for data update, the state machine execution status is considered to be UN (the data is inconsistent),
+ * if there is a state that fails to execute which is for data update, the state machine execution status is considered
+ * to be UN (the data is inconsistent),
* otherwise FA (failure: no data inconsistency)
*
* @author lorne.cl
@@ -31,6 +32,7 @@ public interface StatusDecisionStrategy {
/**
* Determine state machine execution status when executing to EndState
+ *
* @param context
* @param stateMachineInstance
* @param exp
@@ -39,6 +41,7 @@ public interface StatusDecisionStrategy {
/**
* Determine state machine execution status when executing TaskState error
+ *
* @param context
* @param stateMachineInstance
* @param exp
@@ -47,11 +50,12 @@ public interface StatusDecisionStrategy {
/**
* Determine the forward execution state of the state machine
+ *
* @param stateMachineInstance
* @param exp
* @param specialPolicy
* @return
*/
boolean decideMachineForwardExecutionStatus(StateMachineInstance stateMachineInstance, Exception exp,
- boolean specialPolicy);
+ boolean specialPolicy);
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/impl/DefaultStatusDecisionStrategy.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/strategy/impl/DefaultStatusDecisionStrategy.java
similarity index 83%
rename from saga/seata-saga-engine/src/main/java/io/seata/saga/engine/impl/DefaultStatusDecisionStrategy.java
rename to saga/seata-saga-engine/src/main/java/io/seata/saga/engine/strategy/impl/DefaultStatusDecisionStrategy.java
index 79f8f7eecdc06195d52ec0dbccd8428aaa3ab987..f1fab239ccc8a7d95f45e854b238933f344b1ad1 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/impl/DefaultStatusDecisionStrategy.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/strategy/impl/DefaultStatusDecisionStrategy.java
@@ -13,77 +13,41 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package io.seata.saga.engine.impl;
+package io.seata.saga.engine.strategy.impl;
+
+import java.util.Date;
+import java.util.List;
-import io.seata.saga.engine.StatusDecisionStrategy;
import io.seata.saga.engine.pcext.utils.CompensationHolder;
+import io.seata.saga.engine.strategy.StatusDecisionStrategy;
import io.seata.saga.engine.utils.ExceptionUtils;
+import io.seata.saga.engine.utils.ExceptionUtils.NetExceptionType;
import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.ExecutionStatus;
import io.seata.saga.statelang.domain.StateInstance;
import io.seata.saga.statelang.domain.StateMachineInstance;
-import io.seata.saga.engine.utils.ExceptionUtils.NetExceptionType;
-import java.util.Date;
-import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Default state machine execution status decision strategy
*
- * @see StatusDecisionStrategy
* @author lorne.cl
+ * @see StatusDecisionStrategy
*/
public class DefaultStatusDecisionStrategy implements StatusDecisionStrategy {
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultStatusDecisionStrategy.class);
- @Override
- public void decideOnEndState(ProcessContext context, StateMachineInstance stateMachineInstance, Exception exp) {
-
- if (ExecutionStatus.RU.equals(stateMachineInstance.getCompensationStatus())) {
-
- CompensationHolder compensationHolder = CompensationHolder.getCurrent(context, true);
- decideMachineCompensateStatus(stateMachineInstance, compensationHolder);
- } else {
- Object failEndStateFlag = context.getVariable(DomainConstants.VAR_NAME_FAIL_END_STATE_FLAG);
- boolean isComeFromFailEndState = (failEndStateFlag!= null && (Boolean)failEndStateFlag);
- decideMachineForwardExecutionStatus(stateMachineInstance, exp, isComeFromFailEndState);
- }
-
- if(stateMachineInstance.getCompensationStatus() != null
- && DomainConstants.OPERATION_NAME_FORWARD.equals(context.getVariable(DomainConstants.VAR_NAME_OPERATION_NAME))
- && ExecutionStatus.SU.equals(stateMachineInstance.getStatus())){
-
- stateMachineInstance.setCompensationStatus(ExecutionStatus.FA);
- }
-
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("StateMachine Instance[id:" + stateMachineInstance.getId() + ",name:" + stateMachineInstance.getStateMachine().getName()
- + "] execute finish with status[" + stateMachineInstance.getStatus() + "], compensation status ["
- + stateMachineInstance.getCompensationStatus() + "].");
- }
- }
-
- @Override
- public void decideOnTaskStateFail(ProcessContext context, StateMachineInstance stateMachineInstance, Exception exp) {
- if (!decideMachineForwardExecutionStatus(stateMachineInstance, exp, true)) {
-
- stateMachineInstance.setCompensationStatus(ExecutionStatus.UN);
- }
- stateMachineInstance.setRunning(false);
- stateMachineInstance.setGmtEnd(new Date());
- stateMachineInstance.setException(exp);
- }
-
/**
* decide machine compensate status
*
* @param stateMachineInstance
* @param compensationHolder
*/
- public static void decideMachineCompensateStatus(StateMachineInstance stateMachineInstance, CompensationHolder compensationHolder) {
+ public static void decideMachineCompensateStatus(StateMachineInstance stateMachineInstance,
+ CompensationHolder compensationHolder) {
if (stateMachineInstance.getStatus() == null || ExecutionStatus.RU.equals(stateMachineInstance.getStatus())) {
stateMachineInstance.setStatus(ExecutionStatus.UN);
@@ -92,15 +56,15 @@ public class DefaultStatusDecisionStrategy implements StatusDecisionStrategy {
boolean hasCompensateSUorUN = false;
for (StateInstance forCompensateState : compensationHolder.getStatesForCompensation().values()) {
- if (ExecutionStatus.UN.equals(forCompensateState.getStatus()) || ExecutionStatus.SU.equals(forCompensateState.getStatus())) {
+ if (ExecutionStatus.UN.equals(forCompensateState.getStatus()) || ExecutionStatus.SU.equals(
+ forCompensateState.getStatus())) {
hasCompensateSUorUN = true;
break;
}
}
- if(hasCompensateSUorUN){
+ if (hasCompensateSUorUN) {
stateMachineInstance.setCompensationStatus(ExecutionStatus.UN);
- }
- else{
+ } else {
stateMachineInstance.setCompensationStatus(ExecutionStatus.FA);
}
} else {
@@ -121,51 +85,15 @@ public class DefaultStatusDecisionStrategy implements StatusDecisionStrategy {
}
}
- /**
- * Determine the forward execution state of the state machine
- * @param stateMachineInstance
- * @param exp
- * @param specialPolicy
- * @return
- */
- @Override
- public boolean decideMachineForwardExecutionStatus(StateMachineInstance stateMachineInstance, Exception exp, boolean specialPolicy) {
- boolean result = false;
-
- if (stateMachineInstance.getStatus() == null || ExecutionStatus.RU.equals(stateMachineInstance.getStatus())) {
- result = true;
-
- List<StateInstance> stateList = stateMachineInstance.getStateList();
-
- boolean hasSetStatus = setMachineStatusBasedOnStateList(stateMachineInstance, stateList);
-
- if (!hasSetStatus) {
- setMachineStatusBasedOnException(stateMachineInstance, exp);
- }
-
- if (specialPolicy && ExecutionStatus.SU.equals(stateMachineInstance.getStatus())) {
- for (StateInstance stateInstance : stateMachineInstance.getStateList()) {
- if (!stateInstance.isIgnoreStatus() && (stateInstance.isForUpdate() || stateInstance.isForCompensation())) {
- stateMachineInstance.setStatus(ExecutionStatus.UN);
- break;
- }
- }
- if (ExecutionStatus.SU.equals(stateMachineInstance.getStatus())) {
- stateMachineInstance.setStatus(ExecutionStatus.FA);
- }
- }
- }
- return result;
-
- }
-
/**
* set machine status based on state list
+ *
* @param stateMachineInstance
* @param stateList
* @return
*/
- public static boolean setMachineStatusBasedOnStateList(StateMachineInstance stateMachineInstance, List<StateInstance> stateList) {
+ public static boolean setMachineStatusBasedOnStateList(StateMachineInstance stateMachineInstance,
+ List<StateInstance> stateList) {
boolean hasSetStatus = false;
if (stateList != null && stateList.size() > 0) {
@@ -209,6 +137,7 @@ public class DefaultStatusDecisionStrategy implements StatusDecisionStrategy {
/**
* set machine status based on net exception
+ *
* @param stateMachineInstance
* @param exp
*/
@@ -218,9 +147,8 @@ public class DefaultStatusDecisionStrategy implements StatusDecisionStrategy {
} else {
NetExceptionType t = ExceptionUtils.getNetExceptionType(exp);
if (t != null) {
- if (t.equals(NetExceptionType.CONNECT_EXCEPTION)
- || t.equals(NetExceptionType.CONNECT_TIMEOUT_EXCEPTION)
- || t.equals(NetExceptionType.NOT_NET_EXCEPTION)) {
+ if (t.equals(NetExceptionType.CONNECT_EXCEPTION) || t.equals(NetExceptionType.CONNECT_TIMEOUT_EXCEPTION)
+ || t.equals(NetExceptionType.NOT_NET_EXCEPTION)) {
stateMachineInstance.setStatus(ExecutionStatus.FA);
} else if (t.equals(NetExceptionType.READ_TIMEOUT_EXCEPTION)) {
stateMachineInstance.setStatus(ExecutionStatus.UN);
@@ -230,4 +158,85 @@ public class DefaultStatusDecisionStrategy implements StatusDecisionStrategy {
}
}
}
+
+ @Override
+ public void decideOnEndState(ProcessContext context, StateMachineInstance stateMachineInstance, Exception exp) {
+
+ if (ExecutionStatus.RU.equals(stateMachineInstance.getCompensationStatus())) {
+
+ CompensationHolder compensationHolder = CompensationHolder.getCurrent(context, true);
+ decideMachineCompensateStatus(stateMachineInstance, compensationHolder);
+ } else {
+ Object failEndStateFlag = context.getVariable(DomainConstants.VAR_NAME_FAIL_END_STATE_FLAG);
+ boolean isComeFromFailEndState = failEndStateFlag != null && (Boolean)failEndStateFlag;
+ decideMachineForwardExecutionStatus(stateMachineInstance, exp, isComeFromFailEndState);
+ }
+
+ if (stateMachineInstance.getCompensationStatus() != null && DomainConstants.OPERATION_NAME_FORWARD.equals(
+ context.getVariable(DomainConstants.VAR_NAME_OPERATION_NAME)) && ExecutionStatus.SU.equals(
+ stateMachineInstance.getStatus())) {
+
+ stateMachineInstance.setCompensationStatus(ExecutionStatus.FA);
+ }
+
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(
+ "StateMachine Instance[id:{},name:{}] execute finish with status[{}], compensation status [{}].",
+ stateMachineInstance.getId(), stateMachineInstance.getStateMachine().getName(),
+ stateMachineInstance.getStatus(), stateMachineInstance.getCompensationStatus());
+ }
+ }
+
+ @Override
+ public void decideOnTaskStateFail(ProcessContext context, StateMachineInstance stateMachineInstance,
+ Exception exp) {
+ if (!decideMachineForwardExecutionStatus(stateMachineInstance, exp, true)) {
+
+ stateMachineInstance.setCompensationStatus(ExecutionStatus.UN);
+ }
+ stateMachineInstance.setRunning(false);
+ stateMachineInstance.setGmtEnd(new Date());
+ stateMachineInstance.setException(exp);
+ }
+
+ /**
+ * Determine the forward execution state of the state machine
+ *
+ * @param stateMachineInstance
+ * @param exp
+ * @param specialPolicy
+ * @return
+ */
+ @Override
+ public boolean decideMachineForwardExecutionStatus(StateMachineInstance stateMachineInstance, Exception exp,
+ boolean specialPolicy) {
+ boolean result = false;
+
+ if (stateMachineInstance.getStatus() == null || ExecutionStatus.RU.equals(stateMachineInstance.getStatus())) {
+ result = true;
+
+ List<StateInstance> stateList = stateMachineInstance.getStateList();
+
+ boolean hasSetStatus = setMachineStatusBasedOnStateList(stateMachineInstance, stateList);
+
+ if (!hasSetStatus) {
+ setMachineStatusBasedOnException(stateMachineInstance, exp);
+ }
+
+ if (specialPolicy && ExecutionStatus.SU.equals(stateMachineInstance.getStatus())) {
+ for (StateInstance stateInstance : stateMachineInstance.getStateList()) {
+ if (!stateInstance.isIgnoreStatus() && (stateInstance.isForUpdate() || stateInstance
+ .isForCompensation())) {
+ stateMachineInstance.setStatus(ExecutionStatus.UN);
+ break;
+ }
+ }
+ if (ExecutionStatus.SU.equals(stateMachineInstance.getStatus())) {
+ stateMachineInstance.setStatus(ExecutionStatus.FA);
+ }
+ }
+ }
+ return result;
+
+ }
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/utils/ExceptionUtils.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/utils/ExceptionUtils.java
index e1f555848a85a9a64b7a413d9d0796961157ca14..c2ae2d6cdfc3ecae8925d31574a4cd11fad7c94b 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/utils/ExceptionUtils.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/utils/ExceptionUtils.java
@@ -27,32 +27,16 @@ import io.seata.saga.statelang.domain.StateMachineInstance;
*/
public class ExceptionUtils {
- public static final String CONNECT_TIMED_OUT = "connect timed out";
+ public static final String CONNECT_TIMED_OUT = "connect timed out";
public static final String CONNECT_TIME_OUT_EXCEPTION_CLASS_NAME = "ConnectTimeoutException";
- public static final String READ_TIME_OUT_EXCEPTION_CLASS_NAME = "ReadTimeoutException";
- public static final String CONNECT_EXCEPTION_CLASS_NAME = "ConnectException";
- public static final int MAX_CAUSE_DEP = 20;
+ public static final String READ_TIME_OUT_EXCEPTION_CLASS_NAME = "ReadTimeoutException";
+ public static final String CONNECT_EXCEPTION_CLASS_NAME = "ConnectException";
+ public static final int MAX_CAUSE_DEP = 20;
- public enum NetExceptionType {
- /**
- * Exception occurred while creating connection
- */
- CONNECT_EXCEPTION,
- /**
- * create connection timeout
- */
- CONNECT_TIMEOUT_EXCEPTION,
- /**
- * read timeout from remote（request has sent）
- */
- READ_TIMEOUT_EXCEPTION,
- /**
- * not a network exception
- */
- NOT_NET_EXCEPTION
- }
-
- public static EngineExecutionException createEngineExecutionException(Exception e, FrameworkErrorCode code, String message, StateMachineInstance stateMachineInstance, StateInstance stateInstance) {
+ public static EngineExecutionException createEngineExecutionException(Exception e, FrameworkErrorCode code,
+ String message,
+ StateMachineInstance stateMachineInstance,
+ StateInstance stateInstance) {
EngineExecutionException exception = new EngineExecutionException(e, message, code);
if (stateMachineInstance != null) {
exception.setStateMachineName(stateMachineInstance.getStateMachine().getAppName());
@@ -65,12 +49,17 @@ public class ExceptionUtils {
return exception;
}
- public static EngineExecutionException createEngineExecutionException(FrameworkErrorCode code, String message, StateMachineInstance stateMachineInstance, StateInstance stateInstance) {
+ public static EngineExecutionException createEngineExecutionException(FrameworkErrorCode code, String message,
+ StateMachineInstance stateMachineInstance,
+ StateInstance stateInstance) {
return createEngineExecutionException(null, code, message, stateMachineInstance, stateInstance);
}
- public static EngineExecutionException createEngineExecutionException(Exception e, FrameworkErrorCode code, String message, StateMachineInstance stateMachineInstance, String stateName) {
+ public static EngineExecutionException createEngineExecutionException(Exception e, FrameworkErrorCode code,
+ String message,
+ StateMachineInstance stateMachineInstance,
+ String stateName) {
EngineExecutionException exception = new EngineExecutionException(e, message, code);
if (stateMachineInstance != null) {
exception.setStateMachineName(stateMachineInstance.getStateMachine().getAppName());
@@ -86,38 +75,31 @@ public class ExceptionUtils {
* @param throwable
* @return
*/
- public static NetExceptionType getNetExceptionType(Throwable throwable){
+ public static NetExceptionType getNetExceptionType(Throwable throwable) {
Throwable currentCause = throwable;
int dep = MAX_CAUSE_DEP;
- while(currentCause != null && dep > 0){
+ while (currentCause != null && dep > 0) {
- if(currentCause instanceof java.net.SocketTimeoutException){
- if(CONNECT_TIMED_OUT.equals(currentCause.getMessage())){
+ if (currentCause instanceof java.net.SocketTimeoutException) {
+ if (CONNECT_TIMED_OUT.equals(currentCause.getMessage())) {
return NetExceptionType.CONNECT_TIMEOUT_EXCEPTION;
- }
- else{
+ } else {
return NetExceptionType.READ_TIMEOUT_EXCEPTION;
}
- }
- else if(currentCause instanceof java.net.ConnectException){
+ } else if (currentCause instanceof java.net.ConnectException) {
return NetExceptionType.CONNECT_EXCEPTION;
- }
-
- else if(currentCause.getClass().getSimpleName().contains(CONNECT_TIME_OUT_EXCEPTION_CLASS_NAME)){
+ } else if (currentCause.getClass().getSimpleName().contains(CONNECT_TIME_OUT_EXCEPTION_CLASS_NAME)) {
return NetExceptionType.CONNECT_TIMEOUT_EXCEPTION;
- }
- else if(currentCause.getClass().getSimpleName().contains(READ_TIME_OUT_EXCEPTION_CLASS_NAME)){
+ } else if (currentCause.getClass().getSimpleName().contains(READ_TIME_OUT_EXCEPTION_CLASS_NAME)) {
return NetExceptionType.READ_TIMEOUT_EXCEPTION;
- }
- else if(currentCause.getClass().getSimpleName().contains(CONNECT_EXCEPTION_CLASS_NAME)){
+ } else if (currentCause.getClass().getSimpleName().contains(CONNECT_EXCEPTION_CLASS_NAME)) {
return NetExceptionType.CONNECT_EXCEPTION;
- }
- else{
+ } else {
Throwable parentCause = currentCause.getCause();
- if(parentCause == null || parentCause == currentCause){
+ if (parentCause == null || parentCause == currentCause) {
break;
}
currentCause = parentCause;
@@ -126,4 +108,33 @@ public class ExceptionUtils {
}
return NetExceptionType.NOT_NET_EXCEPTION;
}
+
+ public enum NetExceptionType {
+ /**
+ * Exception occurred while creating connection
+ */
+ CONNECT_EXCEPTION,
+ /**
+ * create connection timeout
+ */
+ CONNECT_TIMEOUT_EXCEPTION,
+ /**
+ * read timeout from remote(request has sent)
+ */
+ READ_TIMEOUT_EXCEPTION,
+ /**
+ * not a network exception
+ */
+ NOT_NET_EXCEPTION
+ }
+
+ /**
+ * Determine if the it is network exception
+ * @param throwable
+ * @return
+ */
+ public static boolean isNetException(Throwable throwable) {
+ NetExceptionType netExceptionType = getNetExceptionType(throwable);
+ return netExceptionType != null && netExceptionType != NetExceptionType.NOT_NET_EXCEPTION;
+ }
}
\ No newline at end of file
diff --git a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/utils/ProcessContextBuilder.java b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/utils/ProcessContextBuilder.java
index a00416d9bd6da9b97e9c1386f9cf848e0e1a2fec..717ab92a8124c2b4adc7e1a21e6d789512597e4b 100644
--- a/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/utils/ProcessContextBuilder.java
+++ b/saga/seata-saga-engine/src/main/java/io/seata/saga/engine/utils/ProcessContextBuilder.java
@@ -15,6 +15,8 @@
*/
package io.seata.saga.engine.utils;
+import java.util.Map;
+
import io.seata.saga.engine.AsyncCallback;
import io.seata.saga.engine.StateMachineConfig;
import io.seata.saga.engine.StateMachineEngine;
@@ -26,87 +28,87 @@ import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.StateInstance;
import io.seata.saga.statelang.domain.StateMachineInstance;
-import java.util.Map;
-
/**
* Process Context Builder
+ *
* @author lorne.cl
*/
public class ProcessContextBuilder {
private ProcessContextImpl processContext;
- private ProcessContextBuilder(){
+ private ProcessContextBuilder() {
this.processContext = new ProcessContextImpl();
}
- public static ProcessContextBuilder create(){
+ public static ProcessContextBuilder create() {
return new ProcessContextBuilder();
}
- public ProcessContext build(){
+ public ProcessContext build() {
return processContext;
}
- public ProcessContextBuilder withProcessType(ProcessType processType){
- if(processType != null){
+ public ProcessContextBuilder withProcessType(ProcessType processType) {
+ if (processType != null) {
this.processContext.setVariable(ProcessContext.VAR_NAME_PROCESS_TYPE, processType);
}
return this;
}
- public ProcessContextBuilder withAsyncCallback(AsyncCallback asyncCallback){
- if(asyncCallback != null){
+ public ProcessContextBuilder withAsyncCallback(AsyncCallback asyncCallback) {
+ if (asyncCallback != null) {
this.processContext.setVariable(DomainConstants.VAR_NAME_ASYNC_CALLBACK, asyncCallback);
}
return this;
}
- public ProcessContextBuilder withInstruction(Instruction instruction){
- if(instruction != null){
+ public ProcessContextBuilder withInstruction(Instruction instruction) {
+ if (instruction != null) {
this.processContext.setInstruction(instruction);
}
return this;
}
- public ProcessContextBuilder withStateMachineInstance(StateMachineInstance stateMachineInstance){
- if(stateMachineInstance != null){
+ public ProcessContextBuilder withStateMachineInstance(StateMachineInstance stateMachineInstance) {
+ if (stateMachineInstance != null) {
this.processContext.setVariable(DomainConstants.VAR_NAME_STATEMACHINE_INST, stateMachineInstance);
- this.processContext.setVariable(DomainConstants.VAR_NAME_STATEMACHINE, stateMachineInstance.getStateMachine());
+ this.processContext.setVariable(DomainConstants.VAR_NAME_STATEMACHINE,
+ stateMachineInstance.getStateMachine());
}
return this;
}
- public ProcessContextBuilder withStateMachineEngine(StateMachineEngine stateMachineEngine){
- if(stateMachineEngine != null){
+ public ProcessContextBuilder withStateMachineEngine(StateMachineEngine stateMachineEngine) {
+ if (stateMachineEngine != null) {
this.processContext.setVariable(DomainConstants.VAR_NAME_STATEMACHINE_ENGINE, stateMachineEngine);
}
return this;
}
- public ProcessContextBuilder withStateMachineConfig(StateMachineConfig stateMachineConfig){
- if(stateMachineConfig != null){
+ public ProcessContextBuilder withStateMachineConfig(StateMachineConfig stateMachineConfig) {
+ if (stateMachineConfig != null) {
this.processContext.setVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONFIG, stateMachineConfig);
}
return this;
}
- public ProcessContextBuilder withStateMachineContextVariables(Map<String, Object> contextVariables){
- if(contextVariables != null){
+ public ProcessContextBuilder withStateMachineContextVariables(Map<String, Object> contextVariables) {
+ if (contextVariables != null) {
this.processContext.setVariable(DomainConstants.VAR_NAME_STATEMACHINE_CONTEXT, contextVariables);
}
return this;
}
- public ProcessContextBuilder withOperationName(String operationName){
- if(operationName != null){
+ public ProcessContextBuilder withOperationName(String operationName) {
+ if (operationName != null) {
this.processContext.setVariable(DomainConstants.VAR_NAME_OPERATION_NAME, operationName);
}
return this;
}
- public ProcessContextBuilder withStateInstance(StateInstance stateInstance){
- if(stateInstance != null){
+ public ProcessContextBuilder withStateInstance(StateInstance stateInstance) {
+ if (stateInstance != null) {
this.processContext.setVariable(DomainConstants.VAR_NAME_STATE_INST, stateInstance);
}
return this;
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/HierarchicalProcessContext.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/HierarchicalProcessContext.java
index a87cb61e3bc8e43627207322b874c41176aa061e..e768dfb8816ff96a2c51f5eb2fd90cbd73f7ad2d 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/HierarchicalProcessContext.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/HierarchicalProcessContext.java
@@ -35,7 +35,7 @@ public interface HierarchicalProcessContext extends ProcessContext {
/**
* Sets set variable locally.
*
- * @param name the name
+ * @param name the name
* @param value the value
*/
void setVariableLocally(String name, Object value);
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/Instruction.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/Instruction.java
index 430b337de7ebbbdff2b88a863a523eb99d5bdc30..b9aa015e9d75425350af50109ee4d20080eaaf10 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/Instruction.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/Instruction.java
@@ -23,4 +23,5 @@ package io.seata.saga.proctrl;
* @author lorne.cl
*/
public interface Instruction {
+
}
\ No newline at end of file
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessContext.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessContext.java
index 96422f7a6d855a7d9cdf723ccb6a678c8512d6d8..118f8d20598e44c364aff6e97af9c129bb0bb2fe 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessContext.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessContext.java
@@ -38,7 +38,7 @@ public interface ProcessContext {
/**
* Sets set variable.
*
- * @param name the name
+ * @param name the name
* @param value the value
*/
void setVariable(String name, Object value);
@@ -80,18 +80,18 @@ public interface ProcessContext {
Instruction getInstruction();
/**
- * Gets get instruction.
+ * Sets set instruction.
*
- * @param <T> the type parameter
- * @param clazz the clazz
- * @return the get instruction
+ * @param instruction the instruction
*/
- <T extends Instruction> T getInstruction(Class<T> clazz);
+ void setInstruction(Instruction instruction);
/**
- * Sets set instruction.
+ * Gets get instruction.
*
- * @param instruction the instruction
+ * @param <T> the type parameter
+ * @param clazz the clazz
+ * @return the get instruction
*/
- void setInstruction(Instruction instruction);
+ <T extends Instruction> T getInstruction(Class<T> clazz);
}
\ No newline at end of file
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessController.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessController.java
index d074e6923fe7d8e0af71a900ec956a129821367c..89f2991859b60d349552ce653e9944faef41dcbe 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessController.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessController.java
@@ -27,6 +27,7 @@ public interface ProcessController {
/**
* process business logic
+ *
* @param context
* @throws FrameworkException
*/
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessRouter.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessRouter.java
index b9d60ef34e762bc75dfcff9f09dfff49b9dec559..2a277b8e9f0aed31b2a9defe6d382614cd847d0f 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessRouter.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/ProcessRouter.java
@@ -27,6 +27,7 @@ public interface ProcessRouter {
/**
* route
+ *
* @param context
* @return
* @throws FrameworkException
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/EventBus.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/EventBus.java
index 4f688ce55f69e53c8787ad4cd827d9ff5c198c27..b6e092f5a01d3ce49ac4fd2b1e6b149ab7873348 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/EventBus.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/EventBus.java
@@ -15,9 +15,10 @@
*/
package io.seata.saga.proctrl.eventing;
-import io.seata.common.exception.FrameworkException;
import java.util.List;
+import io.seata.common.exception.FrameworkException;
+
/**
* Event bus
*
@@ -36,6 +37,7 @@ public interface EventBus<E> {
/**
* get event consumers
+ *
* @param clazz
* @return
*/
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/AbstractEventBus.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/AbstractEventBus.java
index 3ad00506de45d45d178399d071ea08b10fefc293..fc6950eda039bae3ec413273def94cd0b7c032fc 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/AbstractEventBus.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/AbstractEventBus.java
@@ -15,11 +15,12 @@
*/
package io.seata.saga.proctrl.eventing.impl;
-import io.seata.saga.proctrl.eventing.EventBus;
-import io.seata.saga.proctrl.eventing.EventConsumer;
import java.util.ArrayList;
import java.util.List;
+import io.seata.saga.proctrl.eventing.EventBus;
+import io.seata.saga.proctrl.eventing.EventConsumer;
+
/**
* Abstract Event Bus
*
@@ -34,8 +35,8 @@ public abstract class AbstractEventBus<E> implements EventBus<E> {
public List<EventConsumer> getEventConsumers(Class clazz) {
List<EventConsumer> acceptedConsumers = new ArrayList<>();
- for(EventConsumer eventConsumer : eventConsumerList){
- if(eventConsumer.accept(clazz)){
+ for (EventConsumer eventConsumer : eventConsumerList) {
+ if (eventConsumer.accept(clazz)) {
acceptedConsumers.add(eventConsumer);
}
}
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/AsyncEventBus.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/AsyncEventBus.java
index 9da28e312d14721ad5422de2a263187b888ef4e1..ad6a13a1e541351a15fc731759e680742953c573 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/AsyncEventBus.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/AsyncEventBus.java
@@ -15,11 +15,12 @@
*/
package io.seata.saga.proctrl.eventing.impl;
+import java.util.List;
+import java.util.concurrent.ThreadPoolExecutor;
+
import io.seata.common.exception.FrameworkException;
import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.proctrl.eventing.EventConsumer;
-import java.util.List;
-import java.util.concurrent.ThreadPoolExecutor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -38,14 +39,14 @@ public class AsyncEventBus extends AbstractEventBus<ProcessContext> {
public boolean offer(ProcessContext context) throws FrameworkException {
List<EventConsumer> eventConsumers = getEventConsumers(context.getClass());
- if(eventConsumers == null || eventConsumers.size() == 0){
- if(LOGGER.isWarnEnabled()){
+ if (eventConsumers == null || eventConsumers.size() == 0) {
+ if (LOGGER.isWarnEnabled()) {
LOGGER.warn("cannot find event handler by class: " + context.getClass());
}
return false;
}
- for(EventConsumer eventConsumer : eventConsumers){
+ for (EventConsumer eventConsumer : eventConsumers) {
threadPoolExecutor.execute(new Runnable() {
@Override
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/DirectEventBus.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/DirectEventBus.java
index 77af409b5bc5732c498e9c477b2cbeb423166384..76699682db28cdfe33edd6aecab3e570fed303e8 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/DirectEventBus.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/eventing/impl/DirectEventBus.java
@@ -15,13 +15,12 @@
*/
package io.seata.saga.proctrl.eventing.impl;
-import io.seata.common.exception.FrameworkException;
-import io.seata.saga.proctrl.ProcessContext;
-import io.seata.saga.proctrl.eventing.EventConsumer;
-
import java.util.List;
import java.util.Stack;
+import io.seata.common.exception.FrameworkException;
+import io.seata.saga.proctrl.ProcessContext;
+import io.seata.saga.proctrl.eventing.EventConsumer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,8 +38,8 @@ public class DirectEventBus extends AbstractEventBus<ProcessContext> {
@Override
public boolean offer(ProcessContext context) throws FrameworkException {
List<EventConsumer> eventHandlers = getEventConsumers(context.getClass());
- if(eventHandlers == null || eventHandlers.size() == 0){
- if(LOGGER.isWarnEnabled()){
+ if (eventHandlers == null || eventHandlers.size() == 0) {
+ if (LOGGER.isWarnEnabled()) {
LOGGER.warn("cannot find event handler by class: " + context.getClass());
}
return false;
@@ -48,10 +47,10 @@ public class DirectEventBus extends AbstractEventBus<ProcessContext> {
boolean isFirstEvent = false;
Stack<ProcessContext> currentStack = (Stack<ProcessContext>)context.getVariable(VAR_NAME_SYNC_EXE_STACK);
- if(currentStack == null){
+ if (currentStack == null) {
synchronized (context) {
currentStack = (Stack<ProcessContext>)context.getVariable(VAR_NAME_SYNC_EXE_STACK);
- if(currentStack == null){
+ if (currentStack == null) {
currentStack = new Stack<>();
context.setVariable(VAR_NAME_SYNC_EXE_STACK, currentStack);
isFirstEvent = true;
@@ -61,11 +60,11 @@ public class DirectEventBus extends AbstractEventBus<ProcessContext> {
currentStack.push(context);
- if(isFirstEvent){
+ if (isFirstEvent) {
try {
- while (currentStack.size() > 0){
+ while (currentStack.size() > 0) {
ProcessContext currentContext = currentStack.pop();
- for(EventConsumer eventHandler : eventHandlers){
+ for (EventConsumer eventHandler : eventHandlers) {
eventHandler.process(currentContext);
}
}
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/handler/DefaultRouterHandler.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/handler/DefaultRouterHandler.java
index 25ab67353c6cda3386d2405f4af5a1c73602b645..5df3fad9af7e35b5b21a2fd07183d96d5ed24060 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/handler/DefaultRouterHandler.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/handler/DefaultRouterHandler.java
@@ -15,6 +15,8 @@
*/
package io.seata.saga.proctrl.handler;
+import java.util.Map;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.common.exception.FrameworkException;
import io.seata.saga.proctrl.Instruction;
@@ -25,10 +27,9 @@ import io.seata.saga.proctrl.eventing.EventPublisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Map;
-
/**
* Default Router handler
+ *
* @author jin.xie
* @author lorne.cl
*/
@@ -37,29 +38,37 @@ public class DefaultRouterHandler implements RouterHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultRouterHandler.class);
private EventPublisher<ProcessContext> eventPublisher;
- private Map<String, ProcessRouter> processRouters;
+ private Map<String, ProcessRouter> processRouters;
+ public static ProcessType matchProcessType(ProcessContext context) {
+ ProcessType processType = (ProcessType)context.getVariable(ProcessContext.VAR_NAME_PROCESS_TYPE);
+ if (processType == null) {
+ processType = ProcessType.STATE_LANG;
+ }
+ return processType;
+ }
+ @Override
public void route(ProcessContext context) throws FrameworkException {
try {
ProcessType processType = matchProcessType(context);
if (processType == null) {
- if(LOGGER.isWarnEnabled()){
- LOGGER.warn("Process type not found, context=" + context);
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Process type not found, context= {}", context);
}
throw new FrameworkException(FrameworkErrorCode.ProcessTypeNotFound);
}
ProcessRouter processRouter = processRouters.get(processType.getCode());
if (processRouter == null) {
- LOGGER.error("Cannot find process router by type "+ processType.getCode() +", context=" + context);
+ LOGGER.error("Cannot find process router by type {}, context = {}", processType.getCode(), context);
throw new FrameworkException(FrameworkErrorCode.ProcessRouterNotFound);
}
Instruction instruction = processRouter.route(context);
if (instruction == null) {
- LOGGER.warn("route instruction is null, process end:" + context);
+ LOGGER.warn("route instruction is null, process end");
} else {
context.setInstruction(instruction);
@@ -72,16 +81,7 @@ public class DefaultRouterHandler implements RouterHandler {
}
}
- public static ProcessType matchProcessType(ProcessContext context){
- ProcessType processType = (ProcessType)context.getVariable(ProcessContext.VAR_NAME_PROCESS_TYPE);
- if(processType == null){
- processType = ProcessType.STATE_LANG;
- }
- return processType;
- }
-
- public void setEventPublisher(
- EventPublisher<ProcessContext> eventPublisher) {
+ public void setEventPublisher(EventPublisher<ProcessContext> eventPublisher) {
this.eventPublisher = eventPublisher;
}
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/impl/ProcessContextImpl.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/impl/ProcessContextImpl.java
index 2179ed1f92e4727f62dca4fd728c0e812af22677..2952737b0e76204e145735a2a73547c751732b3d 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/impl/ProcessContextImpl.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/impl/ProcessContextImpl.java
@@ -15,14 +15,15 @@
*/
package io.seata.saga.proctrl.impl;
-import io.seata.saga.proctrl.HierarchicalProcessContext;
-import io.seata.saga.proctrl.Instruction;
-import io.seata.saga.proctrl.ProcessContext;
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import io.seata.saga.proctrl.HierarchicalProcessContext;
+import io.seata.saga.proctrl.Instruction;
+import io.seata.saga.proctrl.ProcessContext;
+
/**
* The default process context implementation
*
@@ -52,12 +53,10 @@ public class ProcessContextImpl implements HierarchicalProcessContext, ProcessCo
public void setVariable(String name, Object value) {
if (variables.containsKey(name)) {
setVariableLocally(name, value);
- }
- else {
+ } else {
if (parent != null) {
parent.setVariable(name, value);
- }
- else {
+ } else {
setVariableLocally(name, value);
}
}
@@ -67,7 +66,7 @@ public class ProcessContextImpl implements HierarchicalProcessContext, ProcessCo
public Map<String, Object> getVariables() {
Map<String, Object> collectedVariables = new HashMap<>();
- if(parent != null){
+ if (parent != null) {
collectedVariables.putAll(parent.getVariables());
}
for (String name : variables.keySet()) {
@@ -86,7 +85,6 @@ public class ProcessContextImpl implements HierarchicalProcessContext, ProcessCo
}
}
-
@Override
public Object getVariableLocally(String name) {
return variables.get(name);
@@ -124,13 +122,13 @@ public class ProcessContextImpl implements HierarchicalProcessContext, ProcessCo
}
@Override
- public <T extends Instruction> T getInstruction(Class<T> clazz) {
- return (T)instruction;
+ public void setInstruction(Instruction instruction) {
+ this.instruction = instruction;
}
@Override
- public void setInstruction(Instruction instruction) {
- this.instruction = instruction;
+ public <T extends Instruction> T getInstruction(Class<T> clazz) {
+ return (T)instruction;
}
@Override
@@ -171,10 +169,6 @@ public class ProcessContextImpl implements HierarchicalProcessContext, ProcessCo
@Override
public String toString() {
- return "{" +
- "variables=" + variables +
- ", instruction=" + instruction +
- ", parent=" + parent +
- '}';
+ return "{" + "variables=" + variables + ", instruction=" + instruction + ", parent=" + parent + '}';
}
}
\ No newline at end of file
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/impl/ProcessControllerImpl.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/impl/ProcessControllerImpl.java
index 5c9845be945ba69f9b483794b0c8ad98d64b97c6..6361369e227722cf8bd4aaf952f9f0c80832e9d5 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/impl/ProcessControllerImpl.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/impl/ProcessControllerImpl.java
@@ -47,7 +47,7 @@ public class ProcessControllerImpl implements ProcessController {
} catch (FrameworkException fex) {
throw fex;
} catch (Exception ex) {
- LOGGER.error("Unknown exception occurred, context=" + context, ex);
+ LOGGER.error("Unknown exception occurred, context = {}", context, ex);
throw new FrameworkException(ex, "Unknown exception occurred", FrameworkErrorCode.UnknownAppError);
}
}
@@ -55,4 +55,4 @@ public class ProcessControllerImpl implements ProcessController {
public void setBusinessProcessor(BusinessProcessor businessProcessor) {
this.businessProcessor = businessProcessor;
}
-}
\ No newline at end of file
+}
diff --git a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/process/impl/CustomizeBusinessProcessor.java b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/process/impl/CustomizeBusinessProcessor.java
index 737794d68a99f437fab49d8cc7d612b0e24d8808..1362fe147a977b3b72ede6513adb84d047c11951 100644
--- a/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/process/impl/CustomizeBusinessProcessor.java
+++ b/saga/seata-saga-processctrl/src/main/java/io/seata/saga/proctrl/process/impl/CustomizeBusinessProcessor.java
@@ -15,6 +15,8 @@
*/
package io.seata.saga.proctrl.process.impl;
+import java.util.Map;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.common.exception.FrameworkException;
import io.seata.saga.proctrl.ProcessContext;
@@ -23,7 +25,6 @@ import io.seata.saga.proctrl.handler.ProcessHandler;
import io.seata.saga.proctrl.handler.RouterHandler;
import io.seata.saga.proctrl.impl.ProcessControllerImpl;
import io.seata.saga.proctrl.process.BusinessProcessor;
-import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -39,22 +40,30 @@ public class CustomizeBusinessProcessor implements BusinessProcessor {
private Map<String, ProcessHandler> processHandlers;
- private Map<String, RouterHandler> routerHandlers;
+ private Map<String, RouterHandler> routerHandlers;
+
+ public static ProcessType matchProcessType(ProcessContext context) {
+ ProcessType processType = (ProcessType)context.getVariable(ProcessContext.VAR_NAME_PROCESS_TYPE);
+ if (processType == null) {
+ processType = ProcessType.STATE_LANG;
+ }
+ return processType;
+ }
@Override
public void process(ProcessContext context) throws FrameworkException {
ProcessType processType = matchProcessType(context);
if (processType == null) {
- if(LOGGER.isWarnEnabled()){
- LOGGER.warn("Process type not found, context=" + context);
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Process type not found, context= {}", context);
}
throw new FrameworkException(FrameworkErrorCode.ProcessTypeNotFound);
}
ProcessHandler processor = processHandlers.get(processType.getCode());
if (processor == null) {
- LOGGER.error("Cannot find process handler by type "+ processType.getCode() +", context=" + context);
+ LOGGER.error("Cannot find process handler by type {}, context= {}", processType.getCode(), context);
throw new FrameworkException(FrameworkErrorCode.ProcessHandlerNotFound);
}
@@ -66,29 +75,21 @@ public class CustomizeBusinessProcessor implements BusinessProcessor {
ProcessType processType = matchProcessType(context);
if (processType == null) {
- if(LOGGER.isWarnEnabled()){
- LOGGER.warn("Process type not found, the process is no longer advanced, context=" + context);
+ if (LOGGER.isWarnEnabled()) {
+ LOGGER.warn("Process type not found, the process is no longer advanced, context= {}", context);
}
return;
}
RouterHandler router = routerHandlers.get(processType.getCode());
if (router == null) {
- LOGGER.error("Cannot find router handler by type "+ processType.getCode() +", context=" + context);
+ LOGGER.error("Cannot find router handler by type {}, context= {}", processType.getCode(), context);
return;
}
router.route(context);
}
- public static ProcessType matchProcessType(ProcessContext context){
- ProcessType processType = (ProcessType)context.getVariable(ProcessContext.VAR_NAME_PROCESS_TYPE);
- if(processType == null){
- processType = ProcessType.STATE_LANG;
- }
- return processType;
- }
-
public void setProcessHandlers(Map<String, ProcessHandler> processHandlers) {
this.processHandlers = processHandlers;
}
@@ -96,4 +97,4 @@ public class CustomizeBusinessProcessor implements BusinessProcessor {
public void setRouterHandlers(Map<String, RouterHandler> routerHandlers) {
this.routerHandlers = routerHandlers;
}
-}
\ No newline at end of file
+}
diff --git a/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/ProcessControllerTests.java b/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/ProcessControllerTests.java
index 9ef2fae224247f2c614bb063e6780297568674fe..cb0f866916492840125ead91861af2e4f6f265f7 100644
--- a/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/ProcessControllerTests.java
+++ b/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/ProcessControllerTests.java
@@ -15,6 +15,12 @@
*/
package io.seata.saga.proctrl;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
import io.seata.saga.proctrl.eventing.impl.AsyncEventBus;
import io.seata.saga.proctrl.eventing.impl.DirectEventBus;
import io.seata.saga.proctrl.eventing.impl.ProcessCtrlEventConsumer;
@@ -31,20 +37,15 @@ import io.seata.saga.proctrl.process.impl.CustomizeBusinessProcessor;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
/**
* ProcessController Tests
+ *
* @author lorne.cl
*/
public class ProcessControllerTests {
@Test
- public void testSimpleProcessCtrl(){
+ public void testSimpleProcessCtrl() {
try {
ProcessCtrlEventPublisher processCtrlEventPublisher = buildEventPublisher();
@@ -62,7 +63,7 @@ public class ProcessControllerTests {
}
@Test
- public void testSimpleProcessCtrlAsync(){
+ public void testSimpleProcessCtrlAsync() {
try {
ProcessCtrlEventPublisher processCtrlEventPublisher = buildAsyncEventPublisher();
@@ -104,7 +105,8 @@ public class ProcessControllerTests {
processCtrlEventConsumer.setProcessController(processorController);
AsyncEventBus asyncEventBus = new AsyncEventBus();
- asyncEventBus.setThreadPoolExecutor(new ThreadPoolExecutor(1, 5, 5000, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>()));
+ asyncEventBus.setThreadPoolExecutor(
+ new ThreadPoolExecutor(1, 5, 5000, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>()));
asyncEventPublisher.setEventBus(asyncEventBus);
diff --git a/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockInstruction.java b/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockInstruction.java
index 5002de00a51797fd83187498a6ea8d199540de69..a92f154b0bd30e1c17df0086f8eb14479f8cb5fb 100644
--- a/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockInstruction.java
+++ b/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockInstruction.java
@@ -18,7 +18,6 @@ package io.seata.saga.proctrl.mock;
import io.seata.saga.proctrl.Instruction;
/**
- *
* @author lorne.cl
*/
public class MockInstruction implements Instruction {
@@ -35,8 +34,6 @@ public class MockInstruction implements Instruction {
@Override
public String toString() {
- return "MockInstruction{" +
- "testString='" + testString + '\'' +
- '}';
+ return "MockInstruction{" + "testString='" + testString + '\'' + '}';
}
}
\ No newline at end of file
diff --git a/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockProcessHandler.java b/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockProcessHandler.java
index c5e960ac54aca1b54c17b4462b07641084783dcc..170a0c4e9f4bd52213a7c313e74c78a20de21d08 100644
--- a/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockProcessHandler.java
+++ b/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockProcessHandler.java
@@ -20,7 +20,6 @@ import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.proctrl.handler.ProcessHandler;
/**
- *
* @author lorne.cl
*/
public class MockProcessHandler implements ProcessHandler {
diff --git a/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockProcessRouter.java b/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockProcessRouter.java
index 0abade0a8a51787b8b3e30e98189a4faf4c8bbd0..7fbf5f2c51b8181bd19524bf99b441854b64e019 100644
--- a/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockProcessRouter.java
+++ b/saga/seata-saga-processctrl/src/test/java/io/seata/saga/proctrl/mock/MockProcessRouter.java
@@ -21,7 +21,6 @@ import io.seata.saga.proctrl.ProcessContext;
import io.seata.saga.proctrl.ProcessRouter;
/**
- *
* @author lorne.cl
*/
public class MockProcessRouter implements ProcessRouter {
@@ -29,15 +28,13 @@ public class MockProcessRouter implements ProcessRouter {
@Override
public Instruction route(ProcessContext context) throws FrameworkException {
System.out.println("MockProcessRouter.route executed. context: " + context);
- MockInstruction instruction = context.getInstruction(MockInstruction.class);
- if(instruction != null){
- if("one".equals(instruction.getTestString())){
+ MockInstruction instruction = context.getInstruction(MockInstruction.class);
+ if (instruction != null) {
+ if ("one".equals(instruction.getTestString())) {
instruction.setTestString("two");
- }
- else if("two".equals(instruction.getTestString())){
+ } else if ("two".equals(instruction.getTestString())) {
instruction.setTestString("three");
- }
- else{
+ } else {
instruction.setTestString(null);
return null;//end process
}
diff --git a/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/RMHandlerSaga.java b/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/RMHandlerSaga.java
index db378bceff3e2ce77ca5627dd1846725eed1a67c..03fb65740f06586d943e7d7ca72f8ad301d43b7f 100644
--- a/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/RMHandlerSaga.java
+++ b/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/RMHandlerSaga.java
@@ -35,6 +35,7 @@ public class RMHandlerSaga extends AbstractRMHandler {
/**
* get SAGA resource manager
+ *
* @return
*/
@Override
@@ -43,7 +44,7 @@ public class RMHandlerSaga extends AbstractRMHandler {
}
@Override
- public BranchType getBranchType(){
+ public BranchType getBranchType() {
return BranchType.SAGA;
}
diff --git a/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/SagaResource.java b/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/SagaResource.java
index a82dd10569687afd9ddfe461d30a048c22fbc205..8a087c3b8c45c126e766e35da306e6e49b3d4755 100644
--- a/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/SagaResource.java
+++ b/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/SagaResource.java
@@ -20,6 +20,7 @@ import io.seata.core.model.Resource;
/**
* Saga resource (Only register application as a saga resource)
+ *
* @author lorne.cl
*/
public class SagaResource implements Resource {
@@ -38,6 +39,15 @@ public class SagaResource implements Resource {
return resourceGroupId;
}
+ /**
+ * Sets set resource group id.
+ *
+ * @param resourceGroupId the resource group id
+ */
+ public void setResourceGroupId(String resourceGroupId) {
+ this.resourceGroupId = resourceGroupId;
+ }
+
/**
* Gets get resource id.
*
@@ -58,15 +68,6 @@ public class SagaResource implements Resource {
return BranchType.SAGA;
}
- /**
- * Sets set resource group id.
- *
- * @param resourceGroupId the resource group id
- */
- public void setResourceGroupId(String resourceGroupId) {
- this.resourceGroupId = resourceGroupId;
- }
-
/**
* Gets get application id.
*
diff --git a/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/SagaResourceManager.java b/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/SagaResourceManager.java
index 4173461df43deffa3476d4d097ca53e4d64b7502..82d82b5025a6b79c2b1f898c984a9375245667e9 100644
--- a/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/SagaResourceManager.java
+++ b/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/SagaResourceManager.java
@@ -15,6 +15,9 @@
*/
package io.seata.saga.rm;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import io.seata.common.exception.FrameworkErrorCode;
import io.seata.core.exception.TransactionException;
import io.seata.core.model.BranchStatus;
@@ -28,9 +31,6 @@ import io.seata.saga.statelang.domain.StateMachineInstance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
/**
* Saga resource manager
*
@@ -38,105 +38,110 @@ import java.util.concurrent.ConcurrentHashMap;
*/
public class SagaResourceManager extends AbstractResourceManager {
- private static final Logger LOGGER = LoggerFactory.getLogger(SagaResourceManager.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(SagaResourceManager.class);
- /**
- * Saga resource cache
- */
- private Map<String, Resource> sagaResourceCache = new ConcurrentHashMap<String, Resource>();
+ /**
+ * Saga resource cache
+ */
+ private Map<String, Resource> sagaResourceCache = new ConcurrentHashMap<String, Resource>();
/**
* Instantiates a new saga resource manager.
*/
- public SagaResourceManager(){
- }
+ public SagaResourceManager() {
+ }
- /**
- * registry saga resource
- * @param resource The resource to be managed.
- */
- @Override
- public void registerResource(Resource resource) {
- SagaResource sagaResource = (SagaResource) resource;
- sagaResourceCache.put(sagaResource.getResourceId(), sagaResource);
- super.registerResource(sagaResource);
- }
+ /**
+ * registry saga resource
+ *
+ * @param resource The resource to be managed.
+ */
+ @Override
+ public void registerResource(Resource resource) {
+ SagaResource sagaResource = (SagaResource)resource;
+ sagaResourceCache.put(sagaResource.getResourceId(), sagaResource);
+ super.registerResource(sagaResource);
+ }
- @Override
- public Map<String, Resource> getManagedResources() {
- return sagaResourceCache;
- }
+ @Override
+ public Map<String, Resource> getManagedResources() {
+ return sagaResourceCache;
+ }
- /**
- * SAGA branch commit
- * @param branchType
- * @param xid Transaction id.
- * @param branchId Branch id.
- * @param resourceId Resource id.
- * @param applicationData Application data bind with this branch.
- * @return
- * @throws TransactionException
- */
- @Override
- public BranchStatus branchCommit(BranchType branchType, String xid, long branchId, String resourceId, String applicationData) throws TransactionException {
- try {
- StateMachineInstance machineInstance = StateMachineEngineHolder.getStateMachineEngine().forward(xid, null);
+ /**
+ * SAGA branch commit
+ *
+ * @param branchType
+ * @param xid Transaction id.
+ * @param branchId Branch id.
+ * @param resourceId Resource id.
+ * @param applicationData Application data bind with this branch.
+ * @return
+ * @throws TransactionException
+ */
+ @Override
+ public BranchStatus branchCommit(BranchType branchType, String xid, long branchId, String resourceId,
+ String applicationData) throws TransactionException {
+ try {
+ StateMachineInstance machineInstance = StateMachineEngineHolder.getStateMachineEngine().forward(xid, null);
- if(ExecutionStatus.SU.equals(machineInstance.getStatus()) && machineInstance.getCompensationStatus() == null){
- return BranchStatus.PhaseTwo_Committed;
- }
- else if(ExecutionStatus.SU.equals(machineInstance.getCompensationStatus())){
- return BranchStatus.PhaseTwo_Rollbacked;
- }
- else if(ExecutionStatus.FA.equals(machineInstance.getCompensationStatus())
- || ExecutionStatus.UN.equals(machineInstance.getCompensationStatus())){
- return BranchStatus.PhaseTwo_RollbackFailed_Retryable;
- }
- else if(ExecutionStatus.FA.equals(machineInstance.getStatus()) && machineInstance.getCompensationStatus() == null){
- return BranchStatus.PhaseOne_Failed;
- }
+ if (ExecutionStatus.SU.equals(machineInstance.getStatus())
+ && machineInstance.getCompensationStatus() == null) {
+ return BranchStatus.PhaseTwo_Committed;
+ } else if (ExecutionStatus.SU.equals(machineInstance.getCompensationStatus())) {
+ return BranchStatus.PhaseTwo_Rollbacked;
+ } else if (ExecutionStatus.FA.equals(machineInstance.getCompensationStatus()) || ExecutionStatus.UN.equals(
+ machineInstance.getCompensationStatus())) {
+ return BranchStatus.PhaseTwo_RollbackFailed_Retryable;
+ } else if (ExecutionStatus.FA.equals(machineInstance.getStatus())
+ && machineInstance.getCompensationStatus() == null) {
+ return BranchStatus.PhaseOne_Failed;
+ }
- } catch (ForwardInvalidException e) {
- LOGGER.error("StateMachine forward failed, xid: " + xid, e);
+ } catch (ForwardInvalidException e) {
+ LOGGER.error("StateMachine forward failed, xid: " + xid, e);
- //if StateMachineInstanceNotExists stop retry
- if(FrameworkErrorCode.StateMachineInstanceNotExists.equals(e.getErrcode())){
- return BranchStatus.PhaseTwo_Committed;
- }
- }
- return BranchStatus.PhaseTwo_CommitFailed_Retryable;
- }
+ //if StateMachineInstanceNotExists stop retry
+ if (FrameworkErrorCode.StateMachineInstanceNotExists.equals(e.getErrcode())) {
+ return BranchStatus.PhaseTwo_Committed;
+ }
+ }
+ return BranchStatus.PhaseTwo_CommitFailed_Retryable;
+ }
- /**
- * SAGA branch rollback
- * @param branchType the branch type
- * @param xid Transaction id.
- * @param branchId Branch id.
- * @param resourceId Resource id.
- * @param applicationData Application data bind with this branch.
- * @return
- * @throws TransactionException
- */
- @Override
- public BranchStatus branchRollback(BranchType branchType, String xid, long branchId, String resourceId, String applicationData) throws TransactionException {
- try {
- StateMachineInstance stateMachineInstance = StateMachineEngineHolder.getStateMachineEngine().compensate(xid, null);
- if(ExecutionStatus.SU.equals(stateMachineInstance.getCompensationStatus())){
+ /**
+ * SAGA branch rollback
+ *
+ * @param branchType the branch type
+ * @param xid Transaction id.
+ * @param branchId Branch id.
+ * @param resourceId Resource id.
+ * @param applicationData Application data bind with this branch.
+ * @return
+ * @throws TransactionException
+ */
+ @Override
+ public BranchStatus branchRollback(BranchType branchType, String xid, long branchId, String resourceId,
+ String applicationData) throws TransactionException {
+ try {
+ StateMachineInstance stateMachineInstance = StateMachineEngineHolder.getStateMachineEngine().compensate(xid,
+ null);
+ if (ExecutionStatus.SU.equals(stateMachineInstance.getCompensationStatus())) {
return BranchStatus.PhaseTwo_Rollbacked;
}
- } catch (EngineExecutionException e) {
- LOGGER.error("StateMachine compensate failed, xid: " + xid, e);
+ } catch (EngineExecutionException e) {
+ LOGGER.error("StateMachine compensate failed, xid: " + xid, e);
- //if StateMachineInstanceNotExists stop retry
- if(FrameworkErrorCode.StateMachineInstanceNotExists.equals(e.getErrcode())){
- return BranchStatus.PhaseTwo_Rollbacked;
- }
- }
- return BranchStatus.PhaseTwo_RollbackFailed_Retryable;
- }
+ //if StateMachineInstanceNotExists stop retry
+ if (FrameworkErrorCode.StateMachineInstanceNotExists.equals(e.getErrcode())) {
+ return BranchStatus.PhaseTwo_Rollbacked;
+ }
+ }
+ return BranchStatus.PhaseTwo_RollbackFailed_Retryable;
+ }
- @Override
- public BranchType getBranchType(){
- return BranchType.SAGA;
- }
+ @Override
+ public BranchType getBranchType() {
+ return BranchType.SAGA;
+ }
}
diff --git a/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/StateMachineEngineHolder.java b/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/StateMachineEngineHolder.java
index c815b48c2dde043b5bfcbc180dc3b5f7919bcc8d..971a28102a1ceda89a56ea81162fad574aae71c7 100644
--- a/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/StateMachineEngineHolder.java
+++ b/saga/seata-saga-rm/src/main/java/io/seata/saga/rm/StateMachineEngineHolder.java
@@ -18,18 +18,17 @@ package io.seata.saga.rm;
import io.seata.saga.engine.StateMachineEngine;
/**
- *
* @author lorne.cl
*/
public class StateMachineEngineHolder {
private static StateMachineEngine stateMachineEngine;
- public static StateMachineEngine getStateMachineEngine(){
+ public static StateMachineEngine getStateMachineEngine() {
return stateMachineEngine;
}
- public void setStateMachineEngine(StateMachineEngine smEngine){
+ public void setStateMachineEngine(StateMachineEngine smEngine) {
stateMachineEngine = smEngine;
}
}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ChoiceState.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ChoiceState.java
index 24c8b34b1340e4ca8b6e53f54a0043b11f808f12..74046be44917655199e4a6636d1a017cab31804b 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ChoiceState.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ChoiceState.java
@@ -26,12 +26,14 @@ public interface ChoiceState extends State {
/**
* get choices
+ *
* @return
*/
List<Choice> getChoices();
/**
* default choice
+ *
* @return
*/
String getDefault();
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/CompensateSubStateMachineState.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/CompensateSubStateMachineState.java
index 024a5b0c771f4ea5334be49f04275bf8ba925c0c..4f9e5340614b8eb3d7d0514a34eb99e9477e9ca9 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/CompensateSubStateMachineState.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/CompensateSubStateMachineState.java
@@ -21,4 +21,5 @@ package io.seata.saga.statelang.domain;
* @author lorne.cl
*/
public interface CompensateSubStateMachineState extends ServiceTaskState {
+
}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/CompensationTriggerState.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/CompensationTriggerState.java
index d81019f5ee61ae83fb21da785f401d7d7c594cad..1759305fa3756e61a6221e9f2d9b021e4e24a7c5 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/CompensationTriggerState.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/CompensationTriggerState.java
@@ -22,5 +22,4 @@ package io.seata.saga.statelang.domain;
*/
public interface CompensationTriggerState extends State {
-
}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/DomainConstants.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/DomainConstants.java
index 06d0288ec2794f82193c7f958da270bcb620ece4..dde90532cca9e3e03c2af4e8d3d96f221fbdfade 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/DomainConstants.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/DomainConstants.java
@@ -22,62 +22,71 @@ package io.seata.saga.statelang.domain;
*/
public class DomainConstants {
- /** State Types **/
- public static final String STATE_TYPE_SERVICE_TASK = "ServiceTask";
- public static final String STATE_TYPE_CHOICE = "Choice";
- public static final String STATE_TYPE_FAIL = "Fail";
- public static final String STATE_TYPE_SUCCEED = "Succeed";
- public static final String STATE_TYPE_COMPENSATION_TRIGGER = "CompensationTrigger";
- public static final String STATE_TYPE_SUB_STATE_MACHINE = "SubStateMachine";
- public static final String STATE_TYPE_SUB_MACHINE_COMPENSATION = "CompensateSubMachine";
- /** State Types **/
+ /**
+ * State Types
+ **/
+ public static final String STATE_TYPE_SERVICE_TASK = "ServiceTask";
+ public static final String STATE_TYPE_CHOICE = "Choice";
+ public static final String STATE_TYPE_FAIL = "Fail";
+ public static final String STATE_TYPE_SUCCEED = "Succeed";
+ public static final String STATE_TYPE_COMPENSATION_TRIGGER = "CompensationTrigger";
+ public static final String STATE_TYPE_SUB_STATE_MACHINE = "SubStateMachine";
+ public static final String STATE_TYPE_SUB_MACHINE_COMPENSATION = "CompensateSubMachine";
+ /**
+ * State Types
+ **/
public static final String COMPENSATE_SUB_MACHINE_STATE_NAME_PREFIX = "_compensate_sub_machine_state_";
-
- /** Service Types **/
+ /**
+ * Service Types
+ **/
public static final String SERVICE_TYPE_SPRING_BEAN = "SpringBean";
/** Service Types **/
- /** System Variables **/
- public static final String VAR_NAME_STATEMACHINE_CONTEXT = "context";
- public static final String VAR_NAME_INPUT_PARAMS = "inputParams";
- public static final String VAR_NAME_OUTPUT_PARAMS = "outputParams";
- public static final String VAR_NAME_CURRENT_EXCEPTION = "currentException";//exception of current state
- public static final String VAR_NAME_BUSINESSKEY = "_business_key_";
- public static final String VAR_NAME_SUB_MACHINE_PARENT_ID = "_sub_machine_parent_id_";
- public static final String VAR_NAME_CURRENT_CHOICE = "_current_choice_";
- public static final String VAR_NAME_STATEMACHINE_ERROR_CODE = "_statemachine_error_code_";
- public static final String VAR_NAME_STATEMACHINE_ERROR_MSG = "_statemachine_error_message_";
- public static final String VAR_NAME_CURRENT_EXCEPTION_ROUTE = "_current_exception_route_";
- public static final String VAR_NAME_STATEMACHINE = "_current_statemachine_";
- public static final String VAR_NAME_STATEMACHINE_INST = "_current_statemachine_instance_";
- public static final String VAR_NAME_STATEMACHINE_ENGINE = "_current_statemachine_engine_";
- public static final String VAR_NAME_STATE_INST = "_current_state_instance_";
- public static final String VAR_NAME_STATEMACHINE_CONFIG = "_statemachine_config_";
- public static final String VAR_NAME_FAIL_END_STATE_FLAG = "_fail_end_state_flag_";
- public static final String VAR_NAME_CURRENT_COMPENSATION_HOLDER = "_current_compensation_holder_";
- public static final String VAR_NAME_RETRIED_STATE_INST_ID = "_retried_state_instance_id";
- public static final String VAR_NAME_OPERATION_NAME = "_operation_name_";
- public static final String VAR_NAME_ASYNC_CALLBACK = "_async_callback_";
- public static final String VAR_NAME_CURRENT_COMPEN_TRIGGER_STATE = "_is_compensating_";
- public static final String VAR_NAME_IS_EXCEPTION_NOT_CATCH = "_is_exception_not_catch_";
- public static final String VAR_NAME_PARENT_ID = "_parent_id_";
- public static final String VAR_NAME_SUB_STATEMACHINE_EXEC_STATUE = "_sub_statemachine_execution_status_";
- public static final String VAR_NAME_IS_FOR_SUB_STATMACHINE_FORWARD = "_is_for_sub_statemachine_forward_";
+ /**
+ * System Variables
+ **/
+ public static final String VAR_NAME_STATEMACHINE_CONTEXT = "context";
+ public static final String VAR_NAME_INPUT_PARAMS = "inputParams";
+ public static final String VAR_NAME_OUTPUT_PARAMS = "outputParams";
+ public static final String VAR_NAME_CURRENT_EXCEPTION = "currentException";//exception of current state
+ public static final String VAR_NAME_BUSINESSKEY = "_business_key_";
+ public static final String VAR_NAME_SUB_MACHINE_PARENT_ID = "_sub_machine_parent_id_";
+ public static final String VAR_NAME_CURRENT_CHOICE = "_current_choice_";
+ public static final String VAR_NAME_STATEMACHINE_ERROR_CODE = "_statemachine_error_code_";
+ public static final String VAR_NAME_STATEMACHINE_ERROR_MSG = "_statemachine_error_message_";
+ public static final String VAR_NAME_CURRENT_EXCEPTION_ROUTE = "_current_exception_route_";
+ public static final String VAR_NAME_STATEMACHINE = "_current_statemachine_";
+ public static final String VAR_NAME_STATEMACHINE_INST = "_current_statemachine_instance_";
+ public static final String VAR_NAME_STATEMACHINE_ENGINE = "_current_statemachine_engine_";
+ public static final String VAR_NAME_STATE_INST = "_current_state_instance_";
+ public static final String VAR_NAME_STATEMACHINE_CONFIG = "_statemachine_config_";
+ public static final String VAR_NAME_FAIL_END_STATE_FLAG = "_fail_end_state_flag_";
+ public static final String VAR_NAME_CURRENT_COMPENSATION_HOLDER = "_current_compensation_holder_";
+ public static final String VAR_NAME_RETRIED_STATE_INST_ID = "_retried_state_instance_id";
+ public static final String VAR_NAME_OPERATION_NAME = "_operation_name_";
+ public static final String VAR_NAME_ASYNC_CALLBACK = "_async_callback_";
+ public static final String VAR_NAME_CURRENT_COMPEN_TRIGGER_STATE = "_is_compensating_";
+ public static final String VAR_NAME_IS_EXCEPTION_NOT_CATCH = "_is_exception_not_catch_";
+ public static final String VAR_NAME_PARENT_ID = "_parent_id_";
+ public static final String VAR_NAME_SUB_STATEMACHINE_EXEC_STATUE = "_sub_statemachine_execution_status_";
+ public static final String VAR_NAME_IS_FOR_SUB_STATMACHINE_FORWARD = "_is_for_sub_statemachine_forward_";
public static final String VAR_NAME_FIRST_COMPENSATION_STATE_STARTED = "_first_compensation_state_started";
- public static final String VAR_NAME_GLOBAL_TX = "_global_transaction_";
- public static final String VAR_NAME_ROOT_CONTEXT_HOLDER = "_root_context_holder_";
+ public static final String VAR_NAME_GLOBAL_TX = "_global_transaction_";
+ public static final String VAR_NAME_ROOT_CONTEXT_HOLDER = "_root_context_holder_";
- public static final String OPERATION_NAME_START = "start";
- public static final String OPERATION_NAME_FORWARD = "forward";
+ public static final String OPERATION_NAME_START = "start";
+ public static final String OPERATION_NAME_FORWARD = "forward";
public static final String OPERATION_NAME_COMPENSATE = "compensate";
- public static final String SEQ_ENTITY_STATE_MACHINE = "STATE_MACHINE";
+ public static final String SEQ_ENTITY_STATE_MACHINE = "STATE_MACHINE";
public static final String SEQ_ENTITY_STATE_MACHINE_INST = "STATE_MACHINE_INST";
- public static final String SEQ_ENTITY_STATE_INST = "STATE_INST";
+ public static final String SEQ_ENTITY_STATE_INST = "STATE_INST";
public static final String EXPRESSION_TYPE_SEQUENCE = "Sequence";
public static final String EVALUATOR_TYPE_EXCEPTION = "Exception";
+ public static final String SEPERATOR_PARENT_ID = ":";
+
}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/EndState.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/EndState.java
index 8ded7459522aef3d1d5151b22c00935d7528efc8..4b50d3def816f9c450ea37eea0622d6eb9324e8f 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/EndState.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/EndState.java
@@ -22,5 +22,4 @@ package io.seata.saga.statelang.domain;
*/
public interface EndState extends State {
-
}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ExecutionStatus.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ExecutionStatus.java
index 0e8b0b32900a828250d5b3f45c5f708e6d42fdcb..35706fb032f40d4852fcc09c3437e7bd89d2c78e 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ExecutionStatus.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ExecutionStatus.java
@@ -47,11 +47,9 @@ public enum ExecutionStatus {
*/
SK("Skipped");
-
-
private String statusString;
- private ExecutionStatus(String statusString){
+ private ExecutionStatus(String statusString) {
this.statusString = statusString;
}
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/FailEndState.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/FailEndState.java
index 5940fbad98f3105cfe463bfdfea7de740cddf2a0..fe347d8a1cec550c94dc26eec41764ee3b3b9cbf 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/FailEndState.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/FailEndState.java
@@ -24,12 +24,14 @@ public interface FailEndState extends EndState {
/**
* error code
+ *
* @return
*/
String getErrorCode();
/**
* error message
+ *
* @return
*/
String getMessage();
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ServiceTaskState.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ServiceTaskState.java
index 8a1c8678c43e537581131513ec786fecd6d0e932..d35f33ff8c8117534fd9bd0f331e249077d449fb 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ServiceTaskState.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/ServiceTaskState.java
@@ -25,31 +25,36 @@ import java.util.List;
public interface ServiceTaskState extends TaskState {
/**
- * Service type，such as SpringBean、SOFA RPC，default is StringBean
+ * Service type: such as SpringBean, SOFA RPC, default is StringBean
+ *
* @return
*/
String getServiceType();
/**
* service name
+ *
* @return
*/
String getServiceName();
/**
* service method
+ *
* @return
*/
String getServiceMethod();
/**
* service method
+ *
* @return
*/
List<String> getParameterTypes();
/**
* Is it necessary to persist the service execution log? default is true
+ *
* @return
*/
boolean isPersist();
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateInstance.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateInstance.java
index 6b247bd8407fcddf2f42d6bd1b7df5746654008b..4b037581a138002ea41a5e04f93b6cb6211b4ed3 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateInstance.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateInstance.java
@@ -26,30 +26,35 @@ public interface StateInstance {
/**
* id
+ *
* @return
*/
String getId();
/**
* set id
+ *
* @param id
*/
void setId(String id);
/**
* get Machine InstanceId
+ *
* @return
*/
String getMachineInstanceId();
/**
* set Machine InstanceId
+ *
* @param machineInstanceId
*/
void setMachineInstanceId(String machineInstanceId);
/**
* get name
+ *
* @return
*/
String getName();
@@ -63,126 +68,147 @@ public interface StateInstance {
/**
* get type
+ *
* @return
*/
String getType();
/**
* set type
+ *
* @param type
*/
void setType(String type);
/**
* get service name
+ *
* @return
*/
String getServiceName();
/**
* set service name
+ *
* @param serviceName
*/
void setServiceName(String serviceName);
/**
* get service method
+ *
* @return
*/
String getServiceMethod();
/**
* set service method
+ *
* @param serviceMethod
*/
void setServiceMethod(String serviceMethod);
/**
* get service type
+ *
* @return
*/
String getServiceType();
/**
* get service type
+ *
* @param serviceType
*/
void setServiceType(String serviceType);
/**
* get businessKey
+ *
* @return
*/
String getBusinessKey();
/**
* set business key
+ *
* @param businessKey
*/
void setBusinessKey(String businessKey);
/**
* get start time
+ *
* @return
*/
Date getGmtStarted();
/**
* set start time
+ *
* @param gmtStarted
*/
void setGmtStarted(Date gmtStarted);
/**
* get end time
+ *
* @return
*/
Date getGmtEnd();
/**
* set end time
+ *
* @param gmtEnd
*/
void setGmtEnd(Date gmtEnd);
/**
* Is this state task will update data?
+ *
* @return
*/
boolean isForUpdate();
/**
* setForUpdate
+ *
* @param forUpdate
*/
void setForUpdate(boolean forUpdate);
/**
* get exception
+ *
* @return
*/
Exception getException();
/**
* set exception
+ *
* @param exception
*/
void setException(Exception exception);
/**
* get input params
+ *
* @return
*/
Object getInputParams();
/**
* set inout params
+ *
* @param inputParams
*/
void setInputParams(Object inputParams);
/**
* get output params
+ *
* @return
*/
Object getOutputParams();
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateMachine.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateMachine.java
index 0004e22da6d129d2e0cb200b006851dd2d2108fe..295d35e0e324fe262fc4390edf7b5acc2e4be0fe 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateMachine.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateMachine.java
@@ -20,73 +20,58 @@ import java.util.Map;
/**
* StateMachine
+ *
* @author lorne.cl
*/
public interface StateMachine {
- enum Status {
- /**
- * Active
- */
- AC("Active"),
- /**
- * Inactive
- */
- IN("Inactive");
-
- private String statusString;
-
- Status(String statusString){
- this.statusString = statusString;
- }
-
- public String getStatusString() {
- return statusString;
- }
- }
-
- void setId(String id);
-
- void setStartState(String startState);
-
/**
* name
+ *
* @return
*/
String getName();
/**
* comment
+ *
* @return
*/
String getComment();
/**
* start state name
+ *
* @return
*/
String getStartState();
+ void setStartState(String startState);
+
/**
* version
+ *
* @return
*/
String getVersion();
/**
* set version
+ *
* @param version
*/
void setVersion(String version);
/**
* states
+ *
* @return
*/
- Map<String/** 状态机名称 **/, State> getStates();
+ Map<String/** state machine name **/, State> getStates();
/**
* get state
+ *
* @param name
* @return
*/
@@ -94,60 +79,72 @@ public interface StateMachine {
/**
* get id
+ *
* @return
*/
String getId();
+ void setId(String id);
+
/**
* get tenantId
+ *
* @return
*/
String getTenantId();
/**
* set tenantId
+ *
* @param tenantId
*/
void setTenantId(String tenantId);
/**
* app name
+ *
* @return
*/
String getAppName();
/**
* type, there is only one type: SSL(SEATA state language)
+ *
* @return
*/
String getType();
/**
- * statue（Active|Inactive）
+ * statue (Active|Inactive)
+ *
* @return
*/
Status getStatus();
/**
* recover strategy: prefer compensation or forward when error occurred
+ *
* @return
*/
String getRecoverStrategy();
/**
* set RecoverStrategy
+ *
* @param recoverStrategy
*/
void setRecoverStrategy(String recoverStrategy);
/**
* Is it persist execution log to storage?, default true
+ *
* @return
*/
boolean isPersist();
/**
* State language text
+ *
* @return
*/
String getContent();
@@ -156,13 +153,36 @@ public interface StateMachine {
/**
* get create time
+ *
* @return
*/
Date getGmtCreate();
/**
* set create time
+ *
* @param date
*/
void setGmtCreate(Date date);
+
+ enum Status {
+ /**
+ * Active
+ */
+ AC("Active"),
+ /**
+ * Inactive
+ */
+ IN("Inactive");
+
+ private String statusString;
+
+ Status(String statusString) {
+ this.statusString = statusString;
+ }
+
+ public String getStatusString() {
+ return statusString;
+ }
+ }
}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateMachineInstance.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateMachineInstance.java
index 07e585b50918942ba723b085fc071574aa8fea83..ea2110e1e7400ea17f33d9facfcdd82289acd1d4 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateMachineInstance.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/StateMachineInstance.java
@@ -21,6 +21,7 @@ import java.util.Map;
/**
* StateMachine execution instance
+ *
* @author lorne.cl
*/
public interface StateMachineInstance {
@@ -112,7 +113,7 @@ public interface StateMachineInstance {
/**
* Put state instance.
*
- * @param stateId the state id
+ * @param stateId the state id
* @param stateInstance the state instance
*/
void putStateInstance(String stateId, StateInstance stateInstance);
@@ -231,6 +232,7 @@ public interface StateMachineInstance {
/**
* Gets get context.
+ *
* @return
*/
Map<String, Object> getContext();
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/SubStateMachine.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/SubStateMachine.java
index 203b9489cc5e81475f0a2bd507117f65e58f9ec5..9c7952565a30071e1e64a94842d3027bad80c3ea 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/SubStateMachine.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/SubStateMachine.java
@@ -17,13 +17,15 @@ package io.seata.saga.statelang.domain;
/**
* SubStateMachine
- * @see TaskState
+ *
* @author lorne.cl
+ * @see TaskState
*/
public interface SubStateMachine extends TaskState {
/**
* state machine name
+ *
* @return
*/
String getStateMachineName();
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/SucceedEndState.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/SucceedEndState.java
index 6eccac8dd8e33474abb4778e48d5a83631b42c6a..9e8856ccbc82986d95952905a82b9bb08a61029d 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/SucceedEndState.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/SucceedEndState.java
@@ -22,5 +22,4 @@ package io.seata.saga.statelang.domain;
*/
public interface SucceedEndState extends EndState {
-
}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/TaskState.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/TaskState.java
index 047b5b45cae107f63e00543cea412628ae923825..7ea887b615895da1a42f45d23693bf5589937518 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/TaskState.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/TaskState.java
@@ -15,48 +15,54 @@
*/
package io.seata.saga.statelang.domain;
-import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
/**
* A state used to execute a task
+ *
* @author lorne.cl
*/
public interface TaskState extends State {
/**
* get compensate state
+ *
* @return
*/
String getCompensateState();
/**
- * Is this state is used to compensate an other state，default false
+ * Is this state is used to compensate an other state, default false
+ *
* @return
*/
boolean isForCompensation();
/**
* Is this state will update data? default false
+ *
* @return
*/
boolean isForUpdate();
/**
* retry strategy
+ *
* @return
*/
- Retry getRetry();
+ List<Retry> getRetry();
/**
* exception handling strategy
+ *
* @return
*/
List<ExceptionMatch> getCatches();
/**
* Execution state determination rule
+ *
* @return
*/
Map<String, String> getStatus();
@@ -66,23 +72,46 @@ public interface TaskState extends State {
*/
interface Retry {
+ /**
+ * exceptions
+ *
+ * @return
+ */
+ List<String> getExceptions();
+
+ /**
+ * exception classes
+ *
+ * @return
+ */
+ List<Class<? extends Exception>> getExceptionClasses();
+
+ /**
+ * set exception classes
+ * @param exceptionClasses
+ */
+ void setExceptionClasses(List<Class<? extends Exception>> exceptionClasses);
+
/**
* getIntervalSeconds
+ *
* @return
*/
- int getIntervalSeconds();
+ double getIntervalSeconds();
/**
* getMaxAttempts
+ *
* @return
*/
int getMaxAttempts();
/**
- * get BackoffRate，default 1
+ * get BackoffRate, default 1
+ *
* @return
*/
- BigDecimal getBackoffRate();
+ double getBackoffRate();
}
/**
@@ -92,18 +121,27 @@ public interface TaskState extends State {
/**
* exceptions
+ *
* @return
*/
List<String> getExceptions();
/**
* exception classes
+ *
* @return
*/
List<Class<? extends Exception>> getExceptionClasses();
+ /**
+ * set exception classes
+ * @param exceptionClasses
+ */
+ void setExceptionClasses(List<Class<? extends Exception>> exceptionClasses);
+
/**
* next state name
+ *
* @return
*/
String getNext();
@@ -116,18 +154,21 @@ public interface TaskState extends State {
/**
* status
+ *
* @return
*/
ExecutionStatus getStatus();
/**
* expression
+ *
* @return
*/
String getExpression();
/**
* expression type, default(SpringEL)|exception
+ *
* @return
*/
String getExpressionType();
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/AbstractTaskState.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/AbstractTaskState.java
index 99ffa24a02903dfcc43d3eef3aaa13bc66dce87f..6bdb056e08bea80251f8aace26568fe0d8f164e5 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/AbstractTaskState.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/AbstractTaskState.java
@@ -15,27 +15,28 @@
*/
package io.seata.saga.statelang.domain.impl;
-import io.seata.common.util.StringUtils;
-import io.seata.saga.statelang.domain.TaskState;
-import java.math.BigDecimal;
import java.util.List;
import java.util.Map;
+import io.seata.common.util.StringUtils;
+import io.seata.saga.statelang.domain.TaskState;
+
/**
* The state of the execution task (abstract class), the specific task to be executed is determined by the subclass
+ *
* @author lorne.cl
*/
public abstract class AbstractTaskState extends BaseState implements TaskState {
- private String compensateState;
- private boolean isForCompensation;
- private boolean isForUpdate;
- private Retry retry;
- private List<ExceptionMatch> catches;
- private List<Object> input;
- private Map<String, Object> output;
- private Map<String, String> status;//Map<String/* expression */, String /* status */>
- private boolean isPersist = true;
+ private String compensateState;
+ private boolean isForCompensation;
+ private boolean isForUpdate;
+ private List<Retry> retry;
+ private List<ExceptionMatch> catches;
+ private List<Object> input;
+ private Map<String, Object> output;
+ private Map<String, String> status;//Map<String/* expression */, String /* status */>
+ private boolean isPersist = true;
@Override
public String getCompensateState() {
@@ -45,7 +46,7 @@ public abstract class AbstractTaskState extends BaseState implements TaskState {
public void setCompensateState(String compensateState) {
this.compensateState = compensateState;
- if(StringUtils.isNotBlank(this.compensateState)){
+ if (StringUtils.isNotBlank(this.compensateState)) {
setForUpdate(true);
}
}
@@ -69,14 +70,15 @@ public abstract class AbstractTaskState extends BaseState implements TaskState {
}
@Override
- public Retry getRetry() {
+ public List<Retry> getRetry() {
return retry;
}
- public void setRetry(Retry retry) {
+ public void setRetry(List<Retry> retry) {
this.retry = retry;
}
+ @Override
public List<ExceptionMatch> getCatches() {
return catches;
}
@@ -120,16 +122,37 @@ public abstract class AbstractTaskState extends BaseState implements TaskState {
public static class RetryImpl implements Retry {
- private int intervalSeconds;
- private int maxAttempts;
- private BigDecimal backoffRate;
+ private List<String> exceptions;
+ private List<Class<? extends Exception>> exceptionClasses;
+ private double intervalSeconds;
+ private int maxAttempts;
+ private double backoffRate;
@Override
- public int getIntervalSeconds() {
+ public List<String> getExceptions() {
+ return exceptions;
+ }
+
+ public void setExceptions(List<String> exceptions) {
+ this.exceptions = exceptions;
+ }
+
+ @Override
+ public List<Class<? extends Exception>> getExceptionClasses() {
+ return exceptionClasses;
+ }
+
+ @Override
+ public void setExceptionClasses(List<Class<? extends Exception>> exceptionClasses) {
+ this.exceptionClasses = exceptionClasses;
+ }
+
+ @Override
+ public double getIntervalSeconds() {
return intervalSeconds;
}
- public void setIntervalSeconds(int intervalSeconds) {
+ public void setIntervalSeconds(double intervalSeconds) {
this.intervalSeconds = intervalSeconds;
}
@@ -143,20 +166,20 @@ public abstract class AbstractTaskState extends BaseState implements TaskState {
}
@Override
- public BigDecimal getBackoffRate() {
+ public double getBackoffRate() {
return backoffRate;
}
- public void setBackoffRate(BigDecimal backoffRate) {
+ public void setBackoffRate(double backoffRate) {
this.backoffRate = backoffRate;
}
}
public static class ExceptionMatchImpl implements ExceptionMatch {
- List<String> exceptions;
+ List<String> exceptions;
List<Class<? extends Exception>> exceptionClasses;
- String next;
+ String next;
@Override
public List<String> getExceptions() {
@@ -172,6 +195,7 @@ public abstract class AbstractTaskState extends BaseState implements TaskState {
return exceptionClasses;
}
+ @Override
public void setExceptionClasses(List<Class<? extends Exception>> exceptionClasses) {
this.exceptionClasses = exceptionClasses;
}
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/BaseState.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/BaseState.java
index 406acfddfdef25bbf09d57c9e7fe797e1498a635..06e984b20a42a77738f20bd79bede1e82ab1cb8f 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/BaseState.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/BaseState.java
@@ -15,22 +15,24 @@
*/
package io.seata.saga.statelang.domain.impl;
+import java.util.Map;
+
import io.seata.saga.statelang.domain.State;
import io.seata.saga.statelang.domain.StateMachine;
-import java.util.Map;
/**
* BaseState
+ *
* @author lorne.cl
*/
public abstract class BaseState implements State {
- private transient String name;
- private String type;
- private String comment;
- private String next;
- private Map<String, Object> extensions;
- private transient StateMachine stateMachine;
+ private transient String name;
+ private String type;
+ private String comment;
+ private String next;
+ private Map<String, Object> extensions;
+ private transient StateMachine stateMachine;
@Override
public String getName() {
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/ChoiceStateImpl.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/ChoiceStateImpl.java
index d16e717aa4eaadf9fd76039dca55800a33158e3d..d8769aa11ccb65c6d59919cb924fac0eed237545 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/ChoiceStateImpl.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/ChoiceStateImpl.java
@@ -15,21 +15,25 @@
*/
package io.seata.saga.statelang.domain.impl;
-import io.seata.saga.statelang.domain.ChoiceState;
-import io.seata.saga.statelang.domain.DomainConstants;
import java.util.List;
import java.util.Map;
+import io.seata.saga.statelang.domain.ChoiceState;
+import io.seata.saga.statelang.domain.DomainConstants;
+
/**
* Single selection status
+ *
* @author lorne.cl
*/
public class ChoiceStateImpl extends BaseState implements ChoiceState {
- private List<Choice> choices;
- private String defaultChoice;
- /** key: Evaluator, value: Next **/
- private Map<Object, String> choiceEvaluators;
+ private List<Choice> choices;
+ private String defaultChoice;
+ /**
+ * key: Evaluator, value: Next
+ **/
+ private Map<Object, String> choiceEvaluators;
public ChoiceStateImpl() {
setType(DomainConstants.STATE_TYPE_CHOICE);
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/CompensateSubStateMachineStateImpl.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/CompensateSubStateMachineStateImpl.java
index f2527aaf262b61192bf82d54b6883829277af717..22a04b9db1cf16f9053b9f130859d2c996187eaa 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/CompensateSubStateMachineStateImpl.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/CompensateSubStateMachineStateImpl.java
@@ -20,6 +20,7 @@ import io.seata.saga.statelang.domain.DomainConstants;
/**
* Used to compensate the state of the sub state machine, inherited from ServiceTaskState
+ *
* @author lorne.cl
*/
public class CompensateSubStateMachineStateImpl extends ServiceTaskStateImpl implements CompensateSubStateMachineState {
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/CompensationTriggerStateImpl.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/CompensationTriggerStateImpl.java
index a8b08692924e739756b3e42112a7776818398b23..63cdb0cd72b0a5ff5a99f2e64d54f5c1fdd172bf 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/CompensationTriggerStateImpl.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/CompensationTriggerStateImpl.java
@@ -20,6 +20,7 @@ import io.seata.saga.statelang.domain.DomainConstants;
/**
* Triggering the "compensation" process for the state machine
+ *
* @author lorne.cl
*/
public class CompensationTriggerStateImpl extends BaseState implements CompensationTriggerState {
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/FailEndStateImpl.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/FailEndStateImpl.java
index fa3ef61c5bacc400aa4600b8e8dd714cfcb15e78..53963a1c5e4b5385977fe48cd606f0ddb04a5739 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/FailEndStateImpl.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/FailEndStateImpl.java
@@ -20,6 +20,7 @@ import io.seata.saga.statelang.domain.FailEndState;
/**
* FailEndState
+ *
* @author lorne.cl
*/
public class FailEndStateImpl extends BaseState implements FailEndState {
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/ServiceTaskStateImpl.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/ServiceTaskStateImpl.java
index 5936cab81a0061d169f857b75c8d98929d21839a..856142163298bf1e7cc57371bf84e92b2df8c2a2 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/ServiceTaskStateImpl.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/ServiceTaskStateImpl.java
@@ -15,26 +15,29 @@
*/
package io.seata.saga.statelang.domain.impl;
-import io.seata.saga.statelang.domain.DomainConstants;
-import io.seata.saga.statelang.domain.ServiceTaskState;
import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;
+import io.seata.saga.statelang.domain.DomainConstants;
+import io.seata.saga.statelang.domain.ServiceTaskState;
+
/**
* A state used to invoke a service
+ *
* @author lorne.cl
*/
public class ServiceTaskStateImpl extends AbstractTaskState implements ServiceTaskState {
- private String serviceType;
- private String serviceName;
- private String serviceMethod;
- private List<String> parameterTypes;
- private Method method;
- private List<Object> inputExpressions;
+ private String serviceType;
+ private String serviceName;
+ private String serviceMethod;
+ private List<String> parameterTypes;
+ private Method method;
+ private List<Object> inputExpressions;
private Map<String, Object> outputExpressions;
private Map<Object, String> statusEvaluators;
+ private boolean isAsync;
public ServiceTaskStateImpl() {
setType(DomainConstants.STATE_TYPE_SERVICE_TASK);
@@ -107,4 +110,12 @@ public class ServiceTaskStateImpl extends AbstractTaskState implements ServiceTa
public void setStatusEvaluators(Map<Object, String> statusEvaluators) {
this.statusEvaluators = statusEvaluators;
}
+
+ public boolean isAsync() {
+ return isAsync;
+ }
+
+ public void setAsync(boolean async) {
+ isAsync = async;
+ }
}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateInstanceImpl.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateInstanceImpl.java
index b7fe57f8b52da2e6cc601be1ed399bc356660512..a2daecb89b6641f042fa3f4d8920181246b52cb6 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateInstanceImpl.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateInstanceImpl.java
@@ -15,41 +15,43 @@
*/
package io.seata.saga.statelang.domain.impl;
+import java.util.Date;
+
import io.seata.common.util.StringUtils;
import io.seata.saga.statelang.domain.ExecutionStatus;
import io.seata.saga.statelang.domain.StateInstance;
import io.seata.saga.statelang.domain.StateMachineInstance;
-import java.util.Date;
/**
* state execution instance
+ *
* @author lorne.cl
*/
public class StateInstanceImpl implements StateInstance {
- private String id;
- private String machineInstanceId;
- private String name;
- private String type;
- private String serviceName;
- private String serviceMethod;
- private String serviceType;
- private String businessKey;
- private Date gmtStarted;
- private Date gmtEnd;
- private boolean isForUpdate;
- private Exception exception;
- private Object serializedException;
- private Object inputParams;
- private Object serializedInputParams;
- private Object outputParams;
- private Object serializedOutputParams;
- private ExecutionStatus status;
- private String stateIdCompensatedFor;
- private String stateIdRetriedFor;
- private StateInstance compensationState;
+ private String id;
+ private String machineInstanceId;
+ private String name;
+ private String type;
+ private String serviceName;
+ private String serviceMethod;
+ private String serviceType;
+ private String businessKey;
+ private Date gmtStarted;
+ private Date gmtEnd;
+ private boolean isForUpdate;
+ private Exception exception;
+ private Object serializedException;
+ private Object inputParams;
+ private Object serializedInputParams;
+ private Object outputParams;
+ private Object serializedOutputParams;
+ private ExecutionStatus status;
+ private String stateIdCompensatedFor;
+ private String stateIdRetriedFor;
+ private StateInstance compensationState;
private StateMachineInstance stateMachineInstance;
- private boolean ignoreStatus;
+ private boolean ignoreStatus;
@Override
public String getId() {
@@ -288,7 +290,7 @@ public class StateInstanceImpl implements StateInstance {
@Override
public ExecutionStatus getCompensationStatus() {
- if(this.compensationState != null) {
+ if (this.compensationState != null) {
return this.compensationState.getStatus();
} else {
return null;
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineImpl.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineImpl.java
index 35db7cc3e1722d728e232e1088cc13043e567abd..a122364855af54c0c2524aef8efc9683846bdf4f 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineImpl.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineImpl.java
@@ -15,33 +15,34 @@
*/
package io.seata.saga.statelang.domain.impl;
-import io.seata.saga.statelang.domain.State;
-import io.seata.saga.statelang.domain.StateMachine;
-
import java.util.Date;
import java.util.LinkedHashMap;
import java.util.Map;
+import io.seata.saga.statelang.domain.State;
+import io.seata.saga.statelang.domain.StateMachine;
+
/**
* state machine
+ *
* @author lorne.cl
*/
public class StateMachineImpl implements StateMachine {
- private String id;
- private String tenantId;
- private String appName = "SEATA";
- private String name;
- private String comment;
- private String version;
- private String startState;
- private Status status = Status.AC;
- private String recoverStrategy;
- private boolean isPersist = true;
- private String type = "STATE_LANG";
- private transient String content;
- private Date gmtCreate;
- private Map<String, State> states = new LinkedHashMap<>();
+ private String id;
+ private String tenantId;
+ private String appName = "SEATA";
+ private String name;
+ private String comment;
+ private String version;
+ private String startState;
+ private Status status = Status.AC;
+ private String recoverStrategy;
+ private boolean isPersist = true;
+ private String type = "STATE_LANG";
+ private transient String content;
+ private Date gmtCreate;
+ private Map<String, State> states = new LinkedHashMap<>();
@Override
public String getName() {
@@ -66,6 +67,7 @@ public class StateMachineImpl implements StateMachine {
return startState;
}
+ @Override
public void setStartState(String startState) {
this.startState = startState;
}
@@ -85,19 +87,19 @@ public class StateMachineImpl implements StateMachine {
return states;
}
+ public void setStates(Map<String, State> states) {
+ this.states = states;
+ }
+
@Override
public State getState(String name) {
return states.get(name);
}
- public void setStates(Map<String, State> states) {
- this.states = states;
- }
-
public void putState(String stateName, State state) {
this.states.put(stateName, state);
if (state instanceof BaseState) {
- ((BaseState) state).setStateMachine(this);
+ ((BaseState)state).setStateMachine(this);
}
}
@@ -163,6 +165,7 @@ public class StateMachineImpl implements StateMachine {
return content;
}
+ @Override
public void setContent(String content) {
this.content = content;
}
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineInstanceImpl.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineInstanceImpl.java
index 1cbeb1653e42a1e245178f175bc1f105fd59d64f..3b9760fd2db416173f73d36e8e086a48b3ee4aa5 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineInstanceImpl.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineInstanceImpl.java
@@ -15,10 +15,6 @@
*/
package io.seata.saga.statelang.domain.impl;
-import io.seata.saga.statelang.domain.ExecutionStatus;
-import io.seata.saga.statelang.domain.StateInstance;
-import io.seata.saga.statelang.domain.StateMachine;
-import io.seata.saga.statelang.domain.StateMachineInstance;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -27,34 +23,40 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import io.seata.saga.statelang.domain.ExecutionStatus;
+import io.seata.saga.statelang.domain.StateInstance;
+import io.seata.saga.statelang.domain.StateMachine;
+import io.seata.saga.statelang.domain.StateMachineInstance;
+
/**
* state machine execution instance
+ *
* @author lorne.cl
*/
public class StateMachineInstanceImpl implements StateMachineInstance {
- private String id;
- private String machineId;
- private String tenantId;
- private String parentId;
- private Date gmtStarted;
- private String businessKey;
+ private String id;
+ private String machineId;
+ private String tenantId;
+ private String parentId;
+ private Date gmtStarted;
+ private String businessKey;
private Map<String, Object> startParams = new HashMap<>();
- private Object serializedStartParams;
- private Date gmtEnd;
- private Exception exception;
- private Object serializedException;
+ private Object serializedStartParams;
+ private Date gmtEnd;
+ private Exception exception;
+ private Object serializedException;
private Map<String, Object> endParams = new HashMap<>();
- private Object serializedEndParams;
- private ExecutionStatus status;
- private ExecutionStatus compensationStatus;
- private boolean isRunning;
- private Date gmtUpdated;
+ private Object serializedEndParams;
+ private ExecutionStatus status;
+ private ExecutionStatus compensationStatus;
+ private boolean isRunning;
+ private Date gmtUpdated;
private Map<String, Object> context;
- private StateMachine stateMachine;
- private List<StateInstance> stateList = Collections.synchronizedList(new ArrayList<>());
- private Map<String, StateInstance> stateMap = new ConcurrentHashMap<>();
+ private StateMachine stateMachine;
+ private List<StateInstance> stateList = Collections.synchronizedList(new ArrayList<>());
+ private Map<String, StateInstance> stateMap = new ConcurrentHashMap<>();
@Override
public String getId() {
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/SubStateMachineImpl.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/SubStateMachineImpl.java
index ccd8581b43c37aec34c26796bcd0b9cc9da81b8e..a61d1cbe336bd17f7191e5dee36a1cf719184ee9 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/SubStateMachineImpl.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/domain/impl/SubStateMachineImpl.java
@@ -21,6 +21,7 @@ import io.seata.saga.statelang.domain.TaskState;
/**
* sub state machine
+ *
* @author lorne.cl
*/
public class SubStateMachineImpl extends ServiceTaskStateImpl implements SubStateMachine {
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateMachineParser.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateMachineParser.java
index 43c8bbf8d50208c32abd907a37cbac8de867dcb3..f0c00c909406adbbc71c42b1f731c652ead512ae 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateMachineParser.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateMachineParser.java
@@ -19,12 +19,14 @@ import io.seata.saga.statelang.domain.StateMachine;
/**
* State machine parser
+ *
* @author lorne.cl
*/
public interface StateMachineParser {
/**
* Parse an object (such as Json) into a State Machine model
+ *
* @param json
* @return
*/
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateMachineParserFactory.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateMachineParserFactory.java
index 670d6c663cb953934c1f3b3eb3307f4b63fd5c85..9454d0cc977173a22313fe3b984cf9674560788d 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateMachineParserFactory.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateMachineParserFactory.java
@@ -19,11 +19,12 @@ import io.seata.saga.statelang.parser.impl.StateMachineParserImpl;
/**
* A simple factory of State machine language parser
+ *
* @author lorne.cl
*/
public class StateMachineParserFactory {
- public static StateMachineParser getStateMachineParser(){
+ public static StateMachineParser getStateMachineParser() {
return new StateMachineParserImpl();
}
}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateParser.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateParser.java
index be7cfb3f9751a3d45fd080d40d5314d54913f1d4..610a5c8cb6ff7b39ff7acb0110ae81325987d487 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateParser.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateParser.java
@@ -19,12 +19,14 @@ import io.seata.saga.statelang.domain.State;
/**
* State Parser
+ *
* @author lorne.cl
*/
public interface StateParser<T extends State> {
/**
* Parse an object (such as Json) into a State model
+ *
* @param node
* @return
*/
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateParserFactory.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateParserFactory.java
index e385de88c5ded9ce80864ead6165dab93474eb88..fba3be973a14ba27895dd945d8ba335789db86e9 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateParserFactory.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/StateParserFactory.java
@@ -15,6 +15,9 @@
*/
package io.seata.saga.statelang.parser;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.parser.impl.ChoiceStateParser;
import io.seata.saga.statelang.parser.impl.CompensateSubStateMachineStateParser;
@@ -23,28 +26,28 @@ import io.seata.saga.statelang.parser.impl.FailEndStateParser;
import io.seata.saga.statelang.parser.impl.ServiceTaskStateParser;
import io.seata.saga.statelang.parser.impl.SubStateMachineParser;
import io.seata.saga.statelang.parser.impl.SucceedEndStateParser;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
/**
* A simple factory of state parser
+ *
* @author lorne.cl
*/
public class StateParserFactory {
protected static Map<String, StateParser> stateParserMap = new ConcurrentHashMap<>();
- static{
+ static {
stateParserMap.put(DomainConstants.STATE_TYPE_SERVICE_TASK, new ServiceTaskStateParser());
stateParserMap.put(DomainConstants.STATE_TYPE_CHOICE, new ChoiceStateParser());
stateParserMap.put(DomainConstants.STATE_TYPE_COMPENSATION_TRIGGER, new CompensationTriggerStateParser());
stateParserMap.put(DomainConstants.STATE_TYPE_FAIL, new FailEndStateParser());
stateParserMap.put(DomainConstants.STATE_TYPE_SUCCEED, new SucceedEndStateParser());
stateParserMap.put(DomainConstants.STATE_TYPE_SUB_STATE_MACHINE, new SubStateMachineParser());
- stateParserMap.put(DomainConstants.STATE_TYPE_SUB_MACHINE_COMPENSATION, new CompensateSubStateMachineStateParser());
+ stateParserMap.put(DomainConstants.STATE_TYPE_SUB_MACHINE_COMPENSATION,
+ new CompensateSubStateMachineStateParser());
}
- public static StateParser getStateParser(String stateType){
+ public static StateParser getStateParser(String stateType) {
return stateParserMap.get(stateType);
}
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/AbstractTaskStateParser.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/AbstractTaskStateParser.java
index 79ae66695d628bdf23b6e01118779b8fedfbf713..263dd411d472acbe0946c1a63f24f0b2a833ce78 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/AbstractTaskStateParser.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/AbstractTaskStateParser.java
@@ -15,19 +15,19 @@
*/
package io.seata.saga.statelang.parser.impl;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import io.seata.saga.statelang.domain.TaskState.ExceptionMatch;
import io.seata.saga.statelang.domain.TaskState.Retry;
import io.seata.saga.statelang.domain.impl.AbstractTaskState;
import io.seata.saga.statelang.domain.impl.AbstractTaskState.ExceptionMatchImpl;
import io.seata.saga.statelang.domain.impl.AbstractTaskState.RetryImpl;
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
/**
* AbstractTaskStateParser
+ *
* @author lorne.cl
*/
public abstract class AbstractTaskStateParser extends BaseStatePaser {
@@ -39,15 +39,16 @@ public abstract class AbstractTaskStateParser extends BaseStatePaser {
Map<String, Object> nodeMap = (Map<String, Object>) node;
state.setCompensateState((String) nodeMap.get("CompensateState"));
- state.setForCompensation("true".equals(nodeMap.get("IsForCompensation")));
- state.setForUpdate("true".equals(nodeMap.get("IsForUpdate")));
- if("false".equals(nodeMap.get("IsPersist"))){
+ state.setForCompensation(Boolean.TRUE.equals(nodeMap.get("IsForCompensation")));
+ state.setForUpdate(Boolean.TRUE.equals(nodeMap.get("IsForUpdate")));
+ Object isPersist = nodeMap.get("IsPersist");
+ if (Boolean.FALSE.equals(isPersist)) {
state.setPersist(false);
}
- Map<String, Object> retryMap = (Map<String, Object>) nodeMap.get("Retry");
- if (retryMap != null) {
- state.setRetry(parseRetry(retryMap));
+ List<Object> retryList = (List<Object>) nodeMap.get("Retry");
+ if (retryList != null) {
+ state.setRetry(parseRetry(retryList));
}
List<Object> catchList = (List<Object>) nodeMap.get("Catch");
@@ -71,12 +72,31 @@ public abstract class AbstractTaskStateParser extends BaseStatePaser {
}
}
- protected Retry parseRetry(Map<String, Object> retryMap) {
- RetryImpl retry = new RetryImpl();
- retry.setIntervalSeconds(((Double) retryMap.get("IntervalSeconds")).intValue());
- retry.setMaxAttempts(((Double) retryMap.get("MaxAttempts")).intValue());
- retry.setBackoffRate(new BigDecimal((Double) retryMap.get("BackoffRate")));
- return retry;
+ protected List<Retry> parseRetry(List<Object> retryList) {
+ if (retryList != null) {
+ List<Retry> retries = new ArrayList<>(retryList.size());
+ for (Object retryObj : retryList) {
+ Map<String, Object> retryMap = (Map<String, Object>) retryObj;
+ RetryImpl retry = new RetryImpl();
+ retry.setExceptions((List<String>) retryMap.get("Exceptions"));
+
+ Object intervalSeconds = retryMap.get("IntervalSeconds");
+ if (intervalSeconds != null && intervalSeconds instanceof Number) {
+ retry.setIntervalSeconds(((Number) intervalSeconds).doubleValue());
+ }
+
+ retry.setMaxAttempts((Integer) retryMap.get("MaxAttempts"));
+
+ Object backoffRate = retryMap.get("BackoffRate");
+ if (backoffRate != null && backoffRate instanceof Number) {
+ retry.setBackoffRate(((Number) backoffRate).doubleValue());
+ }
+
+ retries.add(retry);
+ }
+ return retries;
+ }
+ return new ArrayList<>(0);
}
protected List<ExceptionMatch> parseCatch(List<Object> catchList) {
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/BaseStatePaser.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/BaseStatePaser.java
index 29791c2acc887660012304f5015331b9008a8fc1..648b3caf238b19eba2b4442c3afcd86ce1e84527 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/BaseStatePaser.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/BaseStatePaser.java
@@ -15,11 +15,13 @@
*/
package io.seata.saga.statelang.parser.impl;
-import io.seata.saga.statelang.domain.impl.BaseState;
import java.util.Map;
+import io.seata.saga.statelang.domain.impl.BaseState;
+
/**
* BaseStatePaser
+ *
* @author lorne.cl
*/
public abstract class BaseStatePaser {
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/ChoiceStateParser.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/ChoiceStateParser.java
index efc115f89d252ecf150ca3487487c5f8d9bf59a2..1b73829c2fbc6e1ae00cd43d3c802c01004663ea 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/ChoiceStateParser.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/ChoiceStateParser.java
@@ -15,17 +15,19 @@
*/
package io.seata.saga.statelang.parser.impl;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
import io.seata.saga.statelang.domain.ChoiceState;
import io.seata.saga.statelang.domain.ChoiceState.Choice;
import io.seata.saga.statelang.domain.impl.ChoiceStateImpl;
import io.seata.saga.statelang.domain.impl.ChoiceStateImpl.ChoiceImpl;
import io.seata.saga.statelang.parser.StateParser;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
/**
* Single item selection state parser
+ *
* @author lorne.cl
*/
public class ChoiceStateParser extends BaseStatePaser implements StateParser<ChoiceState> {
@@ -39,7 +41,7 @@ public class ChoiceStateParser extends BaseStatePaser implements StateParser<Cho
Map<String, Object> nodeMap = (Map<String, Object>)node;
List<Object> choiceObjList = (List<Object>)nodeMap.get("Choices");
List<Choice> choiceStateList = new ArrayList<>(choiceObjList.size());
- for(Object choiceObj : choiceObjList){
+ for (Object choiceObj : choiceObjList) {
Map<String, Object> choiceObjMap = (Map<String, Object>)choiceObj;
ChoiceImpl choice = new ChoiceImpl();
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/CompensateSubStateMachineStateParser.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/CompensateSubStateMachineStateParser.java
index 31b16bda8c8e42651deeb1263a21b09372b3b8ac..eae4af2798950784f8c43e9f307adff962b9aa79 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/CompensateSubStateMachineStateParser.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/CompensateSubStateMachineStateParser.java
@@ -23,20 +23,23 @@ import org.springframework.util.StringUtils;
/**
* CompensateSubStateMachineState Parser
+ *
* @author lorne.cl
*/
-public class CompensateSubStateMachineStateParser extends AbstractTaskStateParser implements StateParser<ServiceTaskState> {
+public class CompensateSubStateMachineStateParser extends AbstractTaskStateParser
+ implements StateParser<ServiceTaskState> {
@Override
public ServiceTaskState parse(Object node) {
CompensateSubStateMachineStateImpl compensateSubStateMachineState = new CompensateSubStateMachineStateImpl();
compensateSubStateMachineState.setForCompensation(true);
- if(node != null){
+ if (node != null) {
parseTaskAttributes(compensateSubStateMachineState, node);
}
- if(StringUtils.isEmpty(compensateSubStateMachineState.getName())){
- compensateSubStateMachineState.setName(DomainConstants.COMPENSATE_SUB_MACHINE_STATE_NAME_PREFIX + compensateSubStateMachineState.hashCode());
+ if (StringUtils.isEmpty(compensateSubStateMachineState.getName())) {
+ compensateSubStateMachineState.setName(
+ DomainConstants.COMPENSATE_SUB_MACHINE_STATE_NAME_PREFIX + compensateSubStateMachineState.hashCode());
}
return compensateSubStateMachineState;
}
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/CompensationTriggerStateParser.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/CompensationTriggerStateParser.java
index b64f110d5f5c0d13f3eaddf8841247730677bf50..1c43a27bfd8e53d77c40b8cf6e3f6ffe5954c67d 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/CompensationTriggerStateParser.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/CompensationTriggerStateParser.java
@@ -21,6 +21,7 @@ import io.seata.saga.statelang.parser.StateParser;
/**
* 'trigger compensation process' state parser
+ *
* @author lorne.cl
*/
public class CompensationTriggerStateParser extends BaseStatePaser implements StateParser<CompensationTriggerState> {
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/FailEndStateParser.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/FailEndStateParser.java
index db92827abbabd0f2b58b15351d62fe7e7e8a9ff0..94aa45a85b1540e318425182394a4254ae4a745d 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/FailEndStateParser.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/FailEndStateParser.java
@@ -15,13 +15,15 @@
*/
package io.seata.saga.statelang.parser.impl;
+import java.util.Map;
+
import io.seata.saga.statelang.domain.FailEndState;
import io.seata.saga.statelang.domain.impl.FailEndStateImpl;
import io.seata.saga.statelang.parser.StateParser;
-import java.util.Map;
/**
* Failed end state parser
+ *
* @author lorne.cl
*/
public class FailEndStateParser extends BaseStatePaser implements StateParser<FailEndState> {
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/ServiceTaskStateParser.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/ServiceTaskStateParser.java
index f318d7004c4bbce8cb3eea6e0f319f2fedd041f6..7ff796951525e8a92d798f45615098d5e6527ec5 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/ServiceTaskStateParser.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/ServiceTaskStateParser.java
@@ -15,15 +15,16 @@
*/
package io.seata.saga.statelang.parser.impl;
+import java.util.List;
+import java.util.Map;
+
import io.seata.saga.statelang.domain.ServiceTaskState;
import io.seata.saga.statelang.domain.impl.ServiceTaskStateImpl;
import io.seata.saga.statelang.parser.StateParser;
-import java.util.List;
-import java.util.Map;
-
/**
* ServcieTaskTask parser
+ *
* @author lorne.cl
*/
public class ServiceTaskStateParser extends AbstractTaskStateParser implements StateParser<ServiceTaskState> {
@@ -40,6 +41,10 @@ public class ServiceTaskStateParser extends AbstractTaskStateParser implements S
serviceTaskState.setServiceMethod((String)nodeMap.get("ServiceMethod"));
serviceTaskState.setServiceType((String)nodeMap.get("ServiceType"));
serviceTaskState.setParameterTypes((List<String>)nodeMap.get("ParameterTypes"));
+ Object isAsync = nodeMap.get("IsAsync");
+ if (isAsync != null && Boolean.TRUE.equals(isAsync)) {
+ serviceTaskState.setAsync(true);
+ }
return serviceTaskState;
}
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/StateMachineParserImpl.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/StateMachineParserImpl.java
index 828348eae9c5487f6955d0bddbc9f26302b28a54..f464588147329622babc54185d22ea468952d49b 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/StateMachineParserImpl.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/StateMachineParserImpl.java
@@ -15,8 +15,12 @@
*/
package io.seata.saga.statelang.parser.impl;
+import java.util.Map;
+
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.parser.Feature;
+
+import com.alibaba.fastjson.serializer.SerializerFeature;
import io.seata.common.util.StringUtils;
import io.seata.saga.statelang.domain.State;
import io.seata.saga.statelang.domain.StateMachine;
@@ -26,57 +30,69 @@ import io.seata.saga.statelang.domain.impl.StateMachineImpl;
import io.seata.saga.statelang.parser.StateMachineParser;
import io.seata.saga.statelang.parser.StateParser;
import io.seata.saga.statelang.parser.StateParserFactory;
-import java.util.Map;
+import io.seata.saga.statelang.parser.utils.DesignerJsonTransformer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* State machine language parser
+ *
* @author lorne.cl
*/
public class StateMachineParserImpl implements StateMachineParser {
+ private static final Logger LOGGER = LoggerFactory.getLogger(StateMachineParserImpl.class);
+
@Override
public StateMachine parse(String json) {
Map<String, Object> node = JSON.parseObject(json, Map.class, Feature.IgnoreAutoType, Feature.OrderedField);
+ if (DesignerJsonTransformer.isDesignerJson(node)) {
+ node = DesignerJsonTransformer.toStandardJson(node);
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("===== Transformed standard state language:\n{}", JSON.toJSONString(node, SerializerFeature.PrettyFormat));
+ }
+ }
StateMachineImpl stateMachine = new StateMachineImpl();
- stateMachine.setName((String)node.get("Name"));
- stateMachine.setComment((String)node.get("Comment"));
- stateMachine.setVersion((String)node.get("Version"));
- stateMachine.setStartState((String)node.get("StartState"));
- if("false".equals(node.get("IsPersist"))){
+ stateMachine.setName((String) node.get("Name"));
+ stateMachine.setComment((String) node.get("Comment"));
+ stateMachine.setVersion((String) node.get("Version"));
+ stateMachine.setStartState((String) node.get("StartState"));
+ Object isPersist = node.get("IsPersist");
+ if (Boolean.FALSE.equals(isPersist)) {
stateMachine.setPersist(false);
}
- Map<String, Object> statesNode = (Map<String, Object>)node.get("States");
- for(String stateName : statesNode.keySet()){
- Map<String, Object> stateNode = (Map<String, Object>)statesNode.get(stateName);
- String stateType = (String)stateNode.get("Type");
+ Map<String, Object> statesNode = (Map<String, Object>) node.get("States");
+ for (String stateName : statesNode.keySet()) {
+ Map<String, Object> stateNode = (Map<String, Object>) statesNode.get(stateName);
+ String stateType = (String) stateNode.get("Type");
StateParser stateParser = StateParserFactory.getStateParser(stateType);
- if(stateParser == null){
- throw new IllegalArgumentException("State Type ["+stateType+"] is not support");
+ if (stateParser == null) {
+ throw new IllegalArgumentException("State Type [" + stateType + "] is not support");
}
State state = stateParser.parse(stateNode);
- if(state instanceof BaseState){
- ((BaseState)state).setName(stateName);
+ if (state instanceof BaseState) {
+ ((BaseState) state).setName(stateName);
}
- if(stateMachine.getState(stateName) != null){
- throw new IllegalArgumentException("State[name:"+stateName+"] is already exists");
+ if (stateMachine.getState(stateName) != null) {
+ throw new IllegalArgumentException("State[name:" + stateName + "] is already exists");
}
stateMachine.putState(stateName, state);
}
Map<String, State> stateMap = stateMachine.getStates();
- for(String name : stateMap.keySet()){
+ for (String name : stateMap.keySet()) {
State state = stateMap.get(name);
- if(state instanceof AbstractTaskState){
+ if (state instanceof AbstractTaskState) {
AbstractTaskState taskState = (AbstractTaskState) state;
- if(StringUtils.isNotBlank(taskState.getCompensateState())){
+ if (StringUtils.isNotBlank(taskState.getCompensateState())) {
taskState.setForUpdate(true);
State compState = stateMap.get(taskState.getCompensateState());
- if(compState != null && compState instanceof AbstractTaskState){
- ((AbstractTaskState)compState).setForCompensation(true);
+ if (compState != null && compState instanceof AbstractTaskState) {
+ ((AbstractTaskState) compState).setForCompensation(true);
}
}
}
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/SubStateMachineParser.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/SubStateMachineParser.java
index f11a46ccddfd087fc9931bb01695a963bc9a9a15..f2e7822ba8a79ecba89e51c8145f2526d3a5db71 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/SubStateMachineParser.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/SubStateMachineParser.java
@@ -15,16 +15,17 @@
*/
package io.seata.saga.statelang.parser.impl;
+import java.util.Map;
+
import io.seata.saga.statelang.domain.ServiceTaskState;
import io.seata.saga.statelang.domain.SubStateMachine;
import io.seata.saga.statelang.domain.impl.SubStateMachineImpl;
import io.seata.saga.statelang.parser.StateParser;
import org.springframework.util.StringUtils;
-import java.util.Map;
-
/**
* SubStateMachineParser
+ *
* @author lorne.cl
*/
public class SubStateMachineParser extends AbstractTaskStateParser implements StateParser<SubStateMachine> {
@@ -39,9 +40,10 @@ public class SubStateMachineParser extends AbstractTaskStateParser implements St
Map<String, Object> nodeMap = (Map<String, Object>)node;
subStateMachine.setStateMachineName((String)nodeMap.get("StateMachineName"));
- if(StringUtils.isEmpty(subStateMachine.getCompensateState())){
+ if (StringUtils.isEmpty(subStateMachine.getCompensateState())) {
//build default SubStateMachine compensate state
- CompensateSubStateMachineStateParser compensateSubStateMachineStateParser = new CompensateSubStateMachineStateParser();
+ CompensateSubStateMachineStateParser compensateSubStateMachineStateParser
+ = new CompensateSubStateMachineStateParser();
ServiceTaskState subStateMachineCompenState = compensateSubStateMachineStateParser.parse(null);
subStateMachine.setCompensateStateObject(subStateMachineCompenState);
subStateMachine.setCompensateState(subStateMachineCompenState.getName());
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/SucceedEndStateParser.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/SucceedEndStateParser.java
index aceb29cd69c01c708e984d546a76758b6485db56..ddaac051cfc92a80c0b36d09fe84bc5a809bbd6c 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/SucceedEndStateParser.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/impl/SucceedEndStateParser.java
@@ -21,6 +21,7 @@ import io.seata.saga.statelang.parser.StateParser;
/**
* Succeed end state parser
+ *
* @author lorne.cl
*/
public class SucceedEndStateParser extends BaseStatePaser implements StateParser<SucceedEndState> {
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/utils/DesignerJsonTransformer.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/utils/DesignerJsonTransformer.java
new file mode 100644
index 0000000000000000000000000000000000000000..155dea825313bde5b210aaef5b873e0d5a1369a0
--- /dev/null
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/utils/DesignerJsonTransformer.java
@@ -0,0 +1,300 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.saga.statelang.parser.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.parser.Feature;
+import com.alibaba.fastjson.serializer.SerializerFeature;
+import io.seata.common.exception.FrameworkErrorCode;
+import io.seata.common.exception.FrameworkException;
+import io.seata.saga.statelang.domain.ExecutionStatus;
+import io.seata.saga.statelang.domain.StateInstance;
+import io.seata.saga.statelang.domain.StateMachineInstance;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Transform designer json to standard Saga State language json
+ *
+ * @author lorne.cl
+ */
+public class DesignerJsonTransformer {
+
+ public static Map<String, Object> toStandardJson(Map<String, Object> designerJsonObject) {
+
+ if (!isDesignerJson(designerJsonObject)) {
+ return designerJsonObject;
+ }
+
+ JSONObject machineJsonObject = new JSONObject(true);
+
+ List<Object> nodes = (List) designerJsonObject.get("nodes");
+ if (nodes != null && nodes.size() > 0) {
+
+ Map<String, JSONObject> nodeMap = new HashMap<>(nodes.size());
+
+ for (Object node : nodes) {
+ JSONObject nodeObj = (JSONObject) node;
+
+ transformNode(machineJsonObject, nodeMap, nodeObj);
+ }
+
+ List<Object> edges = (List) designerJsonObject.get("edges");
+ if (edges != null && edges.size() > 0) {
+ for (Object edge : edges) {
+ JSONObject edgeObj = (JSONObject) edge;
+ transformEdge(machineJsonObject, nodes, nodeMap, edgeObj);
+ }
+ }
+ }
+ return machineJsonObject;
+ }
+
+ private static void transformNode(JSONObject machineJsonObject, Map<String, JSONObject> nodeMap, JSONObject nodeObj) {
+ nodeMap.put(nodeObj.getString("id"), nodeObj);
+
+ String type = nodeObj.getString("stateType");
+ JSONObject propsObj = (JSONObject) nodeObj.get("stateProps");
+ if ("Start".equals(type)) {
+ if (propsObj != null && propsObj.containsKey("StateMachine")) {
+ machineJsonObject.putAll(propsObj.getJSONObject("StateMachine"));
+ }
+ } else if (!"Catch".equals(type)) {
+
+ JSONObject states = machineJsonObject.getJSONObject("States");
+ if (states == null) {
+ states = new JSONObject(true);
+ machineJsonObject.put("States", states);
+ }
+
+ JSONObject stateJsonObject = new JSONObject(true);
+ String stateId = nodeObj.getString("stateId");
+ if (states.containsKey(stateId)) {
+ throw new RuntimeException(
+ "Transform designer json to standard json failed, stateId[" + stateId + "] already exists, pls rename it.");
+ }
+
+ String comment = nodeObj.getString("label");
+ if (StringUtils.hasLength(comment)) {
+ stateJsonObject.put("Comment", comment);
+ }
+ if (propsObj != null) {
+ stateJsonObject.putAll(propsObj);
+ }
+
+ states.put(stateId, stateJsonObject);
+
+ String stateType = nodeObj.getString("stateType");
+ if ("Compensation".equals(stateType)) {
+ stateJsonObject.put("Type", "ServiceTask");
+ } else {
+ stateJsonObject.put("Type", stateType);
+ }
+ }
+ }
+
+ private static void transformEdge(JSONObject machineJsonObject, List<Object> nodes, Map<String, JSONObject> nodeMap,
+ JSONObject edgeObj) {
+ String sourceId = edgeObj.getString("source");
+ String targetId = edgeObj.getString("target");
+ if (StringUtils.hasLength(sourceId)) {
+ JSONObject sourceNode = nodeMap.get(sourceId);
+ JSONObject targetNode = nodeMap.get(targetId);
+
+ if (sourceNode != null) {
+
+ JSONObject states = machineJsonObject.getJSONObject("States");
+ JSONObject sourceState = states.getJSONObject(sourceNode.getString("stateId"));
+ String targetStateId = targetNode.getString("stateId");
+
+ String sourceType = sourceNode.getString("stateType");
+ if ("Start".equals(sourceType)) {
+ machineJsonObject.put("StartState", targetStateId);
+ //Make sure 'StartState' is before 'States'
+ machineJsonObject.put("States", machineJsonObject.remove("States"));
+ } else if ("ServiceTask".equals(sourceType)) {
+ if (targetNode != null && "Compensation".equals(targetNode.getString("stateType"))) {
+ sourceState.put("CompensateState", targetStateId);
+ } else {
+ sourceState.put("Next", targetStateId);
+ }
+ } else if ("Catch".equals(sourceType)) {
+ JSONObject catchAttachedNode = getCatchAttachedNode(sourceNode, nodes);
+ if (catchAttachedNode == null) {
+ throw new RuntimeException("'Catch' node[" + sourceNode.get("id") + "] is not attached on a 'ServiceTask'");
+ }
+ JSONObject catchAttachedState = (JSONObject) states.get(catchAttachedNode.getString("stateId"));
+ JSONArray catches = catchAttachedState.getJSONArray("Catch");
+ if (catches == null) {
+ catches = new JSONArray();
+ catchAttachedState.put("Catch", catches);
+ }
+
+ JSONObject edgeProps = (JSONObject) edgeObj.get("stateProps");
+ if (edgeProps != null) {
+ JSONObject catchObj = new JSONObject(true);
+ catchObj.put("Exceptions", edgeProps.get("Exceptions"));
+ catchObj.put("Next", targetStateId);
+ catches.add(catchObj);
+ }
+ } else if ("Choice".equals(sourceType)) {
+ JSONArray choices = sourceState.getJSONArray("Choices");
+ if (choices == null) {
+ choices = new JSONArray();
+ sourceState.put("Choices", choices);
+ }
+
+ JSONObject edgeProps = (JSONObject) edgeObj.get("stateProps");
+ if (edgeProps != null) {
+
+ if (Boolean.TRUE.equals(edgeProps.getBoolean("Default"))) {
+ sourceState.put("Default", targetStateId);
+ } else {
+ JSONObject choiceObj = new JSONObject(true);
+ choiceObj.put("Expression", edgeProps.get("Expression"));
+ choiceObj.put("Next", targetStateId);
+ choices.add(choiceObj);
+ }
+ }
+ } else {
+ sourceState.put("Next", targetStateId);
+ }
+ }
+ }
+ }
+
+ public static boolean isDesignerJson(Map<String, Object> jsonObject) {
+ return jsonObject != null && jsonObject.containsKey("nodes") && jsonObject.containsKey("edges");
+ }
+
+ private static JSONObject getCatchAttachedNode(JSONObject catchNode, List<Object> nodes) {
+ int catchNodeX = catchNode.getInteger("x");
+ int catchNodeY = catchNode.getInteger("y");
+ String catchSize = catchNode.getString("size");
+ String[] catchSizes = catchSize.split("\\*");
+ int catchWidth = Integer.parseInt(catchSizes[0]);
+ int catchHeight = Integer.parseInt(catchSizes[1]);
+
+ for (Object node : nodes) {
+ JSONObject nodeObj = (JSONObject) node;
+ if (catchNode != nodeObj && "ServiceTask".equals(nodeObj.get("stateType"))) {
+
+ int nodeX = nodeObj.getInteger("x");
+ int nodeY = nodeObj.getInteger("y");
+
+ String nodeSize = nodeObj.getString("size");
+ String[] nodeSizes = nodeSize.split("\\*");
+ int nodeWidth = Integer.parseInt(nodeSizes[0]);
+ int nodeHeight = Integer.parseInt(nodeSizes[1]);
+
+ if (isBordersCoincided(catchNodeX, nodeX, catchWidth, nodeWidth)
+ && isBordersCoincided(catchNodeY, nodeY, catchHeight, nodeHeight)) {
+
+ return nodeObj;
+ }
+ }
+ }
+ return null;
+ }
+
+ private static boolean isBordersCoincided(int xyA, int xyB, int lengthA, int lengthB) {
+ int centerPointLength = xyA > xyB ? xyA - xyB : xyB - xyA;
+ return ((lengthA + lengthB) / 2) > centerPointLength;
+ }
+
+ /**
+ * Generate tracing graph json
+ * @param stateMachineInstance
+ * @return
+ */
+ public static String generateTracingGraphJson(StateMachineInstance stateMachineInstance) {
+
+ if (stateMachineInstance == null) {
+ throw new FrameworkException("StateMachineInstance is not exits",
+ FrameworkErrorCode.StateMachineInstanceNotExists);
+ }
+ String stateMachineJson = stateMachineInstance.getStateMachine().getContent();
+ if (StringUtils.isEmpty(stateMachineJson)) {
+ throw new FrameworkException("Cannot get StateMachine Json",
+ FrameworkErrorCode.ObjectNotExists);
+ }
+ JSONObject stateMachineJsonObj = JSON.parseObject(stateMachineJson, Feature.IgnoreAutoType, Feature.OrderedField);
+ if (!DesignerJsonTransformer.isDesignerJson(stateMachineJsonObj)) {
+ throw new FrameworkException("StateMachine Json is not generated by Designer",
+ FrameworkErrorCode.InvalidConfiguration);
+ }
+ Map<String, List<StateInstance>> stateInstanceMapGroupByName = new HashMap<>(stateMachineInstance.getStateMap().size());
+ for (String id : stateMachineInstance.getStateMap().keySet()) {
+ StateInstance stateInstance = stateMachineInstance.getStateMap().get(id);
+ List<StateInstance> stateInstanceList = stateInstanceMapGroupByName.get(stateInstance.getName());
+ if (stateInstanceList == null) {
+ stateInstanceList = new ArrayList<>();
+ stateInstanceMapGroupByName.put(stateInstance.getName(), stateInstanceList);
+ }
+ stateInstanceList.add(stateInstance);
+ }
+ JSONArray nodesArray = stateMachineJsonObj.getJSONArray("nodes");
+ for (Object nodeObj : nodesArray) {
+ JSONObject node = (JSONObject) nodeObj;
+ String stateId = node.getString("stateId");
+ String stateType = node.getString("stateType");
+ if ("ServiceTask".equals(stateType)
+ || "SubStateMachine".equals(stateType)
+ || "Compensation".equals(stateType)) {
+ node.remove("color");
+ }
+ List<StateInstance> stateInstanceList = stateInstanceMapGroupByName.get(stateId);
+ if (stateInstanceList != null && stateInstanceList.size() > 0) {
+
+ StateInstance stateInstance = null;
+ if (stateInstanceList.size() == 1) {
+ stateInstance = stateInstanceList.get(0);
+ } else {
+ //find out latest stateInstance
+ for (StateInstance stateInst : stateInstanceList) {
+
+ if (stateInstance == null
+ || stateInst.getGmtStarted().after(stateInstance.getGmtStarted())) {
+ stateInstance = stateInst;
+ }
+ }
+ }
+ node.put("stateInstanceId", stateInstance.getId());
+ node.put("stateInstanceStatus", stateInstance.getStatus());
+ if (ExecutionStatus.SU.equals(stateInstance.getStatus())) {
+ node.put("color", "green");
+ JSONObject style = new JSONObject();
+ style.put("fill", "#00D73E");
+ style.put("lineWidth", 2);
+ node.put("style", style);
+ } else {
+ node.put("color", "red");
+ JSONObject style = new JSONObject();
+ style.put("fill", "#FF7777");
+ style.put("lineWidth", 2);
+ node.put("style", style);
+ }
+ }
+ }
+ return stateMachineJsonObj.toString(SerializerFeature.PrettyFormat);
+ }
+}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/utils/IOUtils.java b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/utils/IOUtils.java
index 7892f39871f00fc61a8c30ce1ea616f1893d8137..fda091f8c20c97bbbf98663bfe6c4f5d60450c7c 100644
--- a/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/utils/IOUtils.java
+++ b/saga/seata-saga-statelang/src/main/java/io/seata/saga/statelang/parser/utils/IOUtils.java
@@ -25,21 +25,20 @@ import java.io.Writer;
/**
* IOUtils
* copy from commons-io
+ *
* @author lorne.cl
*/
public class IOUtils {
private static final int DEFAULT_BUFFER_SIZE = 1024 * 4;
- public static String toString(InputStream input, String encoding)
- throws IOException {
+ public static String toString(InputStream input, String encoding) throws IOException {
StringWriter sw = new StringWriter();
copy(input, sw, encoding);
return sw.toString();
}
- public static void copy(InputStream input, Writer output, String encoding)
- throws IOException {
+ public static void copy(InputStream input, Writer output, String encoding) throws IOException {
if (encoding == null) {
copy(input, output);
} else {
@@ -48,8 +47,7 @@ public class IOUtils {
}
}
- public static void copy(InputStream input, Writer output)
- throws IOException {
+ public static void copy(InputStream input, Writer output) throws IOException {
InputStreamReader in = new InputStreamReader(input);
copy(in, output);
}
diff --git a/saga/seata-saga-statelang/src/test/java/io/seata/saga/statelang/parser/StateParserTests.java b/saga/seata-saga-statelang/src/test/java/io/seata/saga/statelang/parser/StateParserTests.java
index 5bc76aad9bfc8dc1e7e649adfa3fbf9dde3805bd..785de7f7221d720690c2f340a78f4aa5a6c0370c 100644
--- a/saga/seata-saga-statelang/src/test/java/io/seata/saga/statelang/parser/StateParserTests.java
+++ b/saga/seata-saga-statelang/src/test/java/io/seata/saga/statelang/parser/StateParserTests.java
@@ -15,17 +15,22 @@
*/
package io.seata.saga.statelang.parser;
+import java.io.IOException;
+import java.util.Map;
+
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.parser.Feature;
import com.alibaba.fastjson.serializer.SerializerFeature;
+
import io.seata.saga.statelang.domain.StateMachine;
+import io.seata.saga.statelang.parser.utils.DesignerJsonTransformer;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.core.io.ClassPathResource;
-import java.io.IOException;
-
/**
* StateParser tests
+ *
* @author lorne.cl
*/
public class StateParserTests {
@@ -44,4 +49,16 @@ public class StateParserTests {
Assertions.assertEquals(stateMachine.getName(), "simpleTestStateMachine");
Assertions.assertTrue(stateMachine.getStates().size() > 0);
}
+
+ @Test
+ public void testDesignerJsonTransformer() throws IOException {
+
+ ClassPathResource resource = new ClassPathResource("statelang/simple_statemachine_with_layout.json");
+ String json = io.seata.saga.statelang.parser.utils.IOUtils.toString(resource.getInputStream(), "UTF-8");
+ Map<String, Object> parsedObj = DesignerJsonTransformer.toStandardJson(JSON.parseObject(json, Feature.OrderedField));
+ Assertions.assertNotNull(parsedObj);
+
+ String outputJson = JSON.toJSONString(parsedObj, SerializerFeature.PrettyFormat);
+ System.out.println(outputJson);
+ }
}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/test/resources/statelang/simple_statemachine.json b/saga/seata-saga-statelang/src/test/resources/statelang/simple_statemachine.json
index 46e0d5b20391bcd7459cd2926012668a41fd64d6..32168f5b7dd9f5512fb9c4a56516060f7799c404 100644
--- a/saga/seata-saga-statelang/src/test/resources/statelang/simple_statemachine.json
+++ b/saga/seata-saga-statelang/src/test/resources/statelang/simple_statemachine.json
@@ -1,114 +1,124 @@
{
- "Name": "simpleTestStateMachine",
- "Comment": "测试状态机定义",
- "StartState": "FirstState",
- "Version": "0.0.1",
- "States": {
- "FirstState": {
- "Type": "ServiceTask",
- "ServiceName": "is.seata.saga.DemoService",
- "ServiceMethod": "foo",
- "Next": "ChoiceState"
+ "Name": "simpleTestStateMachine",
+ "Comment": "测试状态机定义",
+ "StartState": "FirstState",
+ "Version": "0.0.1",
+ "States": {
+ "FirstState": {
+ "Type": "ServiceTask",
+ "ServiceName": "is.seata.saga.DemoService",
+ "ServiceMethod": "foo",
+ "IsPersist": false,
+ "Next": "ChoiceState"
+ },
+ "ChoiceState": {
+ "Type": "Choice",
+ "Choices": [
+ {
+ "Expression": "foo == 1",
+ "Next": "FirstMatchState"
},
- "ChoiceState": {
- "Type": "Choice",
- "Choices": [
- {
- "Expression": "foo == 1",
- "Next": "FirstMatchState"
- },
- {
- "Expression": "foo == 2",
- "Next": "SecondMatchState"
- }
- ],
- "Default": "FailState"
- },
- "FirstMatchState": {
- "Type": "ServiceTask",
- "ServiceName": "is.seata.saga.DemoService",
- "ServiceMethod": "bar",
- "CompensateState": "CompensateFirst",
- "Status": {
- "return.code == 'S'": "SU",
- "return.code == 'F'": "FA",
- "$exception{java.lang.Throwable}": "UN"
- },
- "Input": [
- {
- "inputA1": "$.data1",
- "inputA2": {
- "a": "$.data2.a"
- }
- },
- {
- "inputB": "$.header"
- }
- ],
- "Output": {
- "firstMatchStateResult": "$.#root"
- },
- "Catch": [
- {
- "Exceptions": [
- "java.lang.Exception"
- ],
- "Next": "CompensationTrigger"
- }
- ],
- "Next": "SuccessState"
- },
- "CompensateFirst": {
- "Type": "ServiceTask",
- "ServiceName": "is.seata.saga.DemoService",
- "ServiceMethod": "compensateBar",
- "isForCompensation": true,
- "Input": [
- {
- "input": "$.data"
- }
- ],
- "Output": {
- "firstMatchStateResult": "$.#root"
- },
- "Status": {
- "return.code == 'S'": "SU",
- "return.code == 'F'": "FA",
- "$exception{java.lang.Throwable}": "UN"
- }
- },
- "CompensationTrigger": {
- "Type": "CompensationTrigger",
- "Next": "CompensateEndState"
- },
- "CompensateEndState": {
- "Type": "Fail",
- "ErrorCode": "StateCompensated",
- "Message": "State Compensated!"
- },
- "SecondMatchState": {
- "Type": "SubStateMachine",
- "StateMachineName": "simpleTestStateMachine",
- "Input": [
- {
- "input": "$.data"
- },
- {
- "header": "$.header"
- }
- ],
- "Output": {
- "firstMatchStateResult": "$.#root"
- },
- "Next": "SuccessState"
+ {
+ "Expression": "foo == 2",
+ "Next": "SecondMatchState"
+ }
+ ],
+ "Default": "FailState"
+ },
+ "FirstMatchState": {
+ "Type": "ServiceTask",
+ "ServiceName": "is.seata.saga.DemoService",
+ "ServiceMethod": "bar",
+ "CompensateState": "CompensateFirst",
+ "Status": {
+ "return.code == 'S'": "SU",
+ "return.code == 'F'": "FA",
+ "$exception{java.lang.Throwable}": "UN"
+ },
+ "Input": [
+ {
+ "inputA1": "$.data1",
+ "inputA2": {
+ "a": "$.data2.a"
+ }
},
- "FailState": {
- "Type": "Fail",
- "ErrorCode": "DefaultStateError",
- "Message": "No Matches!"
+ {
+ "inputB": "$.header"
+ }
+ ],
+ "Output": {
+ "firstMatchStateResult": "$.#root"
+ },
+ "Retry": [
+ {
+ "Exceptions": ["java.lang.Exception"],
+ "IntervalSeconds": 2,
+ "MaxAttempts": 3,
+ "BackoffRate": 1.5
+ }
+ ],
+ "Catch": [
+ {
+ "Exceptions": [
+ "java.lang.Exception"
+ ],
+ "Next": "CompensationTrigger"
+ }
+ ],
+ "Next": "SuccessState"
+ },
+ "CompensateFirst": {
+ "Type": "ServiceTask",
+ "ServiceName": "is.seata.saga.DemoService",
+ "ServiceMethod": "compensateBar",
+ "IsForCompensation": true,
+ "IsForUpdate": true,
+ "Input": [
+ {
+ "input": "$.data"
+ }
+ ],
+ "Output": {
+ "firstMatchStateResult": "$.#root"
+ },
+ "Status": {
+ "return.code == 'S'": "SU",
+ "return.code == 'F'": "FA",
+ "$exception{java.lang.Throwable}": "UN"
+ }
+ },
+ "CompensationTrigger": {
+ "Type": "CompensationTrigger",
+ "Next": "CompensateEndState"
+ },
+ "CompensateEndState": {
+ "Type": "Fail",
+ "ErrorCode": "StateCompensated",
+ "Message": "State Compensated!"
+ },
+ "SecondMatchState": {
+ "Type": "SubStateMachine",
+ "StateMachineName": "simpleTestStateMachine",
+ "Input": [
+ {
+ "input": "$.data"
},
- "SuccessState": {
- "Type": "Succeed"
+ {
+ "header": "$.header"
}
+ ],
+ "Output": {
+ "firstMatchStateResult": "$.#root"
+ },
+ "Next": "SuccessState"
+ },
+ "FailState": {
+ "Type": "Fail",
+ "ErrorCode": "DefaultStateError",
+ "Message": "No Matches!"
+ },
+ "SuccessState": {
+ "Type": "Succeed"
}
+ }
}
\ No newline at end of file
diff --git a/saga/seata-saga-statelang/src/test/resources/statelang/simple_statemachine_with_layout.json b/saga/seata-saga-statelang/src/test/resources/statelang/simple_statemachine_with_layout.json
new file mode 100644
index 0000000000000000000000000000000000000000..4d886a02c363aa0d9dcd3f1fc65a1a3bb4c31672
--- /dev/null
+++ b/saga/seata-saga-statelang/src/test/resources/statelang/simple_statemachine_with_layout.json
@@ -0,0 +1,288 @@
+{
+ "nodes": [
+ {
+ "type": "node",
+ "size": "72*72",
+ "shape": "flow-circle",
+ "color": "#FA8C16",
+ "label": "Start",
+ "stateId": "Start",
+ "stateType": "Start",
+ "stateProps": {
+ "StateMachine": {
+ "Name": "simpleStateMachineWithCompensationAndSubMachine_layout",
+ "Comment": "带补偿定义和调用子状态机",
+ "Version": "0.0.1"
+ }
+ },
+ "x": 199.875,
+ "y": 95,
+ "id": "e2d86441"
+ },
+ {
+ "type": "node",
+ "size": "110*48",
+ "shape": "flow-rect",
+ "color": "#1890FF",
+ "label": "FirstState",
+ "stateId": "FirstState",
+ "stateType": "ServiceTask",
+ "stateProps": {
+ "ServiceName": "demoService",
+ "ServiceMethod": "foo",
+ "Input": [
+ {
+ "fooInput": "$.[a]"
+ }
+ ],
+ "Output": {
+ "fooResult": "$.#root"
+ }
+ },
+ "x": 199.875,
+ "y": 213,
+ "id": "6111bf54"
+ },
+ {
+ "type": "node",
+ "size": "80*72",
+ "shape": "flow-rhombus",
+ "color": "#13C2C2",
+ "label": "ChoiceState",
+ "stateId": "ChoiceState",
+ "stateType": "Choice",
+ "x": 199.875,
+ "y": 341.5,
+ "id": "5610fa37"
+ },
+ {
+ "type": "node",
+ "size": "110*48",
+ "shape": "flow-rect",
+ "color": "#1890FF",
+ "label": "SecondState",
+ "stateId": "SecondState",
+ "stateType": "ServiceTask",
+ "stateProps": {
+ "ServiceName": "demoService",
+ "ServiceMethod": "bar",
+ "Input": [
+ {
+ "barInput": "$.[fooResult]",
+ "throwException": "$.[barThrowException]"
+ }
+ ],
+ "Output": {
+ "barResult": "$.#root"
+ },
+ "Status": {
+ "#root != null": "SU",
+ "#root == null": "FA",
+ "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN"
+ }
+ },
+ "x": 199.375,
+ "y": 468,
+ "id": "af5591f9"
+ },
+ {
+ "type": "node",
+ "size": "72*72",
+ "shape": "flow-circle",
+ "color": "#05A465",
+ "label": "Succeed",
+ "stateId": "Succeed",
+ "stateType": "Succeed",
+ "x": 199.375,
+ "y": 609,
+ "id": "2fd4c8de"
+ },
+ {
+ "type": "node",
+ "size": "110*48",
+ "shape": "flow-rect",
+ "color": "#FA8C16",
+ "label": "SubStateMachine",
+ "stateId": "CallSubStateMachine",
+ "stateType": "SubStateMachine",
+ "stateProps": {
+ "StateMachineName": "simpleCompensationStateMachine",
+ "Input": [
+ {
+ "a": "$.1",
+ "barThrowException": "$.[barThrowException]",
+ "fooThrowException": "$.[fooThrowException]",
+ "compensateFooThrowException": "$.[compensateFooThrowException]"
+ }
+ ],
+ "Output": {
+ "fooResult": "$.#root"
+ }
+ },
+ "x": 55.875,
+ "y": 467,
+ "id": "04ea55a5"
+ },
+ {
+ "type": "node",
+ "size": "110*48",
+ "shape": "flow-capsule",
+ "color": "#722ED1",
+ "label": "CompenFirstState",
+ "stateId": "CompensateFirstState",
+ "stateType": "Compensation",
+ "stateProps": {
+ "ServiceName": "demoService",
+ "ServiceMethod": "compensateFoo",
+ "Input": [
+ {
+ "compensateFooInput": "$.[fooResult]"
+ }
+ ]
+ },
+ "x": 68.875,
+ "y": 126,
+ "id": "6a09a5c2"
+ },
+ {
+ "type": "node",
+ "size": "39*39",
+ "shape": "flow-circle",
+ "color": "red",
+ "label": "Catch",
+ "stateId": "Catch",
+ "stateType": "Catch",
+ "x": 257.875,
+ "y": 492,
+ "id": "e28af1c2"
+ },
+ {
+ "type": "node",
+ "size": "110*48",
+ "shape": "flow-capsule",
+ "color": "red",
+ "label": "Compensation\nTrigger",
+ "stateId": "CompensationTrigger",
+ "stateType": "CompensationTrigger",
+ "x": 366.875,
+ "y": 491.5,
+ "id": "e32417a0"
+ },
+ {
+ "type": "node",
+ "size": "72*72",
+ "shape": "flow-circle",
+ "color": "red",
+ "label": "Fail",
+ "stateId": "Fail",
+ "stateType": "Fail",
+ "stateProps": {
+ "ErrorCode": "NOT_FOUND",
+ "Message": "not found"
+ },
+ "x": 513.375,
+ "y": 491.5,
+ "id": "d21d24c9"
+ }
+ ],
+ "edges": [
+ {
+ "source": "e2d86441",
+ "sourceAnchor": 2,
+ "target": "6111bf54",
+ "targetAnchor": 0,
+ "id": "51f30b96"
+ },
+ {
+ "source": "6111bf54",
+ "sourceAnchor": 2,
+ "target": "5610fa37",
+ "targetAnchor": 0,
+ "id": "8c3029b1"
+ },
+ {
+ "source": "5610fa37",
+ "sourceAnchor": 2,
+ "target": "af5591f9",
+ "targetAnchor": 0,
+ "id": "a9e7d5b4",
+ "stateProps": {
+ "Expression": "[a] == 1",
+ "Default": false
+ },
+ "label": "",
+ "shape": "flow-smooth"
+ },
+ {
+ "source": "af5591f9",
+ "sourceAnchor": 2,
+ "target": "2fd4c8de",
+ "targetAnchor": 0,
+ "id": "61f34a49"
+ },
+ {
+ "source": "6111bf54",
+ "sourceAnchor": 3,
+ "target": "6a09a5c2",
+ "targetAnchor": 2,
+ "id": "553384ab",
+ "style": {
+ "lineDash": "4"
+ }
+ },
+ {
+ "source": "5610fa37",
+ "sourceAnchor": 3,
+ "target": "04ea55a5",
+ "targetAnchor": 0,
+ "id": "2ee91c33",
+ "stateProps": {
+ "Expression": "[a] == 2",
+ "Default": false
+ },
+ "label": "",
+ "shape": "flow-smooth"
+ },
+ {
+ "source": "e28af1c2",
+ "sourceAnchor": 1,
+ "target": "e32417a0",
+ "targetAnchor": 3,
+ "id": "d854a4d0",
+ "stateProps": {
+ "Exceptions": [
+ "io.seata.common.exception.FrameworkException"
+ ]
+ },
+ "label": "",
+ "shape": "flow-smooth"
+ },
+ {
+ "source": "04ea55a5",
+ "sourceAnchor": 2,
+ "target": "2fd4c8de",
+ "targetAnchor": 3,
+ "id": "28734ad2"
+ },
+ {
+ "source": "5610fa37",
+ "sourceAnchor": 1,
+ "target": "d21d24c9",
+ "targetAnchor": 0,
+ "id": "7c7595c0",
+ "stateProps": {
+ "Expression": "",
+ "Default": true
+ },
+ "label": "",
+ "shape": "flow-smooth"
+ },
+ {
+ "source": "e32417a0",
+ "sourceAnchor": 1,
+ "target": "d21d24c9",
+ "targetAnchor": 3,
+ "id": "16d809ce"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/saga/seata-saga-statemachine-designer/.babelrc b/saga/seata-saga-statemachine-designer/.babelrc
new file mode 100644
index 0000000000000000000000000000000000000000..e092e89971f12815ecfa9eb5746bdc6b437128ce
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/.babelrc
@@ -0,0 +1,41 @@
+{
+ "presets": [
+ [
+ "@babel/preset-env",
+ {
+ "modules": false,
+ "useBuiltIns": "usage",
+ "corejs": "core-js@3",
+ }
+ ],
+ "@babel/preset-react"
+ ],
+ "plugins": [
+ "@babel/plugin-transform-runtime",
+ [
+ "@babel/plugin-proposal-class-properties",
+ {
+ "loose": true
+ }
+ ],
+ [
+ "module-resolver",
+ {
+ "alias": {
+ "@common": "./ggeditor/common",
+ "@components": "./ggeditor/components",
+ "@helpers": "./ggeditor/helpers",
+ "@utils": "./ggeditor/utils"
+ }
+ }
+ ],
+ [
+ "transform-inline-environment-variables",
+ {
+ "include": [
+ "GG_EDITOR_VERSION"
+ ]
+ }
+ ]
+ ]
+}
\ No newline at end of file
diff --git a/saga/seata-saga-statemachine-designer/.eslintignore b/saga/seata-saga-statemachine-designer/.eslintignore
new file mode 100644
index 0000000000000000000000000000000000000000..3dda1c9d003c858036655da10797a7e9e145b8c7
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/.eslintignore
@@ -0,0 +1,4 @@
+es
+cjs
+dist
+scripts
diff --git a/saga/seata-saga-statemachine-designer/.eslintrc.json b/saga/seata-saga-statemachine-designer/.eslintrc.json
new file mode 100644
index 0000000000000000000000000000000000000000..1f6ee74178aa5428fc5607d00744761e5bd2f904
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/.eslintrc.json
@@ -0,0 +1,26 @@
+{
+ "env": {
+ "browser": true
+ },
+ "parser": "babel-eslint",
+ "extends": "airbnb",
+ "rules": {
+ "arrow-body-style": 0,
+ "class-methods-use-this": 0,
+ "func-names": 0,
+ "import/extensions": 0,
+ "import/no-extraneous-dependencies": 0,
+ "import/no-unresolved": 0,
+ "jsx-a11y/anchor-is-valid":0,
+ "jsx-a11y/no-static-element-interactions": 0,
+ "no-param-reassign": 0,
+ "no-plusplus": 0,
+ "object-curly-newline": 0,
+ "react/destructuring-assignment": 0,
+ "react/jsx-filename-extension": [1, { "extensions": [".js", ".jsx"] }],
+ "react/no-multi-comp": 0,
+ "react/prefer-stateless-function": 0,
+ "react/prop-types": 0,
+ "react/sort-comp": 0
+ }
+}
diff --git a/saga/seata-saga-statemachine-designer/.gitignore b/saga/seata-saga-statemachine-designer/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..189994d1bd4f18ff464c33381577fc7a5c8a1832
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/.gitignore
@@ -0,0 +1,4 @@
+es
+cjs
+dist
+node_modules
diff --git a/saga/seata-saga-statemachine-designer/LICENSE b/saga/seata-saga-statemachine-designer/LICENSE
new file mode 100644
index 0000000000000000000000000000000000000000..0321c8b88299a05363505461c1d3017e46613b31
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/LICENSE
@@ -0,0 +1,13 @@
+Copyright 1999-2019 Seata.io Group.
+
+Licensed 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.
\ No newline at end of file
diff --git a/saga/seata-saga-statemachine-designer/README.md b/saga/seata-saga-statemachine-designer/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..a132a3f402af8d671a7d2cb807f0cb4597b90a11
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/README.md
@@ -0,0 +1,25 @@
+English | [简体中文](README.zh-CN.md)
+
+# Seata Saga StateMachine Designer
+
+A visual graph Seata Saga StateMachine Designer based on [GGEditor](https://github.com/alibaba/GGEditor).
+
+## run
+
+```sh
+$ git clone https://github.com/seata/seata.git
+$ cd saga/saga-statemachine-designer
+$ npm install
+$ npm start
+```
+
+## build a package
+```sh
+$ cd saga/saga-statemachine-designer
+$ npm build
+```
+
+copy 'index.html' and 'dist' directory to static html directory of web server
+
+## Usage
+To understand the state types of the state machine, please see [document of Saga](http://seata.io/zh-cn/docs/user/saga.html). After using the designer to complete the design of the state machine, you can click the 'Json View' button on the toolbar to switch to the Json view, and save the Json to the project of your own application. Although the Json generated by the designer is different from the standard Json of the Saga state machine (because the json generated by the designer has layout information), the state machine can be directly loaded and it will be converted into the Json of the Saga state machine standard.
\ No newline at end of file
diff --git a/saga/seata-saga-statemachine-designer/README.zh-CN.md b/saga/seata-saga-statemachine-designer/README.zh-CN.md
new file mode 100644
index 0000000000000000000000000000000000000000..355a33cd3e5275598d74527bf907e2bd785f6514
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/README.zh-CN.md
@@ -0,0 +1,25 @@
+[English](README.md) | 简体中文
+
+# Seata Saga StateMachine Designer
+
+Seata Saga 状态机可视化图形设计器, 基于 [GGEditor](https://github.com/alibaba/GGEditor)
+
+## 运行
+
+```sh
+$ git clone https://github.com/seata/seata.git
+$ cd saga/saga-statemachine-designer
+$ npm install
+$ npm start
+```
+
+## 打包
+```sh
+$ cd saga/saga-statemachine-designer
+$ npm build
+```
+
+然后将index.html和dist目录拷贝到web server的静态页面目录下
+
+## 使用
+了解状态机的种状态类型，请看Saga的[文档](http://seata.io/zh-cn/docs/user/saga.html)。 通过设计器完成设计后可以点击工具栏的'Json View'按钮切换到Json视图，将Json拷贝保存到自己应用的工程里。虽然设计器生成的Json与Saga标准的Json有所差别（因为设计器生成的json带有布局信息），但状态机可以直接加载，它会将其转化成Saga状态机标准的Json。
\ No newline at end of file
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/common/Global.js b/saga/seata-saga-statemachine-designer/ggeditor/common/Global.js
new file mode 100644
index 0000000000000000000000000000000000000000..ea2b9e2777d0b1409e35832f8875cf9d1278c9e9
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/common/Global.js
@@ -0,0 +1,13 @@
+const global = {
+ trackable: process.env.NODE_ENV === 'production',
+ version: process.env.GG_EDITOR_VERSION,
+};
+
+export default {
+ get(key) {
+ return global[key];
+ },
+ set(key, value) {
+ global[key] = value;
+ },
+};
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/common/constants.js b/saga/seata-saga-statemachine-designer/ggeditor/common/constants.js
new file mode 100644
index 0000000000000000000000000000000000000000..6938e60ffd81ad5bfb9b9030f9e1e4f519bf3932
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/common/constants.js
@@ -0,0 +1,72 @@
+export const FLOW_CONTAINER = 'J_FlowContainer';
+export const MIND_CONTAINER = 'J_MindContainer';
+export const KONI_CONTAINER = 'J_KoniContainer';
+export const TOOLBAR_CONTAINER = 'J_ToolbarContainer';
+export const MINIMAP_CONTAINER = 'J_MinimapContainer';
+export const CONTEXT_MENU_CONTAINER = 'J_ContextMenuContainer';
+
+export const FLOW_CLASS_NAME = 'Flow';
+export const MIND_CLASS_NAME = 'Mind';
+export const KONI_CLASS_NAME = 'Koni';
+
+export const EVENT_BEFORE_ADD_PAGE = 'beforeAddPage';
+export const EVENT_AFTER_ADD_PAGE = 'afterAddPage';
+
+export const STATUS_CANVAS_SELECTED = 'canvas-selected';
+export const STATUS_NODE_SELECTED = 'node-selected';
+export const STATUS_EDGE_SELECTED = 'edge-selected';
+export const STATUS_GROUP_SELECTED = 'group-selected';
+export const STATUS_MULTI_SELECTED = 'multi-selected';
+
+export const GRAPH_MOUSE_REACT_EVENTS = {
+ click: 'Click',
+ contextmenu: 'ContextMenu',
+ dblclick: 'DoubleClick',
+ drag: 'Drag',
+ dragend: 'DragEnd',
+ dragenter: 'DragEnter',
+ dragleave: 'DragLeave',
+ dragstart: 'DragStart',
+ drop: 'Drop',
+ mousedown: 'MouseDown',
+ mouseenter: 'MouseEnter',
+ mouseleave: 'MouseLeave',
+ mousemove: 'MouseMove',
+ mouseup: 'MouseUp',
+};
+
+export const GRAPH_OTHER_REACT_EVENTS = {
+ afterchange: 'onAfterChange',
+ afterchangesize: 'onAfterChangeSize',
+ afterviewportchange: 'onAfterViewportChange',
+ beforechange: 'onBeforeChange',
+ beforechangesize: 'onBeforeChangeSize',
+ beforeviewportchange: 'onBeforeViewportChange',
+ keydown: 'onKeyDown',
+ keyup: 'onKeyUp',
+ mousewheel: 'onMouseWheel',
+};
+
+export const PAGE_REACT_EVENTS = {
+ afteritemactived: 'onAfterItemActived',
+ afteriteminactivated: 'onAfterItemInactivated',
+ afteritemselected: 'onAfterItemSelected',
+ afteritemunactived: 'onAfterItemInactivated',
+ afteritemunselected: 'onAfterItemUnselected',
+ beforeitemactived: 'onBeforeItemActived',
+ beforeiteminactivated: 'onBeforeItemInactivated',
+ beforeitemselected: 'onBeforeItemSelected',
+ beforeitemunactived: 'onBeforeItemInactivated',
+ beforeitemunselected: 'onBeforeItemUnselected',
+ keyUpEditLabel: 'onKeyUpEditLabel',
+};
+
+export const EDITOR_REACT_EVENTS = {
+ aftercommandexecute: 'onAfterCommandExecute',
+ beforecommandexecute: 'onBeforeCommandExecute',
+};
+
+export const GRAPH_MOUSE_EVENTS = Object.keys(GRAPH_MOUSE_REACT_EVENTS);
+export const GRAPH_OTHER_EVENTS = Object.keys(GRAPH_OTHER_REACT_EVENTS);
+export const PAGE_EVENTS = Object.keys(PAGE_REACT_EVENTS);
+export const EDITOR_EVENTS = Object.keys(EDITOR_REACT_EVENTS);
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/common/context/GGEditorContext/index.js b/saga/seata-saga-statemachine-designer/ggeditor/common/context/GGEditorContext/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..166e08b4acd8e0a2cbc40344af4539c5e643612a
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/common/context/GGEditorContext/index.js
@@ -0,0 +1,3 @@
+import React from 'react';
+
+export default React.createContext({});
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/common/context/GGEditorContext/withGGEditorContext.js b/saga/seata-saga-statemachine-designer/ggeditor/common/context/GGEditorContext/withGGEditorContext.js
new file mode 100644
index 0000000000000000000000000000000000000000..3bfeb75467deb632d31a645b0939748755081850
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/common/context/GGEditorContext/withGGEditorContext.js
@@ -0,0 +1,18 @@
+import React from 'react';
+import GGEditorContext from '@common/context/GGEditorContext';
+
+export default function (WrappedComponent) {
+ class InjectGGEditorContext extends React.Component {
+ render() {
+ const { forwardRef, ...rest } = this.props;
+
+ return (
+ <GGEditorContext.Consumer>
+ {context => <WrappedComponent ref={forwardRef} {...rest} {...context} />}
+ </GGEditorContext.Consumer>
+ );
+ }
+ }
+
+ return React.forwardRef((props, ref) => <InjectGGEditorContext {...props} forwardRef={ref} />);
+}
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/common/context/PropsAPIContext/index.js b/saga/seata-saga-statemachine-designer/ggeditor/common/context/PropsAPIContext/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..166e08b4acd8e0a2cbc40344af4539c5e643612a
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/common/context/PropsAPIContext/index.js
@@ -0,0 +1,3 @@
+import React from 'react';
+
+export default React.createContext({});
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/common/context/PropsAPIContext/propsAPI.js b/saga/seata-saga-statemachine-designer/ggeditor/common/context/PropsAPIContext/propsAPI.js
new file mode 100644
index 0000000000000000000000000000000000000000..003e66d5df88d02e4fad52d672d3830f64c41a1d
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/common/context/PropsAPIContext/propsAPI.js
@@ -0,0 +1,21 @@
+class PropsAPI {
+ editor = null;
+
+ constructor(editor) {
+ this.editor = editor;
+
+ ['executeCommand'].forEach((key) => {
+ this[key] = (...params) => this.editor[key](...params);
+ });
+
+ ['read', 'save', 'add', 'find', 'update', 'remove', 'getSelected'].forEach((key) => {
+ this[key] = (...params) => this.currentPage[key](...params);
+ });
+ }
+
+ get currentPage() {
+ return this.editor.getCurrentPage();
+ }
+}
+
+export default PropsAPI;
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/common/context/PropsAPIContext/withPropsAPI.js b/saga/seata-saga-statemachine-designer/ggeditor/common/context/PropsAPIContext/withPropsAPI.js
new file mode 100644
index 0000000000000000000000000000000000000000..5ba22b75687377b4a821aed36e3869cb462ca6ca
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/common/context/PropsAPIContext/withPropsAPI.js
@@ -0,0 +1,18 @@
+import React from 'react';
+import PropsAPIContext from '@common/context/PropsAPIContext';
+
+export default function (WrappedComponent) {
+ class InjectPropsAPI extends React.Component {
+ render() {
+ const { forwardRef, ...rest } = this.props;
+
+ return (
+ <PropsAPIContext.Consumer>
+ {propsAPI => <WrappedComponent ref={forwardRef} {...rest} propsAPI={propsAPI} />}
+ </PropsAPIContext.Consumer>
+ );
+ }
+ }
+
+ return React.forwardRef((props, ref) => <InjectPropsAPI {...props} forwardRef={ref} />);
+}
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/Base/Editor.js b/saga/seata-saga-statemachine-designer/ggeditor/components/Base/Editor.js
new file mode 100644
index 0000000000000000000000000000000000000000..579dfe780ec27495c0c71de1678a905bc014a205
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/Base/Editor.js
@@ -0,0 +1,16 @@
+import GGEditorCore from 'gg-editor-core';
+import { EVENT_BEFORE_ADD_PAGE } from '@common/constants';
+import track from '@helpers/track';
+import { uniqueId } from '@utils';
+
+export default class Editor extends GGEditorCore {
+ constructor(options) {
+ super(options);
+
+ this.id = uniqueId();
+
+ this.on(EVENT_BEFORE_ADD_PAGE, ({ className }) => {
+ track({ c1: className });
+ });
+ }
+}
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/Command/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/Command/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..d32fc7064c99975f15bf69495c4cbc5a51017021
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/Command/index.js
@@ -0,0 +1,15 @@
+import React from 'react';
+
+class Command extends React.Component {
+ render() {
+ const { name, children } = this.props;
+
+ return (
+ <div className="command" data-command={name}>
+ {children}
+ </div>
+ );
+ }
+}
+
+export default Command;
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/ContextMenu/Menu.js b/saga/seata-saga-statemachine-designer/ggeditor/components/ContextMenu/Menu.js
new file mode 100644
index 0000000000000000000000000000000000000000..fb779126739b746ccc2906053a1d7b6f7acda9a6
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/ContextMenu/Menu.js
@@ -0,0 +1,30 @@
+import React from 'react';
+
+class Menu extends React.Component {
+ static create = function (type) {
+ return class TypedMenu extends Menu {
+ constructor(props) {
+ super(props, type);
+ }
+ };
+ }
+
+ constructor(props, type) {
+ super(props);
+
+ this.type = type;
+ }
+
+ render() {
+ const { children } = this.props;
+ const { type } = this;
+
+ return (
+ <div className="menu" data-status={`${type}-selected`}>
+ {children}
+ </div>
+ );
+ }
+}
+
+export default Menu;
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/ContextMenu/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/ContextMenu/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..21292df13e2d14e2ecc18ad2018a212b30b068e8
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/ContextMenu/index.js
@@ -0,0 +1,44 @@
+import React from 'react';
+import { pick } from '@utils';
+import Editor from '@components/Base/Editor';
+import { CONTEXT_MENU_CONTAINER } from '@common/constants';
+import withGGEditorContext from '@common/context/GGEditorContext/withGGEditorContext';
+import Menu from './Menu';
+
+class ContextMenu extends React.Component {
+ contextMenu = null;
+
+ get containerId() {
+ const { editor } = this.props;
+
+ return `${CONTEXT_MENU_CONTAINER}_${editor.id}`;
+ }
+
+ componentDidMount() {
+ const { editor } = this.props;
+
+ this.contextMenu = new Editor.Contextmenu({
+ container: this.containerId,
+ });
+
+ editor.add(this.contextMenu);
+ }
+
+ render() {
+ const { children } = this.props;
+
+ return (
+ <div id={this.containerId} {...pick(this.props, ['style', 'className'])}>
+ {children}
+ </div>
+ );
+ }
+}
+
+export const NodeMenu = Menu.create('node');
+export const EdgeMenu = Menu.create('edge');
+export const GroupMenu = Menu.create('group');
+export const MultiMenu = Menu.create('multi');
+export const CanvasMenu = Menu.create('canvas');
+
+export default withGGEditorContext(ContextMenu);
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/DetailPanel/Panel.js b/saga/seata-saga-statemachine-designer/ggeditor/components/DetailPanel/Panel.js
new file mode 100644
index 0000000000000000000000000000000000000000..32bdd1e891cca416cb64d996da797f71be6d7702
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/DetailPanel/Panel.js
@@ -0,0 +1,35 @@
+import React from 'react';
+import { pick } from '@utils';
+
+class Panel extends React.Component {
+ static create = function (type) {
+ return class TypedPanel extends Panel {
+ constructor(props) {
+ super(props, type);
+ }
+ };
+ }
+
+ constructor(props, type) {
+ super(props);
+
+ this.type = type;
+ }
+
+ render() {
+ const { status, children } = this.props;
+ const { type } = this;
+
+ if (`${type}-selected` !== status) {
+ return null;
+ }
+
+ return (
+ <div {...pick(this.props, ['style', 'className'])}>
+ {children}
+ </div>
+ );
+ }
+}
+
+export default Panel;
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/DetailPanel/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/DetailPanel/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..64ccb8c00730ee54d95f0379f05ce39512eadfff
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/DetailPanel/index.js
@@ -0,0 +1,58 @@
+import React from 'react';
+import { pick } from '@utils';
+import { STATUS_CANVAS_SELECTED } from '@common/constants';
+import withGGEditorContext from '@common/context/GGEditorContext/withGGEditorContext';
+import Panel from './Panel';
+
+class DetailPanel extends React.Component {
+ state = {
+ status: '',
+ }
+
+ constructor(props) {
+ super(props);
+
+ this.bindEvent();
+ }
+
+ bindEvent() {
+ const { onAfterAddPage } = this.props;
+
+ onAfterAddPage(({ page }) => {
+ this.setState({
+ status: STATUS_CANVAS_SELECTED,
+ });
+
+ page.on('statuschange', ({ status }) => {
+ this.setState({ status });
+ });
+ });
+ }
+
+ render() {
+ const { children } = this.props;
+ const { status } = this.state;
+
+ if (!status) {
+ return null;
+ }
+
+ return (
+ <div {...pick(this.props, ['style', 'className'])}>
+ {
+ React.Children.toArray(children).map(child => React.cloneElement(child, {
+ status,
+ }))
+ }
+ </div>
+ );
+ }
+}
+
+export const NodePanel = Panel.create('node');
+export const EdgePanel = Panel.create('edge');
+export const GroupPanel = Panel.create('group');
+export const MultiPanel = Panel.create('multi');
+export const CanvasPanel = Panel.create('canvas');
+
+export default withGGEditorContext(DetailPanel);
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/Flow/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/Flow/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..6995622c41cbbfa33c3ec3b8807eb41030ea002c
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/Flow/index.js
@@ -0,0 +1,38 @@
+import Editor from '@components/Base/Editor';
+import {
+ FLOW_CONTAINER,
+ FLOW_CLASS_NAME,
+ EVENT_BEFORE_ADD_PAGE,
+ EVENT_AFTER_ADD_PAGE,
+} from '@common/constants';
+import Page from '@components/Page';
+import withGGEditorContext from '@common/context/GGEditorContext/withGGEditorContext';
+
+class Flow extends Page {
+ static defaultProps = {
+ data: {
+ nodes: [],
+ edges: [],
+ },
+ };
+
+ get pageId() {
+ const { editor } = this.props;
+
+ return `${FLOW_CONTAINER}_${editor.id}`;
+ }
+
+ initPage() {
+ const { editor } = this.props;
+
+ editor.emit(EVENT_BEFORE_ADD_PAGE, { className: FLOW_CLASS_NAME });
+
+ this.page = new Editor.Flow(this.config);
+
+ editor.add(this.page);
+
+ editor.emit(EVENT_AFTER_ADD_PAGE, { page: this.page });
+ }
+}
+
+export default withGGEditorContext(Flow);
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/GGEditor/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/GGEditor/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..13bf61048bbb50d3624cea720d312d49d6a3ea75
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/GGEditor/index.js
@@ -0,0 +1,85 @@
+import React from 'react';
+import Editor from '@components/Base/Editor';
+import {
+ EDITOR_EVENTS,
+ EDITOR_REACT_EVENTS,
+ EVENT_BEFORE_ADD_PAGE,
+ EVENT_AFTER_ADD_PAGE,
+} from '@common/constants';
+import { pick } from '@utils';
+import Global from '@common/Global';
+import GGEditorContext from '@common/context/GGEditorContext';
+import PropsAPIContext from '@common/context/PropsAPIContext';
+import PropsAPI from '@common/context/PropsAPIContext/propsAPI';
+
+class GGEditor extends React.Component {
+ static setTrackable(value) {
+ Global.set('trackable', Boolean(value));
+ }
+
+ editor = null;
+
+ get currentPage() {
+ return this.editor.getCurrentPage();
+ }
+
+ constructor(props) {
+ super(props);
+
+ this.init();
+ this.bindEvent();
+ }
+
+ addListener = (target, eventName, handler) => {
+ if (typeof handler === 'function') target.on(eventName, handler);
+ };
+
+ handleBeforeAddPage = (func) => {
+ this.editor.on(EVENT_BEFORE_ADD_PAGE, func);
+ };
+
+ handleAfterAddPage = (func) => {
+ const { currentPage: page } = this;
+
+ if (page) {
+ func({ page });
+ return;
+ }
+
+ this.editor.on(EVENT_AFTER_ADD_PAGE, func);
+ };
+
+ init() {
+ this.editor = new Editor();
+ this.ggEditor = {
+ editor: this.editor,
+ onBeforeAddPage: this.handleBeforeAddPage,
+ onAfterAddPage: this.handleAfterAddPage,
+ };
+ this.propsAPI = new PropsAPI(this.editor);
+ }
+
+ bindEvent() {
+ EDITOR_EVENTS.forEach((event) => {
+ this.addListener(this.editor, [event], this.props[EDITOR_REACT_EVENTS[event]]);
+ });
+ }
+
+ componentWillUnmount() {
+ this.editor.destroy();
+ }
+
+ render() {
+ const { children } = this.props;
+
+ return (
+ <GGEditorContext.Provider value={this.ggEditor}>
+ <PropsAPIContext.Provider value={this.propsAPI}>
+ <div {...pick(this.props, ['style', 'className'])}>{children}</div>
+ </PropsAPIContext.Provider>
+ </GGEditorContext.Provider>
+ );
+ }
+}
+
+export default GGEditor;
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/ItemPanel/Item.js b/saga/seata-saga-statemachine-designer/ggeditor/components/ItemPanel/Item.js
new file mode 100644
index 0000000000000000000000000000000000000000..647bfee4ef0c6eb0429c1120a19f912af37e0c99
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/ItemPanel/Item.js
@@ -0,0 +1,43 @@
+import React from 'react';
+import withGGEditorContext from '@common/context/GGEditorContext/withGGEditorContext';
+
+class Item extends React.Component {
+ constructor(props) {
+ super(props);
+
+ this.bindEvent();
+ }
+
+ handleMouseDown = () => {
+ const { type, size, shape, model } = this.props;
+
+ if (this.page) {
+ this.page.beginAdd(type, {
+ type,
+ size,
+ shape,
+ ...model,
+ });
+ }
+ }
+
+ bindEvent() {
+ const { onAfterAddPage } = this.props;
+
+ onAfterAddPage(({ page }) => {
+ this.page = page;
+ });
+ }
+
+ render() {
+ const { src, shape, children } = this.props;
+
+ return (
+ <div style={{ cursor: 'pointer' }} onMouseDown={this.handleMouseDown}>
+ {src ? <img src={src} alt={shape} draggable={false} /> : children}
+ </div>
+ );
+ }
+}
+
+export default withGGEditorContext(Item);
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/ItemPanel/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/ItemPanel/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..6f4344033fd0aea887f5e8a08f0fd4019d55226e
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/ItemPanel/index.js
@@ -0,0 +1,46 @@
+import React from 'react';
+import { pick } from '@utils';
+import withGGEditorContext from '@common/context/GGEditorContext/withGGEditorContext';
+import Item from './Item';
+
+class ItemPanel extends React.Component {
+ page = null;
+
+ constructor(props) {
+ super(props);
+
+ this.bindEvent();
+ }
+
+ handleMouseUp = () => {
+ this.page.cancelAdd();
+ }
+
+ bindEvent() {
+ const { onAfterAddPage } = this.props;
+
+ onAfterAddPage(({ page }) => {
+ this.page = page;
+
+ document.addEventListener('mouseup', this.handleMouseUp);
+ });
+ }
+
+ componentWillUnmount() {
+ document.removeEventListener('mouseup', this.handleMouseUp);
+ }
+
+ render() {
+ const { children } = this.props;
+
+ return (
+ <div id={this.containerId} {...pick(this.props, ['style', 'className'])}>
+ {children}
+ </div>
+ );
+ }
+}
+
+export { Item };
+
+export default withGGEditorContext(ItemPanel);
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/Koni/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/Koni/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..f8dd12b27a8995df09b3779b477944b2b6ed04ed
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/Koni/index.js
@@ -0,0 +1,38 @@
+import Editor from '@components/Base/Editor';
+import {
+ KONI_CONTAINER,
+ KONI_CLASS_NAME,
+ EVENT_BEFORE_ADD_PAGE,
+ EVENT_AFTER_ADD_PAGE,
+} from '@common/constants';
+import Page from '@components/Page';
+import withGGEditorContext from '@common/context/GGEditorContext/withGGEditorContext';
+
+class Koni extends Page {
+ static defaultProps = {
+ data: {
+ nodes: [],
+ edges: [],
+ },
+ };
+
+ get pageId() {
+ const { editor } = this.props;
+
+ return `${KONI_CONTAINER}_${editor.id}`;
+ }
+
+ initPage() {
+ const { editor } = this.props;
+
+ editor.emit(EVENT_BEFORE_ADD_PAGE, { className: KONI_CLASS_NAME });
+
+ this.page = new Editor.Koni(this.config);
+
+ editor.add(this.page);
+
+ editor.emit(EVENT_AFTER_ADD_PAGE, { page: this.page });
+ }
+}
+
+export default withGGEditorContext(Koni);
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/Mind/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/Mind/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..b100b9c29170be0b5b3715b30031832109da7fd9
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/Mind/index.js
@@ -0,0 +1,52 @@
+import Editor from '@components/Base/Editor';
+import {
+ MIND_CONTAINER,
+ MIND_CLASS_NAME,
+ EVENT_BEFORE_ADD_PAGE,
+ EVENT_AFTER_ADD_PAGE,
+} from '@common/constants';
+import Page from '@components/Page';
+import withGGEditorContext from '@common/context/GGEditorContext/withGGEditorContext';
+
+class Mind extends Page {
+ get pageId() {
+ const { editor } = this.props;
+
+ return `${MIND_CONTAINER}_${editor.id}`;
+ }
+
+ initPage() {
+ const { editor } = this.props;
+
+ editor.emit(EVENT_BEFORE_ADD_PAGE, { className: MIND_CLASS_NAME });
+
+ this.page = new Editor.Mind(this.config);
+
+ editor.add(this.page);
+
+ editor.emit(EVENT_AFTER_ADD_PAGE, { page: this.page });
+ }
+
+ bindEvent() {
+ super.bindEvent();
+ this.bindKeyUpEditLabel();
+ }
+
+ bindKeyUpEditLabel() {
+ const editLabel = this.page.get('labelTextArea');
+
+ editLabel.on('keyup', (e) => {
+ e.stopPropagation();
+
+ const item = editLabel.focusItem;
+ const text = editLabel.textContent;
+
+ this.page.emit('keyUpEditLabel', {
+ item,
+ text,
+ });
+ });
+ }
+}
+
+export default withGGEditorContext(Mind);
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/Minimap/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/Minimap/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..29eed621402465e95c8f9653bb52e0b13dd7adfa
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/Minimap/index.js
@@ -0,0 +1,89 @@
+import React from 'react';
+import G6 from '@antv/g6';
+import { pick } from '@utils';
+import { MINIMAP_CONTAINER } from '@common/constants';
+import withGGEditorContext from '@common/context/GGEditorContext/withGGEditorContext';
+
+require('@antv/g6/build/plugin.tool.minimap');
+
+const { Minimap: G6Minimap } = G6.Components;
+
+class Minimap extends React.Component {
+ minimap = null;
+
+ get containerId() {
+ const { editor } = this.props;
+
+ return `${MINIMAP_CONTAINER}_${editor.id}`;
+ }
+
+ get currentPage() {
+ const { editor } = this.props;
+
+ return editor.getCurrentPage();
+ }
+
+ constructor(props) {
+ super(props);
+
+ this.bindEvent();
+ }
+
+ componentDidMount() {
+ this.init();
+ this.bindPage();
+ }
+
+ init() {
+ const {
+ container = this.containerId,
+ width,
+ height,
+ viewportWindowStyle,
+ viewportBackStyle,
+ } = this.props;
+
+ const { clientWidth, clientHeight } = document.getElementById(container);
+
+ this.minimap = new G6Minimap({
+ container,
+ width: width || clientWidth,
+ height: height || clientHeight,
+ viewportWindowStyle,
+ viewportBackStyle,
+ });
+
+ this.minimap.getGraph = () => this.currentPage.getGraph();
+ }
+
+ bindPage() {
+ if (!this.minimap || !this.currentPage) {
+ return;
+ }
+
+ const graph = this.currentPage.getGraph();
+
+ this.minimap.bindGraph(graph);
+ this.minimap.debounceRender();
+ }
+
+ bindEvent() {
+ const { onAfterAddPage } = this.props;
+
+ onAfterAddPage(() => {
+ this.bindPage();
+ });
+ }
+
+ render() {
+ const { container } = this.props;
+
+ if (container) {
+ return null;
+ }
+
+ return <div id={this.containerId} {...pick(this.props, ['style', 'className'])} />;
+ }
+}
+
+export default withGGEditorContext(Minimap);
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/Page/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/Page/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..32077fdb7c4c49aa8e2fadce91ac2b6da349f776
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/Page/index.js
@@ -0,0 +1,112 @@
+import React from 'react';
+import { pick, merge } from '@utils';
+import {
+ GRAPH_MOUSE_EVENTS,
+ GRAPH_OTHER_EVENTS,
+ PAGE_EVENTS,
+ GRAPH_MOUSE_REACT_EVENTS,
+ GRAPH_OTHER_REACT_EVENTS,
+ PAGE_REACT_EVENTS,
+} from '@common/constants';
+
+class Page extends React.Component {
+ page;
+
+ get pageId() {
+ return '';
+ }
+
+ config = {};
+
+ componentDidMount() {
+ this.init();
+ this.bindEvent();
+ this.forceUpdate();
+ }
+
+ shouldComponentUpdate(props) {
+ const { data: newData } = props;
+ const { data: oldData } = this.props;
+ const { mode: newMode } = props.graph || {};
+ const { mode: oldMode } = this.props.graph || {};
+
+ if (newMode !== oldMode) {
+ this.page.changeMode(newMode);
+ }
+
+ if (newData !== oldData) {
+ this.page.read(newData);
+
+ return true;
+ }
+
+ if (props.className !== this.props.className) return true;
+
+ return false;
+ }
+
+ get graph() {
+ return this.page.getGraph();
+ }
+
+ initPage() { }
+
+ readData() {
+ const { data } = this.config;
+
+ if (data) {
+ this.page.read(data);
+ }
+ }
+
+ addListener = (target, eventName, handler) => {
+ if (typeof handler === 'function') target.on(eventName, handler);
+ };
+
+ init() {
+ merge(this.config, this.props, {
+ graph: {
+ container: this.pageId,
+ },
+ });
+
+ this.initPage();
+ this.readData();
+ }
+
+ bindEvent() {
+ const { addListener } = this;
+
+ GRAPH_MOUSE_EVENTS.forEach((event) => {
+ const eventName = GRAPH_MOUSE_REACT_EVENTS[event];
+
+ addListener(this.graph, `${event}`, this.props[`on${eventName}`]);
+ addListener(this.graph, `node:${event}`, this.props[`onNode${eventName}`]);
+ addListener(this.graph, `edge:${event}`, this.props[`onEdge${eventName}`]);
+ addListener(this.graph, `group:${event}`, this.props[`onGroup${eventName}`]);
+ addListener(this.graph, `guide:${event}`, this.props[`onGuide${eventName}`]);
+ addListener(this.graph, `anchor:${event}`, this.props[`onAnchor${eventName}`]);
+ });
+
+ GRAPH_OTHER_EVENTS.forEach((event) => {
+ addListener(this.graph, [event], this.props[GRAPH_OTHER_REACT_EVENTS[event]]);
+ });
+
+ PAGE_EVENTS.forEach((event) => {
+ addListener(this.page, [event], this.props[PAGE_REACT_EVENTS[event]]);
+ });
+ }
+
+ render() {
+ const { page, pageId } = this;
+ const { children } = this.props;
+
+ return (
+ <div id={pageId} {...pick(this.props, ['style', 'className'])}>
+ {page ? children : null}
+ </div>
+ );
+ }
+}
+
+export default Page;
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/Register/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/Register/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..9d4409166e2878d5b95d56e8b07e265c1bdaa9bf
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/Register/index.js
@@ -0,0 +1,57 @@
+import React from 'react';
+import Editor from '@components/Base/Editor';
+import { upperFirst } from '@utils';
+import withGGEditorContext from '@common/context/GGEditorContext/withGGEditorContext';
+
+class Register extends React.Component {
+ static create = function (type) {
+ class TypedRegister extends Register {
+ constructor(props) {
+ super(props, type);
+ }
+ }
+
+ return withGGEditorContext(TypedRegister);
+ }
+
+ constructor(props, type) {
+ super(props);
+
+ this.type = type;
+
+ this.bindEvent();
+ }
+
+ bindEvent() {
+ const { type } = this;
+ const { onBeforeAddPage } = this.props;
+
+ onBeforeAddPage(({ className }) => {
+ let host = Editor[className];
+ let keys = ['name', 'config', 'extend'];
+
+ if (type === 'command') {
+ host = Editor;
+ }
+
+ if (type === 'behaviour') {
+ keys = ['name', 'behaviour', 'dependences'];
+ }
+
+ const args = keys.map(key => this.props[key]);
+
+ host[`register${upperFirst(type)}`](...args);
+ });
+ }
+
+ render() {
+ return null;
+ }
+}
+
+export const RegisterNode = Register.create('node');
+export const RegisterEdge = Register.create('edge');
+export const RegisterGroup = Register.create('group');
+export const RegisterGuide = Register.create('guide');
+export const RegisterCommand = Register.create('command');
+export const RegisterBehaviour = Register.create('behaviour');
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/components/Toolbar/index.js b/saga/seata-saga-statemachine-designer/ggeditor/components/Toolbar/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..a8390af2c2da3e5cb06862d6444e47a34ac31091
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/components/Toolbar/index.js
@@ -0,0 +1,41 @@
+import React from 'react';
+import Editor from '@components/Base/Editor';
+import { pick } from '@utils';
+import { TOOLBAR_CONTAINER } from '@common/constants';
+import withGGEditorContext from '@common/context/GGEditorContext/withGGEditorContext';
+
+class Toolbar extends React.Component {
+ toolbar = null;
+
+ get containerId() {
+ const { editor } = this.props;
+
+ return `${TOOLBAR_CONTAINER}_${editor.id}`;
+ }
+
+ constructor(props) {
+ super(props);
+
+ const { editor, onAfterAddPage } = props;
+
+ onAfterAddPage(() => {
+ this.toolbar = new Editor.Toolbar({
+ container: this.containerId,
+ });
+
+ editor.add(this.toolbar);
+ });
+ }
+
+ render() {
+ const { children } = this.props;
+
+ return (
+ <div id={this.containerId} {...pick(this.props, ['style', 'className'])}>
+ {children}
+ </div>
+ );
+ }
+}
+
+export default withGGEditorContext(Toolbar);
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/helpers/track.js b/saga/seata-saga-statemachine-designer/ggeditor/helpers/track.js
new file mode 100644
index 0000000000000000000000000000000000000000..10d897488863e1ffcadc9d1a252560062179ce54
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/helpers/track.js
@@ -0,0 +1,34 @@
+import Global from '@common/Global';
+import { toQueryString } from '@utils';
+
+const BASE_URL = 'http://gm.mmstat.com/fsp.1.1';
+
+const track = (options) => {
+ const trackable = Global.get('trackable');
+ const version = Global.get('version');
+
+ if (!trackable) {
+ return;
+ }
+
+ const { location, navigator } = window;
+ const image = new Image();
+ const params = toQueryString({
+ pid: 'ggeditor',
+ code: '11',
+ msg: 'syslog',
+ page: `${location.protocol}//${location.host}${location.pathname}`,
+ hash: location.hash,
+ ua: navigator.userAgent,
+ rel: version,
+ ...options,
+ });
+
+ image.src = `${BASE_URL}?${params}`;
+};
+
+export default (options) => {
+ setTimeout(() => {
+ track(options);
+ }, 1000);
+};
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/index.js b/saga/seata-saga-statemachine-designer/ggeditor/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..1c4ed906dd21bb8a4e7884c48bcd2a85a2caf8df
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/index.js
@@ -0,0 +1,63 @@
+import Flow from '@components/Flow';
+import Mind from '@components/Mind';
+import Koni from '@components/Koni';
+import {
+ RegisterNode,
+ RegisterEdge,
+ RegisterGroup,
+ RegisterGuide,
+ RegisterCommand,
+ RegisterBehaviour,
+} from '@components/Register';
+import Command from '@components/Command';
+import Minimap from '@components/Minimap';
+import ContextMenu, {
+ NodeMenu,
+ EdgeMenu,
+ GroupMenu,
+ MultiMenu,
+ CanvasMenu,
+} from '@components/ContextMenu';
+import Toolbar from '@components/Toolbar';
+import ItemPanel, { Item } from '@components/ItemPanel';
+import DetailPanel, {
+ NodePanel,
+ EdgePanel,
+ GroupPanel,
+ MultiPanel,
+ CanvasPanel,
+} from '@components/DetailPanel';
+import withPropsAPI from '@common/context/PropsAPIContext/withPropsAPI';
+import GGEditor from '@components/GGEditor';
+
+export {
+ Flow,
+ Mind,
+ Koni,
+ RegisterNode,
+ RegisterEdge,
+ RegisterGroup,
+ RegisterGuide,
+ RegisterCommand,
+ RegisterBehaviour,
+ Command,
+ Minimap,
+ NodeMenu,
+ EdgeMenu,
+ GroupMenu,
+ MultiMenu,
+ CanvasMenu,
+ ContextMenu,
+ Toolbar,
+ Item,
+ ItemPanel,
+ NodePanel,
+ EdgePanel,
+ GroupPanel,
+ MultiPanel,
+ CanvasPanel,
+ DetailPanel,
+ withPropsAPI,
+};
+
+export default GGEditor;
diff --git a/saga/seata-saga-statemachine-designer/ggeditor/utils/index.js b/saga/seata-saga-statemachine-designer/ggeditor/utils/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..9beea391f6aa7a9f3f7e18452a76c0122a5beba3
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/ggeditor/utils/index.js
@@ -0,0 +1,14 @@
+import merge from 'lodash/merge';
+import pick from 'lodash/pick';
+import uniqueId from 'lodash/uniqueId';
+import upperFirst from 'lodash/upperFirst';
+
+const toQueryString = obj => Object.keys(obj).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(obj[key])}`).join('&');
+
+export {
+ merge,
+ pick,
+ toQueryString,
+ uniqueId,
+ upperFirst,
+};
diff --git a/saga/seata-saga-statemachine-designer/index.html b/saga/seata-saga-statemachine-designer/index.html
new file mode 100644
index 0000000000000000000000000000000000000000..e42c917871b770fe19072de9ac8fb935c04a7acd
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/index.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="zh-CN">
+
+<head>
+ <meta charset="UTF-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta http-equiv="X-UA-Compatible" content="ie=edge">
+ <title>Seata Saga StateMachine Designer</title>
+ <link rel="stylesheet" href="http://g.alicdn.com/code/lib/antd/3.16.1/antd.min.css">
+</head>
+
+<body>
+ <div id="root"></div>
+ <script src="http://g.alicdn.com/code/lib/react/16.8.6/umd/react.production.min.js"></script>
+ <script src="http://g.alicdn.com/code/lib/react-dom/16.8.6/umd/react-dom.production.min.js"></script>
+ <script src="http://g.alicdn.com/code/lib/react-router-dom/5.0.0/react-router-dom.min.js"></script>
+ <script src="http://g.alicdn.com/code/lib/moment.js/2.24.0/moment.min.js"></script>
+ <script src="http://g.alicdn.com/code/lib/antd/3.16.1/antd.min.js"></script>
+ <script src="./dist/bundle.js"></script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/saga/seata-saga-statemachine-designer/package-lock.json b/saga/seata-saga-statemachine-designer/package-lock.json
new file mode 100644
index 0000000000000000000000000000000000000000..d10ae78231120df3cfd7a1a72b0e0ec191e991de
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/package-lock.json
@@ -0,0 +1,9987 @@
+{
+ "name": "gg-editor",
+ "version": "2.0.4",
+ "lockfileVersion": 1,
+ "requires": true,
+ "dependencies": {
+ "@antv/attr": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/@antv/attr/-/attr-0.0.7.tgz",
+ "integrity": "sha512-dgvJ2j6Sn7of8AET9ykTseS8mjwisLcAGf/UCkEaMLCduCr6hQtwAEBIZnEpk0b04QlD5pu0kqV93B1ItnvCPw==",
+ "requires": {
+ "@antv/util": "1.2.5"
+ },
+ "dependencies": {
+ "@antv/util": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/@antv/util/-/util-1.2.5.tgz",
+ "integrity": "sha512-yz1AjXSEjNu9O5kK9pqKq69f/Iliu/IA3XXljUcfrlbUtmUJ0CH1tB5I60vPqfaKaUPhz+/35K+56yqaCsGmqA==",
+ "requires": {
+ "@antv/gl-matrix": "2.7.1"
+ }
+ }
+ }
+ },
+ "@antv/component": {
+ "version": "0.0.9",
+ "resolved": "https://registry.npmjs.org/@antv/component/-/component-0.0.9.tgz",
+ "integrity": "sha512-AcI6oG0Ot9svKieA3AowQuGmwsIjQpC2XJv71FRua/3b0IaWnF3K93vyJnmsWej+CQnXPE68JZaIjdgtAcgTwg==",
+ "requires": {
+ "@antv/attr": "0.0.7",
+ "@antv/g": "3.2.2",
+ "@antv/util": "1.2.5",
+ "wolfy87-eventemitter": "5.1.0"
+ },
+ "dependencies": {
+ "@antv/g": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/@antv/g/-/g-3.2.2.tgz",
+ "integrity": "sha512-mBuFnoWS6zIRy+MhpGDJxq1tHJj0o1mp0ifWPRiIFO3rlZLcNHf0D/Ww+UoC5+d8GZTz+6JqIzmxCZ3EZ4LmdQ==",
+ "requires": {
+ "@antv/gl-matrix": "2.7.1",
+ "@antv/util": "1.2.5",
+ "d3-ease": "1.0.6",
+ "d3-interpolate": "1.1.6",
+ "d3-timer": "1.0.10",
+ "wolfy87-eventemitter": "5.1.0"
+ }
+ },
+ "@antv/util": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/@antv/util/-/util-1.2.5.tgz",
+ "integrity": "sha512-yz1AjXSEjNu9O5kK9pqKq69f/Iliu/IA3XXljUcfrlbUtmUJ0CH1tB5I60vPqfaKaUPhz+/35K+56yqaCsGmqA==",
+ "requires": {
+ "@antv/gl-matrix": "2.7.1"
+ }
+ },
+ "wolfy87-eventemitter": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.1.0.tgz",
+ "integrity": "sha1-NcGsDdGsDBXjXZgVCPwiCEoToBE="
+ }
+ }
+ },
+ "@antv/g": {
+ "version": "3.4.6",
+ "resolved": "https://registry.npmjs.org/@antv/g/-/g-3.4.6.tgz",
+ "integrity": "sha512-S7eXmMZSZmIbm+9E5zMHLtpDDa9JmfUmm7GJg1zXg2Ow8F8i3ekTZsYkgk8TA2ZPTGWfcmkSTifyqctZmdmqFw==",
+ "requires": {
+ "@antv/gl-matrix": "2.7.1",
+ "@antv/util": "1.3.1",
+ "d3-ease": "1.0.6",
+ "d3-interpolate": "1.1.6",
+ "d3-timer": "1.0.10"
+ }
+ },
+ "@antv/g6": {
+ "version": "2.2.6",
+ "resolved": "https://registry.npmjs.org/@antv/g6/-/g6-2.2.6.tgz",
+ "integrity": "sha512-xxuXYjxw7o97PRo94e3pXHbsdHYdd+oKzy20ig91F61Bb7ddlHZg0I6ReU+skfS83cffqozgS+eZ9GWAUkS9UQ==",
+ "requires": {
+ "@antv/component": "0.0.9",
+ "@antv/g": "3.4.6",
+ "@antv/hierarchy": "0.3.15",
+ "@antv/scale": "0.0.1",
+ "@antv/util": "1.3.1",
+ "d3": "5.14.2",
+ "d3-sankey": "0.7.1",
+ "d3-svg-legend": "2.25.6",
+ "dagre": "0.8.4",
+ "dom-to-image": "2.6.0",
+ "lodash": "4.17.15",
+ "wolfy87-eventemitter": "5.2.8"
+ }
+ },
+ "@antv/gl-matrix": {
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/@antv/gl-matrix/-/gl-matrix-2.7.1.tgz",
+ "integrity": "sha512-oOWcVNlpELIKi9x+Mm1Vwbz8pXfkbJKykoCIOJ/dNK79hSIANbpXJ5d3Rra9/wZqK6MC961B7sybFhPlLraT3Q=="
+ },
+ "@antv/hierarchy": {
+ "version": "0.3.15",
+ "resolved": "https://registry.npmjs.org/@antv/hierarchy/-/hierarchy-0.3.15.tgz",
+ "integrity": "sha512-TxgrQrNayVLgimfbWti+QIMVEEt+Pc8dodMC4ypMSAsJ6Yj8JXmcibgego7j7dFRqnlzyUdaiNCQUMBgl2cQvQ==",
+ "requires": {
+ "@antv/util": "1.3.1"
+ }
+ },
+ "@antv/scale": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/@antv/scale/-/scale-0.0.1.tgz",
+ "integrity": "sha512-SZ5nRe57tYq1dOJLPwwc+8iQFeHXXMTq3Me9UKYmnSvy9uh0GMoe0OwqkwJuFDsGJjJ4iyM/JNuvb0mwCC+Nhw==",
+ "requires": {
+ "@antv/util": "1.0.12",
+ "fecha": "2.3.3"
+ },
+ "dependencies": {
+ "@antv/util": {
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/@antv/util/-/util-1.0.12.tgz",
+ "integrity": "sha512-lRQ98e4g6qHgZ78ak5HJq6tCQRfofcdIi5H7mXIubp2mpfQHaez2eMKxmPAvHTyD3At74gNP8qjFdzHsPcXsXA=="
+ }
+ }
+ },
+ "@antv/util": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/@antv/util/-/util-1.3.1.tgz",
+ "integrity": "sha512-cbUta0hIJrKEaW3eKoGarz3Ita+9qUPF2YzTj8A6wds/nNiy20G26ztIWHU+5ThLc13B1n5Ik52LbaCaeg9enA==",
+ "requires": {
+ "@antv/gl-matrix": "2.7.1"
+ }
+ },
+ "@babel/cli": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.7.0.tgz",
+ "integrity": "sha512-jECEqAq6Ngf3pOhLSg7od9WKyrIacyh1oNNYtRXNn+ummSHCTXBamGywOAtiae34Vk7zKuQNnLvo2BKTMCoV4A==",
+ "dev": true,
+ "requires": {
+ "chokidar": "2.1.8",
+ "commander": "2.20.3",
+ "convert-source-map": "1.7.0",
+ "fs-readdir-recursive": "1.1.0",
+ "glob": "7.1.6",
+ "lodash": "4.17.15",
+ "make-dir": "2.1.0",
+ "slash": "2.0.0",
+ "source-map": "0.5.7"
+ }
+ },
+ "@babel/code-frame": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+ "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+ "dev": true,
+ "requires": {
+ "@babel/highlight": "7.5.0"
+ }
+ },
+ "@babel/core": {
+ "version": "7.7.2",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.7.2.tgz",
+ "integrity": "sha512-eeD7VEZKfhK1KUXGiyPFettgF3m513f8FoBSWiQ1xTvl1RAopLs42Wp9+Ze911I6H0N9lNqJMDgoZT7gHsipeQ==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "7.5.5",
+ "@babel/generator": "7.7.2",
+ "@babel/helpers": "7.7.0",
+ "@babel/parser": "7.7.3",
+ "@babel/template": "7.7.0",
+ "@babel/traverse": "7.7.2",
+ "@babel/types": "7.7.2",
+ "convert-source-map": "1.7.0",
+ "debug": "4.1.1",
+ "json5": "2.1.1",
+ "lodash": "4.17.15",
+ "resolve": "1.12.0",
+ "semver": "5.7.1",
+ "source-map": "0.5.7"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/generator": {
+ "version": "7.7.2",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.7.2.tgz",
+ "integrity": "sha512-WthSArvAjYLz4TcbKOi88me+KmDJdKSlfwwN8CnUYn9jBkzhq0ZEPuBfkAWIvjJ3AdEV1Cf/+eSQTnp3IDJKlQ==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.7.2",
+ "jsesc": "2.5.2",
+ "lodash": "4.17.15",
+ "source-map": "0.5.7"
+ }
+ },
+ "@babel/helper-annotate-as-pure": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.7.0.tgz",
+ "integrity": "sha512-k50CQxMlYTYo+GGyUGFwpxKVtxVJi9yh61sXZji3zYHccK9RYliZGSTOgci85T+r+0VFN2nWbGM04PIqwfrpMg==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-builder-binary-assignment-operator-visitor": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.7.0.tgz",
+ "integrity": "sha512-Cd8r8zs4RKDwMG/92lpZcnn5WPQ3LAMQbCw42oqUh4s7vsSN5ANUZjMel0OOnxDLq57hoDDbai+ryygYfCTOsw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-explode-assignable-expression": "7.7.0",
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-builder-react-jsx": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.7.0.tgz",
+ "integrity": "sha512-LSln3cexwInTMYYoFeVLKnYPPMfWNJ8PubTBs3hkh7wCu9iBaqq1OOyW+xGmEdLxT1nhsl+9SJ+h2oUDYz0l2A==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.7.2",
+ "esutils": "2.0.3"
+ }
+ },
+ "@babel/helper-call-delegate": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.7.0.tgz",
+ "integrity": "sha512-Su0Mdq7uSSWGZayGMMQ+z6lnL00mMCnGAbO/R0ZO9odIdB/WNU/VfQKqMQU0fdIsxQYbRjDM4BixIa93SQIpvw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-hoist-variables": "7.7.0",
+ "@babel/traverse": "7.7.2",
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-create-class-features-plugin": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.7.0.tgz",
+ "integrity": "sha512-MZiB5qvTWoyiFOgootmRSDV1udjIqJW/8lmxgzKq6oDqxdmHUjeP2ZUOmgHdYjmUVNABqRrHjYAYRvj8Eox/UA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-function-name": "7.7.0",
+ "@babel/helper-member-expression-to-functions": "7.7.0",
+ "@babel/helper-optimise-call-expression": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/helper-replace-supers": "7.7.0",
+ "@babel/helper-split-export-declaration": "7.7.0"
+ }
+ },
+ "@babel/helper-create-regexp-features-plugin": {
+ "version": "7.7.2",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.7.2.tgz",
+ "integrity": "sha512-pAil/ZixjTlrzNpjx+l/C/wJk002Wo7XbbZ8oujH/AoJ3Juv0iN/UTcPUHXKMFLqsfS0Hy6Aow8M31brUYBlQQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-regex": "7.5.5",
+ "regexpu-core": "4.6.0"
+ }
+ },
+ "@babel/helper-define-map": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-define-map/-/helper-define-map-7.7.0.tgz",
+ "integrity": "sha512-kPKWPb0dMpZi+ov1hJiwse9dWweZsz3V9rP4KdytnX1E7z3cTNmFGglwklzFPuqIcHLIY3bgKSs4vkwXXdflQA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-function-name": "7.7.0",
+ "@babel/types": "7.7.2",
+ "lodash": "4.17.15"
+ }
+ },
+ "@babel/helper-explode-assignable-expression": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.7.0.tgz",
+ "integrity": "sha512-CDs26w2shdD1urNUAji2RJXyBFCaR+iBEGnFz3l7maizMkQe3saVw9WtjG1tz8CwbjvlFnaSLVhgnu1SWaherg==",
+ "dev": true,
+ "requires": {
+ "@babel/traverse": "7.7.2",
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-function-name": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.7.0.tgz",
+ "integrity": "sha512-tDsJgMUAP00Ugv8O2aGEua5I2apkaQO7lBGUq1ocwN3G23JE5Dcq0uh3GvFTChPa4b40AWiAsLvCZOA2rdnQ7Q==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-get-function-arity": "7.7.0",
+ "@babel/template": "7.7.0",
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-get-function-arity": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.7.0.tgz",
+ "integrity": "sha512-tLdojOTz4vWcEnHWHCuPN5P85JLZWbm5Fx5ZsMEMPhF3Uoe3O7awrbM2nQ04bDOUToH/2tH/ezKEOR8zEYzqyw==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-hoist-variables": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.7.0.tgz",
+ "integrity": "sha512-LUe/92NqsDAkJjjCEWkNe+/PcpnisvnqdlRe19FahVapa4jndeuJ+FBiTX1rcAKWKcJGE+C3Q3tuEuxkSmCEiQ==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-member-expression-to-functions": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.7.0.tgz",
+ "integrity": "sha512-QaCZLO2RtBcmvO/ekOLp8p7R5X2JriKRizeDpm5ChATAFWrrYDcDxPuCIBXKyBjY+i1vYSdcUTMIb8psfxHDPA==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-module-imports": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.7.0.tgz",
+ "integrity": "sha512-Dv3hLKIC1jyfTkClvyEkYP2OlkzNvWs5+Q8WgPbxM5LMeorons7iPP91JM+DU7tRbhqA1ZeooPaMFvQrn23RHw==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-module-transforms": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.7.0.tgz",
+ "integrity": "sha512-rXEefBuheUYQyX4WjV19tuknrJFwyKw0HgzRwbkyTbB+Dshlq7eqkWbyjzToLrMZk/5wKVKdWFluiAsVkHXvuQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-module-imports": "7.7.0",
+ "@babel/helper-simple-access": "7.7.0",
+ "@babel/helper-split-export-declaration": "7.7.0",
+ "@babel/template": "7.7.0",
+ "@babel/types": "7.7.2",
+ "lodash": "4.17.15"
+ }
+ },
+ "@babel/helper-optimise-call-expression": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.7.0.tgz",
+ "integrity": "sha512-48TeqmbazjNU/65niiiJIJRc5JozB8acui1OS7bSd6PgxfuovWsvjfWSzlgx+gPFdVveNzUdpdIg5l56Pl5jqg==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-plugin-utils": {
+ "version": "7.0.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.0.0.tgz",
+ "integrity": "sha512-CYAOUCARwExnEixLdB6sDm2dIJ/YgEAKDM1MOeMeZu9Ld/bDgVo8aiWrXwcY7OBh+1Ea2uUcVRcxKk0GJvW7QA==",
+ "dev": true
+ },
+ "@babel/helper-regex": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/helper-regex/-/helper-regex-7.5.5.tgz",
+ "integrity": "sha512-CkCYQLkfkiugbRDO8eZn6lRuR8kzZoGXCg3149iTk5se7g6qykSpy3+hELSwquhu+TgHn8nkLiBwHvNX8Hofcw==",
+ "dev": true,
+ "requires": {
+ "lodash": "4.17.15"
+ }
+ },
+ "@babel/helper-remap-async-to-generator": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.7.0.tgz",
+ "integrity": "sha512-pHx7RN8X0UNHPB/fnuDnRXVZ316ZigkO8y8D835JlZ2SSdFKb6yH9MIYRU4fy/KPe5sPHDFOPvf8QLdbAGGiyw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-annotate-as-pure": "7.7.0",
+ "@babel/helper-wrap-function": "7.7.0",
+ "@babel/template": "7.7.0",
+ "@babel/traverse": "7.7.2",
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-replace-supers": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.7.0.tgz",
+ "integrity": "sha512-5ALYEul5V8xNdxEeWvRsBzLMxQksT7MaStpxjJf9KsnLxpAKBtfw5NeMKZJSYDa0lKdOcy0g+JT/f5mPSulUgg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-member-expression-to-functions": "7.7.0",
+ "@babel/helper-optimise-call-expression": "7.7.0",
+ "@babel/traverse": "7.7.2",
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-simple-access": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.7.0.tgz",
+ "integrity": "sha512-AJ7IZD7Eem3zZRuj5JtzFAptBw7pMlS3y8Qv09vaBWoFsle0d1kAn5Wq6Q9MyBXITPOKnxwkZKoAm4bopmv26g==",
+ "dev": true,
+ "requires": {
+ "@babel/template": "7.7.0",
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-split-export-declaration": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.7.0.tgz",
+ "integrity": "sha512-HgYSI8rH08neWlAH3CcdkFg9qX9YsZysZI5GD8LjhQib/mM0jGOZOVkoUiiV2Hu978fRtjtsGsW6w0pKHUWtqA==",
+ "dev": true,
+ "requires": {
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helper-wrap-function": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.7.0.tgz",
+ "integrity": "sha512-sd4QjeMgQqzshSjecZjOp8uKfUtnpmCyQhKQrVJBBgeHAB/0FPi33h3AbVlVp07qQtMD4QgYSzaMI7VwncNK/w==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-function-name": "7.7.0",
+ "@babel/template": "7.7.0",
+ "@babel/traverse": "7.7.2",
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/helpers": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.7.0.tgz",
+ "integrity": "sha512-VnNwL4YOhbejHb7x/b5F39Zdg5vIQpUUNzJwx0ww1EcVRt41bbGRZWhAURrfY32T5zTT3qwNOQFWpn+P0i0a2g==",
+ "dev": true,
+ "requires": {
+ "@babel/template": "7.7.0",
+ "@babel/traverse": "7.7.2",
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/highlight": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+ "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.2",
+ "esutils": "2.0.3",
+ "js-tokens": "4.0.0"
+ }
+ },
+ "@babel/parser": {
+ "version": "7.7.3",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.7.3.tgz",
+ "integrity": "sha512-bqv+iCo9i+uLVbI0ILzKkvMorqxouI+GbV13ivcARXn9NNEabi2IEz912IgNpT/60BNXac5dgcfjb94NjsF33A==",
+ "dev": true
+ },
+ "@babel/plugin-proposal-async-generator-functions": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.7.0.tgz",
+ "integrity": "sha512-ot/EZVvf3mXtZq0Pd0+tSOfGWMizqmOohXmNZg6LNFjHOV+wOPv7BvVYh8oPR8LhpIP3ye8nNooKL50YRWxpYA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/helper-remap-async-to-generator": "7.7.0",
+ "@babel/plugin-syntax-async-generators": "7.2.0"
+ }
+ },
+ "@babel/plugin-proposal-class-properties": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.7.0.tgz",
+ "integrity": "sha512-tufDcFA1Vj+eWvwHN+jvMN6QsV5o+vUlytNKrbMiCeDL0F2j92RURzUsUMWE5EJkLyWxjdUslCsMQa9FWth16A==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-create-class-features-plugin": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-proposal-dynamic-import": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.7.0.tgz",
+ "integrity": "sha512-7poL3Xi+QFPC7sGAzEIbXUyYzGJwbc2+gSD0AkiC5k52kH2cqHdqxm5hNFfLW3cRSTcx9bN0Fl7/6zWcLLnKAQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/plugin-syntax-dynamic-import": "7.2.0"
+ }
+ },
+ "@babel/plugin-proposal-json-strings": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.2.0.tgz",
+ "integrity": "sha512-MAFV1CA/YVmYwZG0fBQyXhmj0BHCB5egZHCKWIFVv/XCxAeVGIHfos3SwDck4LvCllENIAg7xMKOG5kH0dzyUg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/plugin-syntax-json-strings": "7.2.0"
+ }
+ },
+ "@babel/plugin-proposal-object-rest-spread": {
+ "version": "7.6.2",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.6.2.tgz",
+ "integrity": "sha512-LDBXlmADCsMZV1Y9OQwMc0MyGZ8Ta/zlD9N67BfQT8uYwkRswiu2hU6nJKrjrt/58aH/vqfQlR/9yId/7A2gWw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/plugin-syntax-object-rest-spread": "7.2.0"
+ }
+ },
+ "@babel/plugin-proposal-optional-catch-binding": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.2.0.tgz",
+ "integrity": "sha512-mgYj3jCcxug6KUcX4OBoOJz3CMrwRfQELPQ5560F70YQUBZB7uac9fqaWamKR1iWUzGiK2t0ygzjTScZnVz75g==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/plugin-syntax-optional-catch-binding": "7.2.0"
+ }
+ },
+ "@babel/plugin-proposal-unicode-property-regex": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.7.0.tgz",
+ "integrity": "sha512-mk34H+hp7kRBWJOOAR0ZMGCydgKMD4iN9TpDRp3IIcbunltxEY89XSimc6WbtSLCDrwcdy/EEw7h5CFCzxTchw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-create-regexp-features-plugin": "7.7.2",
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-syntax-async-generators": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.2.0.tgz",
+ "integrity": "sha512-1ZrIRBv2t0GSlcwVoQ6VgSLpLgiN/FVQUzt9znxo7v2Ov4jJrs8RY8tv0wvDmFN3qIdMKWrmMMW6yZ0G19MfGg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-syntax-dynamic-import": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.2.0.tgz",
+ "integrity": "sha512-mVxuJ0YroI/h/tbFTPGZR8cv6ai+STMKNBq0f8hFxsxWjl94qqhsb+wXbpNMDPU3cfR1TIsVFzU3nXyZMqyK4w==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-syntax-json-strings": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.2.0.tgz",
+ "integrity": "sha512-5UGYnMSLRE1dqqZwug+1LISpA403HzlSfsg6P9VXU6TBjcSHeNlw4DxDx7LgpF+iKZoOG/+uzqoRHTdcUpiZNg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-syntax-jsx": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.2.0.tgz",
+ "integrity": "sha512-VyN4QANJkRW6lDBmENzRszvZf3/4AXaj9YR7GwrWeeN9tEBPuXbmDYVU9bYBN0D70zCWVwUy0HWq2553VCb6Hw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-syntax-object-rest-spread": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.2.0.tgz",
+ "integrity": "sha512-t0JKGgqk2We+9may3t0xDdmneaXmyxq0xieYcKHxIsrJO64n1OiMWNUtc5gQK1PA0NpdCRrtZp4z+IUaKugrSA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-syntax-optional-catch-binding": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.2.0.tgz",
+ "integrity": "sha512-bDe4xKNhb0LI7IvZHiA13kff0KEfaGX/Hv4lMA9+7TEc63hMNvfKo6ZFpXhKuEp+II/q35Gc4NoMeDZyaUbj9w==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-syntax-top-level-await": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.7.0.tgz",
+ "integrity": "sha512-hi8FUNiFIY1fnUI2n1ViB1DR0R4QeK4iHcTlW6aJkrPoTdb8Rf1EMQ6GT3f67DDkYyWgew9DFoOZ6gOoEsdzTA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-arrow-functions": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.2.0.tgz",
+ "integrity": "sha512-ER77Cax1+8/8jCB9fo4Ud161OZzWN5qawi4GusDuRLcDbDG+bIGYY20zb2dfAFdTRGzrfq2xZPvF0R64EHnimg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-async-to-generator": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.7.0.tgz",
+ "integrity": "sha512-vLI2EFLVvRBL3d8roAMqtVY0Bm9C1QzLkdS57hiKrjUBSqsQYrBsMCeOg/0KK7B0eK9V71J5mWcha9yyoI2tZw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-module-imports": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/helper-remap-async-to-generator": "7.7.0"
+ }
+ },
+ "@babel/plugin-transform-block-scoped-functions": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.2.0.tgz",
+ "integrity": "sha512-ntQPR6q1/NKuphly49+QiQiTN0O63uOwjdD6dhIjSWBI5xlrbUFh720TIpzBhpnrLfv2tNH/BXvLIab1+BAI0w==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-block-scoping": {
+ "version": "7.6.3",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.6.3.tgz",
+ "integrity": "sha512-7hvrg75dubcO3ZI2rjYTzUrEuh1E9IyDEhhB6qfcooxhDA33xx2MasuLVgdxzcP6R/lipAC6n9ub9maNW6RKdw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0",
+ "lodash": "4.17.15"
+ }
+ },
+ "@babel/plugin-transform-classes": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.7.0.tgz",
+ "integrity": "sha512-/b3cKIZwGeUesZheU9jNYcwrEA7f/Bo4IdPmvp7oHgvks2majB5BoT5byAql44fiNQYOPzhk2w8DbgfuafkMoA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-annotate-as-pure": "7.7.0",
+ "@babel/helper-define-map": "7.7.0",
+ "@babel/helper-function-name": "7.7.0",
+ "@babel/helper-optimise-call-expression": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/helper-replace-supers": "7.7.0",
+ "@babel/helper-split-export-declaration": "7.7.0",
+ "globals": "11.12.0"
+ }
+ },
+ "@babel/plugin-transform-computed-properties": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.2.0.tgz",
+ "integrity": "sha512-kP/drqTxY6Xt3NNpKiMomfgkNn4o7+vKxK2DDKcBG9sHj51vHqMBGy8wbDS/J4lMxnqs153/T3+DmCEAkC5cpA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-destructuring": {
+ "version": "7.6.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.6.0.tgz",
+ "integrity": "sha512-2bGIS5P1v4+sWTCnKNDZDxbGvEqi0ijeqM/YqHtVGrvG2y0ySgnEEhXErvE9dA0bnIzY9bIzdFK0jFA46ASIIQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-dotall-regex": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.7.0.tgz",
+ "integrity": "sha512-3QQlF7hSBnSuM1hQ0pS3pmAbWLax/uGNCbPBND9y+oJ4Y776jsyujG2k0Sn2Aj2a0QwVOiOFL5QVPA7spjvzSA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-create-regexp-features-plugin": "7.7.2",
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-duplicate-keys": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.5.0.tgz",
+ "integrity": "sha512-igcziksHizyQPlX9gfSjHkE2wmoCH3evvD2qR5w29/Dk0SMKE/eOI7f1HhBdNhR/zxJDqrgpoDTq5YSLH/XMsQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-exponentiation-operator": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.2.0.tgz",
+ "integrity": "sha512-umh4hR6N7mu4Elq9GG8TOu9M0bakvlsREEC+ialrQN6ABS4oDQ69qJv1VtR3uxlKMCQMCvzk7vr17RHKcjx68A==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-builder-binary-assignment-operator-visitor": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-for-of": {
+ "version": "7.4.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.4.4.tgz",
+ "integrity": "sha512-9T/5Dlr14Z9TIEXLXkt8T1DU7F24cbhwhMNUziN3hB1AXoZcdzPcTiKGRn/6iOymDqtTKWnr/BtRKN9JwbKtdQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-function-name": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.7.0.tgz",
+ "integrity": "sha512-P5HKu0d9+CzZxP5jcrWdpe7ZlFDe24bmqP6a6X8BHEBl/eizAsY8K6LX8LASZL0Jxdjm5eEfzp+FIrxCm/p8bA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-function-name": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-literals": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.2.0.tgz",
+ "integrity": "sha512-2ThDhm4lI4oV7fVQ6pNNK+sx+c/GM5/SaML0w/r4ZB7sAneD/piDJtwdKlNckXeyGK7wlwg2E2w33C/Hh+VFCg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-member-expression-literals": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.2.0.tgz",
+ "integrity": "sha512-HiU3zKkSU6scTidmnFJ0bMX8hz5ixC93b4MHMiYebmk2lUVNGOboPsqQvx5LzooihijUoLR/v7Nc1rbBtnc7FA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-modules-amd": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.5.0.tgz",
+ "integrity": "sha512-n20UsQMKnWrltocZZm24cRURxQnWIvsABPJlw/fvoy9c6AgHZzoelAIzajDHAQrDpuKFFPPcFGd7ChsYuIUMpg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-module-transforms": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0",
+ "babel-plugin-dynamic-import-node": "2.3.0"
+ }
+ },
+ "@babel/plugin-transform-modules-commonjs": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.7.0.tgz",
+ "integrity": "sha512-KEMyWNNWnjOom8vR/1+d+Ocz/mILZG/eyHHO06OuBQ2aNhxT62fr4y6fGOplRx+CxCSp3IFwesL8WdINfY/3kg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-module-transforms": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/helper-simple-access": "7.7.0",
+ "babel-plugin-dynamic-import-node": "2.3.0"
+ }
+ },
+ "@babel/plugin-transform-modules-systemjs": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.7.0.tgz",
+ "integrity": "sha512-ZAuFgYjJzDNv77AjXRqzQGlQl4HdUM6j296ee4fwKVZfhDR9LAGxfvXjBkb06gNETPnN0sLqRm9Gxg4wZH6dXg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-hoist-variables": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0",
+ "babel-plugin-dynamic-import-node": "2.3.0"
+ }
+ },
+ "@babel/plugin-transform-modules-umd": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.7.0.tgz",
+ "integrity": "sha512-u7eBA03zmUswQ9LQ7Qw0/ieC1pcAkbp5OQatbWUzY1PaBccvuJXUkYzoN1g7cqp7dbTu6Dp9bXyalBvD04AANA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-module-transforms": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-named-capturing-groups-regex": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.7.0.tgz",
+ "integrity": "sha512-+SicSJoKouPctL+j1pqktRVCgy+xAch1hWWTMy13j0IflnyNjaoskj+DwRQFimHbLqO3sq2oN2CXMvXq3Bgapg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-create-regexp-features-plugin": "7.7.2"
+ }
+ },
+ "@babel/plugin-transform-new-target": {
+ "version": "7.4.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.4.4.tgz",
+ "integrity": "sha512-r1z3T2DNGQwwe2vPGZMBNjioT2scgWzK9BCnDEh+46z8EEwXBq24uRzd65I7pjtugzPSj921aM15RpESgzsSuA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-object-super": {
+ "version": "7.5.5",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.5.5.tgz",
+ "integrity": "sha512-un1zJQAhSosGFBduPgN/YFNvWVpRuHKU7IHBglLoLZsGmruJPOo6pbInneflUdmq7YvSVqhpPs5zdBvLnteltQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/helper-replace-supers": "7.7.0"
+ }
+ },
+ "@babel/plugin-transform-parameters": {
+ "version": "7.4.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.4.4.tgz",
+ "integrity": "sha512-oMh5DUO1V63nZcu/ZVLQFqiihBGo4OpxJxR1otF50GMeCLiRx5nUdtokd+u9SuVJrvvuIh9OosRFPP4pIPnwmw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-call-delegate": "7.7.0",
+ "@babel/helper-get-function-arity": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-property-literals": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.2.0.tgz",
+ "integrity": "sha512-9q7Dbk4RhgcLp8ebduOpCbtjh7C0itoLYHXd9ueASKAG/is5PQtMR5VJGka9NKqGhYEGn5ITahd4h9QeBMylWQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-react-display-name": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.2.0.tgz",
+ "integrity": "sha512-Htf/tPa5haZvRMiNSQSFifK12gtr/8vwfr+A9y69uF0QcU77AVu4K7MiHEkTxF7lQoHOL0F9ErqgfNEAKgXj7A==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-react-jsx": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.7.0.tgz",
+ "integrity": "sha512-mXhBtyVB1Ujfy+0L6934jeJcSXj/VCg6whZzEcgiiZHNS0PGC7vUCsZDQCxxztkpIdF+dY1fUMcjAgEOC3ZOMQ==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-builder-react-jsx": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/plugin-syntax-jsx": "7.2.0"
+ }
+ },
+ "@babel/plugin-transform-react-jsx-self": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.2.0.tgz",
+ "integrity": "sha512-v6S5L/myicZEy+jr6ielB0OR8h+EH/1QFx/YJ7c7Ua+7lqsjj/vW6fD5FR9hB/6y7mGbfT4vAURn3xqBxsUcdg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/plugin-syntax-jsx": "7.2.0"
+ }
+ },
+ "@babel/plugin-transform-react-jsx-source": {
+ "version": "7.5.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.5.0.tgz",
+ "integrity": "sha512-58Q+Jsy4IDCZx7kqEZuSDdam/1oW8OdDX8f+Loo6xyxdfg1yF0GE2XNJQSTZCaMol93+FBzpWiPEwtbMloAcPg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/plugin-syntax-jsx": "7.2.0"
+ }
+ },
+ "@babel/plugin-transform-regenerator": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.7.0.tgz",
+ "integrity": "sha512-AXmvnC+0wuj/cFkkS/HFHIojxH3ffSXE+ttulrqWjZZRaUOonfJc60e1wSNT4rV8tIunvu/R3wCp71/tLAa9xg==",
+ "dev": true,
+ "requires": {
+ "regenerator-transform": "0.14.1"
+ }
+ },
+ "@babel/plugin-transform-reserved-words": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.2.0.tgz",
+ "integrity": "sha512-fz43fqW8E1tAB3DKF19/vxbpib1fuyCwSPE418ge5ZxILnBhWyhtPgz8eh1RCGGJlwvksHkyxMxh0eenFi+kFw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-runtime": {
+ "version": "7.6.2",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.6.2.tgz",
+ "integrity": "sha512-cqULw/QB4yl73cS5Y0TZlQSjDvNkzDbu0FurTZyHlJpWE5T3PCMdnyV+xXoH1opr1ldyHODe3QAX3OMAii5NxA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-module-imports": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0",
+ "resolve": "1.12.0",
+ "semver": "5.7.1"
+ }
+ },
+ "@babel/plugin-transform-shorthand-properties": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.2.0.tgz",
+ "integrity": "sha512-QP4eUM83ha9zmYtpbnyjTLAGKQritA5XW/iG9cjtuOI8s1RuL/3V6a3DeSHfKutJQ+ayUfeZJPcnCYEQzaPQqg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-spread": {
+ "version": "7.6.2",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.6.2.tgz",
+ "integrity": "sha512-DpSvPFryKdK1x+EDJYCy28nmAaIMdxmhot62jAXF/o99iA33Zj2Lmcp3vDmz+MUh0LNYVPvfj5iC3feb3/+PFg==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-sticky-regex": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.2.0.tgz",
+ "integrity": "sha512-KKYCoGaRAf+ckH8gEL3JHUaFVyNHKe3ASNsZ+AlktgHevvxGigoIttrEJb8iKN03Q7Eazlv1s6cx2B2cQ3Jabw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/helper-regex": "7.5.5"
+ }
+ },
+ "@babel/plugin-transform-template-literals": {
+ "version": "7.4.4",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.4.4.tgz",
+ "integrity": "sha512-mQrEC4TWkhLN0z8ygIvEL9ZEToPhG5K7KDW3pzGqOfIGZ28Jb0POUkeWcoz8HnHvhFy6dwAT1j8OzqN8s804+g==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-annotate-as-pure": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-typeof-symbol": {
+ "version": "7.2.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.2.0.tgz",
+ "integrity": "sha512-2LNhETWYxiYysBtrBTqL8+La0jIoQQnIScUJc74OYvUGRmkskNY4EzLCnjHBzdmb38wqtTaixpo1NctEcvMDZw==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/plugin-transform-unicode-regex": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.7.0.tgz",
+ "integrity": "sha512-RrThb0gdrNwFAqEAAx9OWgtx6ICK69x7i9tCnMdVrxQwSDp/Abu9DXFU5Hh16VP33Rmxh04+NGW28NsIkFvFKA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-create-regexp-features-plugin": "7.7.2",
+ "@babel/helper-plugin-utils": "7.0.0"
+ }
+ },
+ "@babel/polyfill": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/polyfill/-/polyfill-7.7.0.tgz",
+ "integrity": "sha512-/TS23MVvo34dFmf8mwCisCbWGrfhbiWZSwBo6HkADTBhUa2Q/jWltyY/tpofz/b6/RIhqaqQcquptCirqIhOaQ==",
+ "dev": true,
+ "requires": {
+ "core-js": "2.6.10",
+ "regenerator-runtime": "0.13.3"
+ },
+ "dependencies": {
+ "core-js": {
+ "version": "2.6.10",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.6.10.tgz",
+ "integrity": "sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/preset-env": {
+ "version": "7.7.1",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.7.1.tgz",
+ "integrity": "sha512-/93SWhi3PxcVTDpSqC+Dp4YxUu3qZ4m7I76k0w73wYfn7bGVuRIO4QUz95aJksbS+AD1/mT1Ie7rbkT0wSplaA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-module-imports": "7.7.0",
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/plugin-proposal-async-generator-functions": "7.7.0",
+ "@babel/plugin-proposal-dynamic-import": "7.7.0",
+ "@babel/plugin-proposal-json-strings": "7.2.0",
+ "@babel/plugin-proposal-object-rest-spread": "7.6.2",
+ "@babel/plugin-proposal-optional-catch-binding": "7.2.0",
+ "@babel/plugin-proposal-unicode-property-regex": "7.7.0",
+ "@babel/plugin-syntax-async-generators": "7.2.0",
+ "@babel/plugin-syntax-dynamic-import": "7.2.0",
+ "@babel/plugin-syntax-json-strings": "7.2.0",
+ "@babel/plugin-syntax-object-rest-spread": "7.2.0",
+ "@babel/plugin-syntax-optional-catch-binding": "7.2.0",
+ "@babel/plugin-syntax-top-level-await": "7.7.0",
+ "@babel/plugin-transform-arrow-functions": "7.2.0",
+ "@babel/plugin-transform-async-to-generator": "7.7.0",
+ "@babel/plugin-transform-block-scoped-functions": "7.2.0",
+ "@babel/plugin-transform-block-scoping": "7.6.3",
+ "@babel/plugin-transform-classes": "7.7.0",
+ "@babel/plugin-transform-computed-properties": "7.2.0",
+ "@babel/plugin-transform-destructuring": "7.6.0",
+ "@babel/plugin-transform-dotall-regex": "7.7.0",
+ "@babel/plugin-transform-duplicate-keys": "7.5.0",
+ "@babel/plugin-transform-exponentiation-operator": "7.2.0",
+ "@babel/plugin-transform-for-of": "7.4.4",
+ "@babel/plugin-transform-function-name": "7.7.0",
+ "@babel/plugin-transform-literals": "7.2.0",
+ "@babel/plugin-transform-member-expression-literals": "7.2.0",
+ "@babel/plugin-transform-modules-amd": "7.5.0",
+ "@babel/plugin-transform-modules-commonjs": "7.7.0",
+ "@babel/plugin-transform-modules-systemjs": "7.7.0",
+ "@babel/plugin-transform-modules-umd": "7.7.0",
+ "@babel/plugin-transform-named-capturing-groups-regex": "7.7.0",
+ "@babel/plugin-transform-new-target": "7.4.4",
+ "@babel/plugin-transform-object-super": "7.5.5",
+ "@babel/plugin-transform-parameters": "7.4.4",
+ "@babel/plugin-transform-property-literals": "7.2.0",
+ "@babel/plugin-transform-regenerator": "7.7.0",
+ "@babel/plugin-transform-reserved-words": "7.2.0",
+ "@babel/plugin-transform-shorthand-properties": "7.2.0",
+ "@babel/plugin-transform-spread": "7.6.2",
+ "@babel/plugin-transform-sticky-regex": "7.2.0",
+ "@babel/plugin-transform-template-literals": "7.4.4",
+ "@babel/plugin-transform-typeof-symbol": "7.2.0",
+ "@babel/plugin-transform-unicode-regex": "7.7.0",
+ "@babel/types": "7.7.2",
+ "browserslist": "4.7.3",
+ "core-js-compat": "3.4.1",
+ "invariant": "2.2.4",
+ "js-levenshtein": "1.1.6",
+ "semver": "5.7.1"
+ }
+ },
+ "@babel/preset-react": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/preset-react/-/preset-react-7.7.0.tgz",
+ "integrity": "sha512-IXXgSUYBPHUGhUkH+89TR6faMcBtuMW0h5OHbMuVbL3/5wK2g6a2M2BBpkLa+Kw0sAHiZ9dNVgqJMDP/O4GRBA==",
+ "dev": true,
+ "requires": {
+ "@babel/helper-plugin-utils": "7.0.0",
+ "@babel/plugin-transform-react-display-name": "7.2.0",
+ "@babel/plugin-transform-react-jsx": "7.7.0",
+ "@babel/plugin-transform-react-jsx-self": "7.2.0",
+ "@babel/plugin-transform-react-jsx-source": "7.5.0"
+ }
+ },
+ "@babel/runtime": {
+ "version": "7.7.2",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.7.2.tgz",
+ "integrity": "sha512-JONRbXbTXc9WQE2mAZd1p0Z3DZ/6vaQIkgYMSTP3KjRCyd7rCZCcfhCyX+YjwcKxcZ82UrxbRD358bpExNgrjw==",
+ "dev": true,
+ "requires": {
+ "regenerator-runtime": "0.13.3"
+ }
+ },
+ "@babel/template": {
+ "version": "7.7.0",
+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.7.0.tgz",
+ "integrity": "sha512-OKcwSYOW1mhWbnTBgQY5lvg1Fxg+VyfQGjcBduZFljfc044J5iDlnDSfhQ867O17XHiSCxYHUxHg2b7ryitbUQ==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "7.5.5",
+ "@babel/parser": "7.7.3",
+ "@babel/types": "7.7.2"
+ }
+ },
+ "@babel/traverse": {
+ "version": "7.7.2",
+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.7.2.tgz",
+ "integrity": "sha512-TM01cXib2+rgIZrGJOLaHV/iZUAxf4A0dt5auY6KNZ+cm6aschuJGqKJM3ROTt3raPUdIDk9siAufIFEleRwtw==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "7.5.5",
+ "@babel/generator": "7.7.2",
+ "@babel/helper-function-name": "7.7.0",
+ "@babel/helper-split-export-declaration": "7.7.0",
+ "@babel/parser": "7.7.3",
+ "@babel/types": "7.7.2",
+ "debug": "4.1.1",
+ "globals": "11.12.0",
+ "lodash": "4.17.15"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
+ }
+ },
+ "@babel/types": {
+ "version": "7.7.2",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.7.2.tgz",
+ "integrity": "sha512-YTf6PXoh3+eZgRCBzzP25Bugd2ngmpQVrk7kXX0i5N9BO7TFBtIgZYs7WtxtOGs8e6A4ZI7ECkbBCEHeXocvOA==",
+ "dev": true,
+ "requires": {
+ "esutils": "2.0.3",
+ "lodash": "4.17.15",
+ "to-fast-properties": "2.0.0"
+ }
+ },
+ "@csstools/convert-colors": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/@csstools/convert-colors/-/convert-colors-1.4.0.tgz",
+ "integrity": "sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==",
+ "dev": true
+ },
+ "@types/d3-selection": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/@types/d3-selection/-/d3-selection-1.0.10.tgz",
+ "integrity": "sha1-3PsN3837GtJq6kNRMjdx4a6pboQ="
+ },
+ "@types/events": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
+ "integrity": "sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==",
+ "dev": true
+ },
+ "@types/glob": {
+ "version": "7.1.1",
+ "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.1.1.tgz",
+ "integrity": "sha512-1Bh06cbWJUHMC97acuD6UMG29nMt0Aqz1vF3guLfG+kHHJhy3AyohZFFxYk2f7Q1SQIrNwvncxAE0N/9s70F2w==",
+ "dev": true,
+ "requires": {
+ "@types/events": "3.0.0",
+ "@types/minimatch": "3.0.3",
+ "@types/node": "12.12.11"
+ }
+ },
+ "@types/minimatch": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+ "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==",
+ "dev": true
+ },
+ "@types/node": {
+ "version": "12.12.11",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-12.12.11.tgz",
+ "integrity": "sha512-O+x6uIpa6oMNTkPuHDa9MhMMehlxLAd5QcOvKRjAFsBVpeFWTOPnXbDvILvFgFFZfQ1xh1EZi1FbXxUix+zpsQ==",
+ "dev": true
+ },
+ "@webassemblyjs/ast": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
+ "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/helper-module-context": "1.8.5",
+ "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+ "@webassemblyjs/wast-parser": "1.8.5"
+ }
+ },
+ "@webassemblyjs/floating-point-hex-parser": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
+ "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+ "dev": true
+ },
+ "@webassemblyjs/helper-api-error": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
+ "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+ "dev": true
+ },
+ "@webassemblyjs/helper-buffer": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
+ "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+ "dev": true
+ },
+ "@webassemblyjs/helper-code-frame": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
+ "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/wast-printer": "1.8.5"
+ }
+ },
+ "@webassemblyjs/helper-fsm": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
+ "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+ "dev": true
+ },
+ "@webassemblyjs/helper-module-context": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
+ "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/ast": "1.8.5",
+ "mamacro": "0.0.3"
+ }
+ },
+ "@webassemblyjs/helper-wasm-bytecode": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
+ "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+ "dev": true
+ },
+ "@webassemblyjs/helper-wasm-section": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
+ "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/ast": "1.8.5",
+ "@webassemblyjs/helper-buffer": "1.8.5",
+ "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+ "@webassemblyjs/wasm-gen": "1.8.5"
+ }
+ },
+ "@webassemblyjs/ieee754": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
+ "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+ "dev": true,
+ "requires": {
+ "@xtuc/ieee754": "1.2.0"
+ }
+ },
+ "@webassemblyjs/leb128": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
+ "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+ "dev": true,
+ "requires": {
+ "@xtuc/long": "4.2.2"
+ }
+ },
+ "@webassemblyjs/utf8": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
+ "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+ "dev": true
+ },
+ "@webassemblyjs/wasm-edit": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
+ "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/ast": "1.8.5",
+ "@webassemblyjs/helper-buffer": "1.8.5",
+ "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+ "@webassemblyjs/helper-wasm-section": "1.8.5",
+ "@webassemblyjs/wasm-gen": "1.8.5",
+ "@webassemblyjs/wasm-opt": "1.8.5",
+ "@webassemblyjs/wasm-parser": "1.8.5",
+ "@webassemblyjs/wast-printer": "1.8.5"
+ }
+ },
+ "@webassemblyjs/wasm-gen": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
+ "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/ast": "1.8.5",
+ "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+ "@webassemblyjs/ieee754": "1.8.5",
+ "@webassemblyjs/leb128": "1.8.5",
+ "@webassemblyjs/utf8": "1.8.5"
+ }
+ },
+ "@webassemblyjs/wasm-opt": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
+ "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/ast": "1.8.5",
+ "@webassemblyjs/helper-buffer": "1.8.5",
+ "@webassemblyjs/wasm-gen": "1.8.5",
+ "@webassemblyjs/wasm-parser": "1.8.5"
+ }
+ },
+ "@webassemblyjs/wasm-parser": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
+ "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/ast": "1.8.5",
+ "@webassemblyjs/helper-api-error": "1.8.5",
+ "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
+ "@webassemblyjs/ieee754": "1.8.5",
+ "@webassemblyjs/leb128": "1.8.5",
+ "@webassemblyjs/utf8": "1.8.5"
+ }
+ },
+ "@webassemblyjs/wast-parser": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
+ "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/ast": "1.8.5",
+ "@webassemblyjs/floating-point-hex-parser": "1.8.5",
+ "@webassemblyjs/helper-api-error": "1.8.5",
+ "@webassemblyjs/helper-code-frame": "1.8.5",
+ "@webassemblyjs/helper-fsm": "1.8.5",
+ "@xtuc/long": "4.2.2"
+ }
+ },
+ "@webassemblyjs/wast-printer": {
+ "version": "1.8.5",
+ "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
+ "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/ast": "1.8.5",
+ "@webassemblyjs/wast-parser": "1.8.5",
+ "@xtuc/long": "4.2.2"
+ }
+ },
+ "@xtuc/ieee754": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
+ "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+ "dev": true
+ },
+ "@xtuc/long": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
+ "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+ "dev": true
+ },
+ "accepts": {
+ "version": "1.3.7",
+ "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz",
+ "integrity": "sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==",
+ "dev": true,
+ "requires": {
+ "mime-types": "2.1.25",
+ "negotiator": "0.6.2"
+ }
+ },
+ "acorn": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-6.3.0.tgz",
+ "integrity": "sha512-/czfa8BwS88b9gWQVhc8eknunSA2DoJpJyTQkhheIf5E48u1N0R4q/YxxsAeqRrmK9TQ/uYfgLDfZo91UlANIA==",
+ "dev": true
+ },
+ "acorn-jsx": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.1.0.tgz",
+ "integrity": "sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==",
+ "dev": true
+ },
+ "ajv": {
+ "version": "6.10.2",
+ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.10.2.tgz",
+ "integrity": "sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==",
+ "dev": true,
+ "requires": {
+ "fast-deep-equal": "2.0.1",
+ "fast-json-stable-stringify": "2.0.0",
+ "json-schema-traverse": "0.4.1",
+ "uri-js": "4.2.2"
+ }
+ },
+ "ajv-errors": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz",
+ "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==",
+ "dev": true
+ },
+ "ajv-keywords": {
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.4.1.tgz",
+ "integrity": "sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==",
+ "dev": true
+ },
+ "ansi-colors": {
+ "version": "3.2.4",
+ "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-3.2.4.tgz",
+ "integrity": "sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==",
+ "dev": true
+ },
+ "ansi-escapes": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-3.2.0.tgz",
+ "integrity": "sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ==",
+ "dev": true
+ },
+ "ansi-html": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz",
+ "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=",
+ "dev": true
+ },
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "ansi-styles": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+ "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+ "dev": true,
+ "requires": {
+ "color-convert": "1.9.3"
+ }
+ },
+ "ant-design-palettes": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/ant-design-palettes/-/ant-design-palettes-1.1.3.tgz",
+ "integrity": "sha512-UpkkTp8egEN21KZNvY7sTcabLlkHvLvS71EVPk4CYi77Z9AaGGCaVn7i72tbOgWDrQp2wjIg8WgMbKBdK7GtWA==",
+ "requires": {
+ "tinycolor2": "1.4.1"
+ }
+ },
+ "anymatch": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+ "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+ "dev": true,
+ "requires": {
+ "micromatch": "3.1.10",
+ "normalize-path": "2.1.1"
+ },
+ "dependencies": {
+ "normalize-path": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+ "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+ "dev": true,
+ "requires": {
+ "remove-trailing-separator": "1.1.0"
+ }
+ }
+ }
+ },
+ "aproba": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+ "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
+ "dev": true
+ },
+ "argparse": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+ "dev": true,
+ "requires": {
+ "sprintf-js": "1.0.3"
+ }
+ },
+ "aria-query": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-3.0.0.tgz",
+ "integrity": "sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=",
+ "dev": true,
+ "requires": {
+ "ast-types-flow": "0.0.7",
+ "commander": "2.20.3"
+ }
+ },
+ "arr-diff": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+ "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
+ "dev": true
+ },
+ "arr-flatten": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+ "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+ "dev": true
+ },
+ "arr-union": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
+ "dev": true
+ },
+ "array-flatten": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz",
+ "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==",
+ "dev": true
+ },
+ "array-includes": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz",
+ "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3",
+ "es-abstract": "1.16.0"
+ }
+ },
+ "array-union": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+ "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=",
+ "dev": true,
+ "requires": {
+ "array-uniq": "1.0.3"
+ }
+ },
+ "array-uniq": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+ "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=",
+ "dev": true
+ },
+ "array-unique": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+ "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
+ "dev": true
+ },
+ "asap": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+ "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+ },
+ "asn1": {
+ "version": "0.2.4",
+ "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz",
+ "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "safer-buffer": "2.1.2"
+ }
+ },
+ "asn1.js": {
+ "version": "4.10.1",
+ "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
+ "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==",
+ "dev": true,
+ "requires": {
+ "bn.js": "4.11.8",
+ "inherits": "2.0.4",
+ "minimalistic-assert": "1.0.1"
+ }
+ },
+ "assert": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
+ "integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+ "dev": true,
+ "requires": {
+ "object-assign": "4.1.1",
+ "util": "0.10.3"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
+ "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=",
+ "dev": true
+ },
+ "util": {
+ "version": "0.10.3",
+ "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
+ "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.1"
+ }
+ }
+ }
+ },
+ "assert-plus": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+ "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+ "dev": true
+ },
+ "assign-symbols": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+ "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
+ "dev": true
+ },
+ "ast-types-flow": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/ast-types-flow/-/ast-types-flow-0.0.7.tgz",
+ "integrity": "sha1-9wtzXGvKGlycItmCw+Oef+ujva0=",
+ "dev": true
+ },
+ "astral-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz",
+ "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==",
+ "dev": true
+ },
+ "async": {
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
+ "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
+ "dev": true,
+ "requires": {
+ "lodash": "4.17.15"
+ }
+ },
+ "async-each": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
+ "integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+ "dev": true
+ },
+ "async-limiter": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.1.tgz",
+ "integrity": "sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==",
+ "dev": true
+ },
+ "asynckit": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+ "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+ "dev": true,
+ "optional": true
+ },
+ "atob": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+ "dev": true
+ },
+ "autoprefixer": {
+ "version": "9.7.2",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.7.2.tgz",
+ "integrity": "sha512-LCAfcdej1182uVvPOZnytbq61AhnOZ/4JelDaJGDeNwewyU1AMaNthcHsyz1NRjTmd2FkurMckLWfkHg3Z//KA==",
+ "dev": true,
+ "requires": {
+ "browserslist": "4.7.3",
+ "caniuse-lite": "1.0.30001011",
+ "chalk": "2.4.2",
+ "normalize-range": "0.1.2",
+ "num2fraction": "1.2.2",
+ "postcss": "7.0.23",
+ "postcss-value-parser": "4.0.2"
+ },
+ "dependencies": {
+ "postcss-value-parser": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz",
+ "integrity": "sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==",
+ "dev": true
+ }
+ }
+ },
+ "aws-sign2": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+ "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+ "dev": true,
+ "optional": true
+ },
+ "aws4": {
+ "version": "1.8.0",
+ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.8.0.tgz",
+ "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==",
+ "dev": true,
+ "optional": true
+ },
+ "axobject-query": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-2.0.2.tgz",
+ "integrity": "sha512-MCeek8ZH7hKyO1rWUbKNQBbl4l2eY0ntk7OGi+q0RlafrCnfPxC06WZA+uebCfmYp4mNU9jRBP1AhGyf8+W3ww==",
+ "dev": true,
+ "requires": {
+ "ast-types-flow": "0.0.7"
+ }
+ },
+ "babel-eslint": {
+ "version": "10.0.3",
+ "resolved": "https://registry.npmjs.org/babel-eslint/-/babel-eslint-10.0.3.tgz",
+ "integrity": "sha512-z3U7eMY6r/3f3/JB9mTsLjyxrv0Yb1zb8PCWCLpguxfCzBIZUwy23R1t/XKewP+8mEN2Ck8Dtr4q20z6ce6SoA==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "7.5.5",
+ "@babel/parser": "7.7.3",
+ "@babel/traverse": "7.7.2",
+ "@babel/types": "7.7.2",
+ "eslint-visitor-keys": "1.1.0",
+ "resolve": "1.12.0"
+ }
+ },
+ "babel-loader": {
+ "version": "8.0.6",
+ "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
+ "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
+ "dev": true,
+ "requires": {
+ "find-cache-dir": "2.1.0",
+ "loader-utils": "1.2.3",
+ "mkdirp": "0.5.1",
+ "pify": "4.0.1"
+ }
+ },
+ "babel-plugin-dynamic-import-node": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz",
+ "integrity": "sha512-o6qFkpeQEBxcqt0XYlWzAVxNCSCZdUgcR8IRlhD/8DylxjjO4foPcvTW0GGKa/cVt3rvxZ7o5ippJ+/0nvLhlQ==",
+ "dev": true,
+ "requires": {
+ "object.assign": "4.1.0"
+ }
+ },
+ "babel-plugin-module-resolver": {
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-3.2.0.tgz",
+ "integrity": "sha512-tjR0GvSndzPew/Iayf4uICWZqjBwnlMWjSx6brryfQ81F9rxBVqwDJtFCV8oOs0+vJeefK9TmdZtkIFdFe1UnA==",
+ "dev": true,
+ "requires": {
+ "find-babel-config": "1.2.0",
+ "glob": "7.1.6",
+ "pkg-up": "2.0.0",
+ "reselect": "3.0.1",
+ "resolve": "1.12.0"
+ }
+ },
+ "babel-plugin-transform-inline-environment-variables": {
+ "version": "0.4.3",
+ "resolved": "https://registry.npmjs.org/babel-plugin-transform-inline-environment-variables/-/babel-plugin-transform-inline-environment-variables-0.4.3.tgz",
+ "integrity": "sha1-o7CYgzU76LXiM24/8e+KXZP5xIk=",
+ "dev": true
+ },
+ "balanced-match": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+ "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+ "dev": true
+ },
+ "base": {
+ "version": "0.11.2",
+ "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+ "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+ "dev": true,
+ "requires": {
+ "cache-base": "1.0.1",
+ "class-utils": "0.3.6",
+ "component-emitter": "1.3.0",
+ "define-property": "1.0.0",
+ "isobject": "3.0.1",
+ "mixin-deep": "1.3.2",
+ "pascalcase": "0.1.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "1.0.2"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "1.0.0",
+ "is-data-descriptor": "1.0.0",
+ "kind-of": "6.0.2"
+ }
+ }
+ }
+ },
+ "base64-js": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz",
+ "integrity": "sha512-mLQ4i2QO1ytvGWFWmcngKO//JXAQueZvwEKtjgQFM4jIK0kU+ytMfplL8j+n5mspOfjHwoAg+9yhb7BwAHm36g==",
+ "dev": true
+ },
+ "batch": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+ "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=",
+ "dev": true
+ },
+ "bcrypt-pbkdf": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz",
+ "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "tweetnacl": "0.14.5"
+ }
+ },
+ "big.js": {
+ "version": "5.2.2",
+ "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+ "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+ "dev": true
+ },
+ "binary-extensions": {
+ "version": "1.13.1",
+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.13.1.tgz",
+ "integrity": "sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==",
+ "dev": true
+ },
+ "bluebird": {
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.1.tgz",
+ "integrity": "sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==",
+ "dev": true
+ },
+ "bn.js": {
+ "version": "4.11.8",
+ "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
+ "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+ "dev": true
+ },
+ "body-parser": {
+ "version": "1.19.0",
+ "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
+ "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
+ "dev": true,
+ "requires": {
+ "bytes": "3.1.0",
+ "content-type": "1.0.4",
+ "debug": "2.6.9",
+ "depd": "1.1.2",
+ "http-errors": "1.7.2",
+ "iconv-lite": "0.4.24",
+ "on-finished": "2.3.0",
+ "qs": "6.7.0",
+ "raw-body": "2.4.0",
+ "type-is": "1.6.18"
+ },
+ "dependencies": {
+ "bytes": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+ "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+ "dev": true
+ },
+ "qs": {
+ "version": "6.7.0",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+ "dev": true
+ }
+ }
+ },
+ "bonjour": {
+ "version": "3.5.0",
+ "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
+ "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=",
+ "dev": true,
+ "requires": {
+ "array-flatten": "2.1.2",
+ "deep-equal": "1.1.1",
+ "dns-equal": "1.0.0",
+ "dns-txt": "2.0.2",
+ "multicast-dns": "6.2.3",
+ "multicast-dns-service-types": "1.1.0"
+ }
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+ "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+ "dev": true,
+ "requires": {
+ "balanced-match": "1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "braces": {
+ "version": "2.3.2",
+ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+ "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+ "dev": true,
+ "requires": {
+ "arr-flatten": "1.1.0",
+ "array-unique": "0.3.2",
+ "extend-shallow": "2.0.1",
+ "fill-range": "4.0.0",
+ "isobject": "3.0.1",
+ "repeat-element": "1.1.3",
+ "snapdragon": "0.8.2",
+ "snapdragon-node": "2.1.1",
+ "split-string": "3.1.0",
+ "to-regex": "3.0.2"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
+ "brorand": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz",
+ "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=",
+ "dev": true
+ },
+ "browserify-aes": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz",
+ "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==",
+ "dev": true,
+ "requires": {
+ "buffer-xor": "1.0.3",
+ "cipher-base": "1.0.4",
+ "create-hash": "1.2.0",
+ "evp_bytestokey": "1.0.3",
+ "inherits": "2.0.4",
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "browserify-cipher": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz",
+ "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==",
+ "dev": true,
+ "requires": {
+ "browserify-aes": "1.2.0",
+ "browserify-des": "1.0.2",
+ "evp_bytestokey": "1.0.3"
+ }
+ },
+ "browserify-des": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.2.tgz",
+ "integrity": "sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==",
+ "dev": true,
+ "requires": {
+ "cipher-base": "1.0.4",
+ "des.js": "1.0.1",
+ "inherits": "2.0.4",
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "browserify-rsa": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",
+ "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=",
+ "dev": true,
+ "requires": {
+ "bn.js": "4.11.8",
+ "randombytes": "2.1.0"
+ }
+ },
+ "browserify-sign": {
+ "version": "4.0.4",
+ "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz",
+ "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=",
+ "dev": true,
+ "requires": {
+ "bn.js": "4.11.8",
+ "browserify-rsa": "4.0.1",
+ "create-hash": "1.2.0",
+ "create-hmac": "1.1.7",
+ "elliptic": "6.5.1",
+ "inherits": "2.0.4",
+ "parse-asn1": "5.1.5"
+ }
+ },
+ "browserify-zlib": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz",
+ "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==",
+ "dev": true,
+ "requires": {
+ "pako": "1.0.10"
+ }
+ },
+ "browserslist": {
+ "version": "4.7.3",
+ "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.7.3.tgz",
+ "integrity": "sha512-jWvmhqYpx+9EZm/FxcZSbUZyDEvDTLDi3nSAKbzEkyWvtI0mNSmUosey+5awDW1RUlrgXbQb5A6qY1xQH9U6MQ==",
+ "dev": true,
+ "requires": {
+ "caniuse-lite": "1.0.30001011",
+ "electron-to-chromium": "1.3.309",
+ "node-releases": "1.1.40"
+ }
+ },
+ "buffer": {
+ "version": "4.9.2",
+ "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.2.tgz",
+ "integrity": "sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==",
+ "dev": true,
+ "requires": {
+ "base64-js": "1.3.1",
+ "ieee754": "1.1.13",
+ "isarray": "1.0.0"
+ }
+ },
+ "buffer-from": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz",
+ "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==",
+ "dev": true
+ },
+ "buffer-indexof": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz",
+ "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==",
+ "dev": true
+ },
+ "buffer-xor": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz",
+ "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=",
+ "dev": true
+ },
+ "builtin-status-codes": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz",
+ "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=",
+ "dev": true
+ },
+ "bytes": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+ "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+ "dev": true
+ },
+ "cacache": {
+ "version": "12.0.3",
+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
+ "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
+ "dev": true,
+ "requires": {
+ "bluebird": "3.7.1",
+ "chownr": "1.1.3",
+ "figgy-pudding": "3.5.1",
+ "glob": "7.1.6",
+ "graceful-fs": "4.2.3",
+ "infer-owner": "1.0.4",
+ "lru-cache": "5.1.1",
+ "mississippi": "3.0.0",
+ "mkdirp": "0.5.1",
+ "move-concurrently": "1.0.1",
+ "promise-inflight": "1.0.1",
+ "rimraf": "2.7.1",
+ "ssri": "6.0.1",
+ "unique-filename": "1.1.1",
+ "y18n": "4.0.0"
+ }
+ },
+ "cache-base": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+ "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+ "dev": true,
+ "requires": {
+ "collection-visit": "1.0.0",
+ "component-emitter": "1.3.0",
+ "get-value": "2.0.6",
+ "has-value": "1.0.0",
+ "isobject": "3.0.1",
+ "set-value": "2.0.1",
+ "to-object-path": "0.3.0",
+ "union-value": "1.0.1",
+ "unset-value": "1.0.0"
+ }
+ },
+ "caller-callsite": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/caller-callsite/-/caller-callsite-2.0.0.tgz",
+ "integrity": "sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=",
+ "dev": true,
+ "requires": {
+ "callsites": "2.0.0"
+ },
+ "dependencies": {
+ "callsites": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-2.0.0.tgz",
+ "integrity": "sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=",
+ "dev": true
+ }
+ }
+ },
+ "caller-path": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/caller-path/-/caller-path-2.0.0.tgz",
+ "integrity": "sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=",
+ "dev": true,
+ "requires": {
+ "caller-callsite": "2.0.0"
+ }
+ },
+ "callsites": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+ "dev": true
+ },
+ "camelcase": {
+ "version": "5.3.1",
+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+ "dev": true
+ },
+ "caniuse-lite": {
+ "version": "1.0.30001011",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001011.tgz",
+ "integrity": "sha512-h+Eqyn/YA6o6ZTqpS86PyRmNWOs1r54EBDcd2NTwwfsXQ8re1B38SnB+p2RKF8OUsyEIjeDU8XGec1RGO/wYCg==",
+ "dev": true
+ },
+ "caseless": {
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+ "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+ "dev": true,
+ "optional": true
+ },
+ "chalk": {
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+ "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "escape-string-regexp": "1.0.5",
+ "supports-color": "5.5.0"
+ }
+ },
+ "chardet": {
+ "version": "0.7.0",
+ "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+ "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+ "dev": true
+ },
+ "chokidar": {
+ "version": "2.1.8",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
+ "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+ "dev": true,
+ "requires": {
+ "anymatch": "2.0.0",
+ "async-each": "1.0.3",
+ "braces": "2.3.2",
+ "fsevents": "1.2.9",
+ "glob-parent": "3.1.0",
+ "inherits": "2.0.4",
+ "is-binary-path": "1.0.1",
+ "is-glob": "4.0.1",
+ "normalize-path": "3.0.0",
+ "path-is-absolute": "1.0.1",
+ "readdirp": "2.2.1",
+ "upath": "1.2.0"
+ }
+ },
+ "chownr": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
+ "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==",
+ "dev": true
+ },
+ "chrome-trace-event": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz",
+ "integrity": "sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==",
+ "dev": true,
+ "requires": {
+ "tslib": "1.10.0"
+ }
+ },
+ "cipher-base": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
+ "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.4",
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "class-utils": {
+ "version": "0.3.6",
+ "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+ "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+ "dev": true,
+ "requires": {
+ "arr-union": "3.1.0",
+ "define-property": "0.2.5",
+ "isobject": "3.0.1",
+ "static-extend": "0.1.2"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "0.1.6"
+ }
+ }
+ }
+ },
+ "classnames": {
+ "version": "2.2.6",
+ "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
+ "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
+ },
+ "cli-cursor": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
+ "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+ "dev": true,
+ "requires": {
+ "restore-cursor": "2.0.0"
+ }
+ },
+ "cli-width": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-2.2.0.tgz",
+ "integrity": "sha1-/xnt6Kml5XkyQUewwR8PvLq+1jk=",
+ "dev": true
+ },
+ "cliui": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
+ "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
+ "dev": true,
+ "requires": {
+ "string-width": "3.1.0",
+ "strip-ansi": "5.2.0",
+ "wrap-ansi": "5.1.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+ "dev": true
+ },
+ "string-width": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "dev": true,
+ "requires": {
+ "emoji-regex": "7.0.3",
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "5.2.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "4.1.0"
+ }
+ }
+ }
+ },
+ "clone": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+ "integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=",
+ "dev": true
+ },
+ "code-point-at": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
+ "dev": true
+ },
+ "codemirror": {
+ "version": "5.49.2",
+ "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.49.2.tgz",
+ "integrity": "sha512-dwJ2HRPHm8w51WB5YTF9J7m6Z5dtkqbU9ntMZ1dqXyFB9IpjoUFDj80ahRVEoVanfIp6pfASJbOlbWdEf8FOzQ=="
+ },
+ "collection-visit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+ "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
+ "dev": true,
+ "requires": {
+ "map-visit": "1.0.0",
+ "object-visit": "1.0.1"
+ }
+ },
+ "color-convert": {
+ "version": "1.9.3",
+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+ "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+ "dev": true,
+ "requires": {
+ "color-name": "1.1.3"
+ }
+ },
+ "color-name": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+ "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
+ "dev": true
+ },
+ "combined-stream": {
+ "version": "1.0.8",
+ "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+ "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+ "dev": true,
+ "requires": {
+ "delayed-stream": "1.0.0"
+ }
+ },
+ "commander": {
+ "version": "2.20.3",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
+ "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
+ },
+ "commondir": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+ "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=",
+ "dev": true
+ },
+ "component-emitter": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
+ "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
+ "dev": true
+ },
+ "compressible": {
+ "version": "2.0.17",
+ "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.17.tgz",
+ "integrity": "sha512-BGHeLCK1GV7j1bSmQQAi26X+GgWcTjLr/0tzSvMCl3LH1w1IJ4PFSPoV5316b30cneTziC+B1a+3OjoSUcQYmw==",
+ "dev": true,
+ "requires": {
+ "mime-db": "1.42.0"
+ }
+ },
+ "compression": {
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+ "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
+ "dev": true,
+ "requires": {
+ "accepts": "1.3.7",
+ "bytes": "3.0.0",
+ "compressible": "2.0.17",
+ "debug": "2.6.9",
+ "on-headers": "1.0.2",
+ "safe-buffer": "5.1.2",
+ "vary": "1.1.2"
+ }
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+ "dev": true
+ },
+ "concat-stream": {
+ "version": "1.6.2",
+ "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+ "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+ "dev": true,
+ "requires": {
+ "buffer-from": "1.1.1",
+ "inherits": "2.0.4",
+ "readable-stream": "2.3.6",
+ "typedarray": "0.0.6"
+ }
+ },
+ "confusing-browser-globals": {
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.9.tgz",
+ "integrity": "sha512-KbS1Y0jMtyPgIxjO7ZzMAuUpAKMt1SzCL9fsrKsX6b0zJPTaT0SiSPmewwVZg9UAO83HVIlEhZF84LIjZ0lmAw==",
+ "dev": true
+ },
+ "connect-history-api-fallback": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz",
+ "integrity": "sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==",
+ "dev": true
+ },
+ "console-browserify": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+ "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==",
+ "dev": true
+ },
+ "constants-browserify": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+ "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
+ "dev": true
+ },
+ "contains-path": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz",
+ "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=",
+ "dev": true
+ },
+ "content-disposition": {
+ "version": "0.5.3",
+ "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
+ "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "content-type": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+ "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+ "dev": true
+ },
+ "conventional-commit-types": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/conventional-commit-types/-/conventional-commit-types-2.3.0.tgz",
+ "integrity": "sha512-6iB39PrcGYdz0n3z31kj6/Km6mK9hm9oMRhwcLnKxE7WNoeRKZbTAobliKrbYZ5jqyCvtcVEfjCiaEzhL3AVmQ==",
+ "dev": true
+ },
+ "convert-source-map": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz",
+ "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "cookie": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+ "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
+ "dev": true
+ },
+ "cookie-signature": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+ "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=",
+ "dev": true
+ },
+ "copy-concurrently": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz",
+ "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==",
+ "dev": true,
+ "requires": {
+ "aproba": "1.2.0",
+ "fs-write-stream-atomic": "1.0.10",
+ "iferr": "0.1.5",
+ "mkdirp": "0.5.1",
+ "rimraf": "2.7.1",
+ "run-queue": "1.0.3"
+ }
+ },
+ "copy-descriptor": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
+ "dev": true
+ },
+ "core-js": {
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.4.1.tgz",
+ "integrity": "sha512-KX/dnuY/J8FtEwbnrzmAjUYgLqtk+cxM86hfG60LGiW3MmltIc2yAmDgBgEkfm0blZhUrdr1Zd84J2Y14mLxzg=="
+ },
+ "core-js-compat": {
+ "version": "3.4.1",
+ "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.4.1.tgz",
+ "integrity": "sha512-YdeJI26gLc0CQJ9asLE5obEgBz2I0+CIgnoTbS2T0d5IPQw/OCgCIFR527RmpduxjrB3gSEHoGOCTq9sigOyfw==",
+ "dev": true,
+ "requires": {
+ "browserslist": "4.7.3",
+ "semver": "6.3.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ }
+ }
+ },
+ "core-util-is": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+ "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+ "dev": true
+ },
+ "cosmiconfig": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+ "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+ "dev": true,
+ "requires": {
+ "import-fresh": "2.0.0",
+ "is-directory": "0.3.1",
+ "js-yaml": "3.13.1",
+ "parse-json": "4.0.0"
+ },
+ "dependencies": {
+ "import-fresh": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+ "integrity": "sha1-2BNVwVYS04bGH53dOSLUMEgipUY=",
+ "dev": true,
+ "requires": {
+ "caller-path": "2.0.0",
+ "resolve-from": "3.0.0"
+ }
+ },
+ "parse-json": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+ "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
+ "dev": true,
+ "requires": {
+ "error-ex": "1.3.2",
+ "json-parse-better-errors": "1.0.2"
+ }
+ },
+ "resolve-from": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+ "dev": true
+ }
+ }
+ },
+ "create-ecdh": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz",
+ "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==",
+ "dev": true,
+ "requires": {
+ "bn.js": "4.11.8",
+ "elliptic": "6.5.1"
+ }
+ },
+ "create-hash": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz",
+ "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==",
+ "dev": true,
+ "requires": {
+ "cipher-base": "1.0.4",
+ "inherits": "2.0.4",
+ "md5.js": "1.3.5",
+ "ripemd160": "2.0.2",
+ "sha.js": "2.4.11"
+ }
+ },
+ "create-hmac": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz",
+ "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==",
+ "dev": true,
+ "requires": {
+ "cipher-base": "1.0.4",
+ "create-hash": "1.2.0",
+ "inherits": "2.0.4",
+ "ripemd160": "2.0.2",
+ "safe-buffer": "5.1.2",
+ "sha.js": "2.4.11"
+ }
+ },
+ "create-react-class": {
+ "version": "15.6.3",
+ "resolved": "https://registry.npmjs.org/create-react-class/-/create-react-class-15.6.3.tgz",
+ "integrity": "sha512-M+/3Q6E6DLO6Yx3OwrWjwHBnvfXXYA7W+dFjt/ZDBemHO1DDZhsalX/NUtnTYclN6GfnBDRh4qRHjcDHmlJBJg==",
+ "requires": {
+ "fbjs": "0.8.17",
+ "loose-envify": "1.4.0",
+ "object-assign": "4.1.1"
+ }
+ },
+ "cross-env": {
+ "version": "5.2.1",
+ "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-5.2.1.tgz",
+ "integrity": "sha512-1yHhtcfAd1r4nwQgknowuUNfIT9E8dOMMspC36g45dN+iD1blloi7xp8X/xAIDnjHWyt1uQ8PHk2fkNaym7soQ==",
+ "dev": true,
+ "requires": {
+ "cross-spawn": "6.0.5"
+ }
+ },
+ "cross-spawn": {
+ "version": "6.0.5",
+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
+ "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+ "dev": true,
+ "requires": {
+ "nice-try": "1.0.5",
+ "path-key": "2.0.1",
+ "semver": "5.7.1",
+ "shebang-command": "1.2.0",
+ "which": "1.3.1"
+ }
+ },
+ "crypto-browserify": {
+ "version": "3.12.0",
+ "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz",
+ "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==",
+ "dev": true,
+ "requires": {
+ "browserify-cipher": "1.0.1",
+ "browserify-sign": "4.0.4",
+ "create-ecdh": "4.0.3",
+ "create-hash": "1.2.0",
+ "create-hmac": "1.1.7",
+ "diffie-hellman": "5.0.3",
+ "inherits": "2.0.4",
+ "pbkdf2": "3.0.17",
+ "public-encrypt": "4.0.3",
+ "randombytes": "2.1.0",
+ "randomfill": "1.0.4"
+ }
+ },
+ "css-blank-pseudo": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/css-blank-pseudo/-/css-blank-pseudo-0.1.4.tgz",
+ "integrity": "sha512-LHz35Hr83dnFeipc7oqFDmsjHdljj3TQtxGGiNWSOsTLIAubSm4TEz8qCaKFpk7idaQ1GfWscF4E6mgpBysA1w==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "css-has-pseudo": {
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/css-has-pseudo/-/css-has-pseudo-0.10.0.tgz",
+ "integrity": "sha512-Z8hnfsZu4o/kt+AuFzeGpLVhFOGO9mluyHBaA2bA8aCGTwah5sT3WV/fTHH8UNZUytOIImuGPrl/prlb4oX4qQ==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-selector-parser": "5.0.0"
+ },
+ "dependencies": {
+ "cssesc": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+ "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
+ "dev": true
+ },
+ "postcss-selector-parser": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+ "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+ "dev": true,
+ "requires": {
+ "cssesc": "2.0.0",
+ "indexes-of": "1.0.1",
+ "uniq": "1.0.1"
+ }
+ }
+ }
+ },
+ "css-loader": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-2.1.1.tgz",
+ "integrity": "sha512-OcKJU/lt232vl1P9EEDamhoO9iKY3tIjY5GU+XDLblAykTdgs6Ux9P1hTHve8nFKy5KPpOXOsVI/hIwi3841+w==",
+ "dev": true,
+ "requires": {
+ "camelcase": "5.3.1",
+ "icss-utils": "4.1.1",
+ "loader-utils": "1.2.3",
+ "normalize-path": "3.0.0",
+ "postcss": "7.0.23",
+ "postcss-modules-extract-imports": "2.0.0",
+ "postcss-modules-local-by-default": "2.0.6",
+ "postcss-modules-scope": "2.1.0",
+ "postcss-modules-values": "2.0.0",
+ "postcss-value-parser": "3.3.1",
+ "schema-utils": "1.0.0"
+ }
+ },
+ "css-prefers-color-scheme": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/css-prefers-color-scheme/-/css-prefers-color-scheme-3.1.1.tgz",
+ "integrity": "sha512-MTu6+tMs9S3EUqzmqLXEcgNRbNkkD/TGFvowpeoWJn5Vfq7FMgsmRQs9X5NXAURiOBmOxm/lLjsDNXDE6k9bhg==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "cssdb": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/cssdb/-/cssdb-4.4.0.tgz",
+ "integrity": "sha512-LsTAR1JPEM9TpGhl/0p3nQecC2LJ0kD8X5YARu1hk/9I1gril5vDtMZyNxcEpxxDj34YNck/ucjuoUd66K03oQ==",
+ "dev": true
+ },
+ "cssesc": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+ "dev": true
+ },
+ "cyclist": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz",
+ "integrity": "sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=",
+ "dev": true
+ },
+ "cz-conventional-changelog": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-2.1.0.tgz",
+ "integrity": "sha1-L0vHOQ4yROTfKT5ro1Hkx0Cnx2Q=",
+ "dev": true,
+ "requires": {
+ "conventional-commit-types": "2.3.0",
+ "lodash.map": "4.6.0",
+ "longest": "1.0.1",
+ "right-pad": "1.0.1",
+ "word-wrap": "1.2.3"
+ }
+ },
+ "d3": {
+ "version": "5.14.2",
+ "resolved": "https://registry.npmjs.org/d3/-/d3-5.14.2.tgz",
+ "integrity": "sha512-Ccipa9XrYW5N0QkP6u0Qb8kU6WekIXBiDenmZm1zLvuq/9pBBhRCJLCICEOsH5Og4B0Xw02bhqGkK5VN/oPH0w==",
+ "requires": {
+ "d3-array": "1.2.4",
+ "d3-axis": "1.0.12",
+ "d3-brush": "1.1.5",
+ "d3-chord": "1.0.6",
+ "d3-collection": "1.0.7",
+ "d3-color": "1.4.0",
+ "d3-contour": "1.3.2",
+ "d3-dispatch": "1.0.6",
+ "d3-drag": "1.2.5",
+ "d3-dsv": "1.2.0",
+ "d3-ease": "1.0.6",
+ "d3-fetch": "1.1.2",
+ "d3-force": "1.2.1",
+ "d3-format": "1.4.2",
+ "d3-geo": "1.11.9",
+ "d3-hierarchy": "1.1.9",
+ "d3-interpolate": "1.1.6",
+ "d3-path": "1.0.9",
+ "d3-polygon": "1.0.6",
+ "d3-quadtree": "1.0.7",
+ "d3-random": "1.1.2",
+ "d3-scale": "2.2.2",
+ "d3-scale-chromatic": "1.5.0",
+ "d3-selection": "1.4.1",
+ "d3-shape": "1.3.7",
+ "d3-time": "1.1.0",
+ "d3-time-format": "2.2.2",
+ "d3-timer": "1.0.10",
+ "d3-transition": "1.3.2",
+ "d3-voronoi": "1.1.4",
+ "d3-zoom": "1.8.3"
+ }
+ },
+ "d3-array": {
+ "version": "1.2.4",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.2.4.tgz",
+ "integrity": "sha512-KHW6M86R+FUPYGb3R5XiYjXPq7VzwxZ22buHhAEVG5ztoEcZZMLov530mmccaqA1GghZArjQV46fuc8kUqhhHw=="
+ },
+ "d3-axis": {
+ "version": "1.0.12",
+ "resolved": "https://registry.npmjs.org/d3-axis/-/d3-axis-1.0.12.tgz",
+ "integrity": "sha512-ejINPfPSNdGFKEOAtnBtdkpr24c4d4jsei6Lg98mxf424ivoDP2956/5HDpIAtmHo85lqT4pruy+zEgvRUBqaQ=="
+ },
+ "d3-brush": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/d3-brush/-/d3-brush-1.1.5.tgz",
+ "integrity": "sha512-rEaJ5gHlgLxXugWjIkolTA0OyMvw8UWU1imYXy1v642XyyswmI1ybKOv05Ft+ewq+TFmdliD3VuK0pRp1VT/5A==",
+ "requires": {
+ "d3-dispatch": "1.0.6",
+ "d3-drag": "1.2.5",
+ "d3-interpolate": "1.1.6",
+ "d3-selection": "1.4.1",
+ "d3-transition": "1.3.2"
+ }
+ },
+ "d3-chord": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/d3-chord/-/d3-chord-1.0.6.tgz",
+ "integrity": "sha512-JXA2Dro1Fxw9rJe33Uv+Ckr5IrAa74TlfDEhE/jfLOaXegMQFQTAgAw9WnZL8+HxVBRXaRGCkrNU7pJeylRIuA==",
+ "requires": {
+ "d3-array": "1.2.4",
+ "d3-path": "1.0.9"
+ }
+ },
+ "d3-collection": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/d3-collection/-/d3-collection-1.0.7.tgz",
+ "integrity": "sha512-ii0/r5f4sjKNTfh84Di+DpztYwqKhEyUlKoPrzUFfeSkWxjW49xU2QzO9qrPrNkpdI0XJkfzvmTu8V2Zylln6A=="
+ },
+ "d3-color": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-1.4.0.tgz",
+ "integrity": "sha512-TzNPeJy2+iEepfiL92LAAB7fvnp/dV2YwANPVHdDWmYMm23qIJBYww3qT8I8C1wXrmrg4UWs7BKc2tKIgyjzHg=="
+ },
+ "d3-contour": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/d3-contour/-/d3-contour-1.3.2.tgz",
+ "integrity": "sha512-hoPp4K/rJCu0ladiH6zmJUEz6+u3lgR+GSm/QdM2BBvDraU39Vr7YdDCicJcxP1z8i9B/2dJLgDC1NcvlF8WCg==",
+ "requires": {
+ "d3-array": "1.2.4"
+ }
+ },
+ "d3-dispatch": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.6.tgz",
+ "integrity": "sha512-fVjoElzjhCEy+Hbn8KygnmMS7Or0a9sI2UzGwoB7cCtvI1XpVN9GpoYlnb3xt2YV66oXYb1fLJ8GMvP4hdU1RA=="
+ },
+ "d3-drag": {
+ "version": "1.2.5",
+ "resolved": "https://registry.npmjs.org/d3-drag/-/d3-drag-1.2.5.tgz",
+ "integrity": "sha512-rD1ohlkKQwMZYkQlYVCrSFxsWPzI97+W+PaEIBNTMxRuxz9RF0Hi5nJWHGVJ3Om9d2fRTe1yOBINJyy/ahV95w==",
+ "requires": {
+ "d3-dispatch": "1.0.6",
+ "d3-selection": "1.4.1"
+ }
+ },
+ "d3-dsv": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/d3-dsv/-/d3-dsv-1.2.0.tgz",
+ "integrity": "sha512-9yVlqvZcSOMhCYzniHE7EVUws7Fa1zgw+/EAV2BxJoG3ME19V6BQFBwI855XQDsxyOuG7NibqRMTtiF/Qup46g==",
+ "requires": {
+ "commander": "2.20.3",
+ "iconv-lite": "0.4.24",
+ "rw": "1.3.3"
+ }
+ },
+ "d3-ease": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-1.0.6.tgz",
+ "integrity": "sha512-SZ/lVU7LRXafqp7XtIcBdxnWl8yyLpgOmzAk0mWBI9gXNzLDx5ybZgnRbH9dN/yY5tzVBqCQ9avltSnqVwessQ=="
+ },
+ "d3-fetch": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/d3-fetch/-/d3-fetch-1.1.2.tgz",
+ "integrity": "sha512-S2loaQCV/ZeyTyIF2oP8D1K9Z4QizUzW7cWeAOAS4U88qOt3Ucf6GsmgthuYSdyB2HyEm4CeGvkQxWsmInsIVA==",
+ "requires": {
+ "d3-dsv": "1.2.0"
+ }
+ },
+ "d3-force": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/d3-force/-/d3-force-1.2.1.tgz",
+ "integrity": "sha512-HHvehyaiUlVo5CxBJ0yF/xny4xoaxFxDnBXNvNcfW9adORGZfyNF1dj6DGLKyk4Yh3brP/1h3rnDzdIAwL08zg==",
+ "requires": {
+ "d3-collection": "1.0.7",
+ "d3-dispatch": "1.0.6",
+ "d3-quadtree": "1.0.7",
+ "d3-timer": "1.0.10"
+ }
+ },
+ "d3-format": {
+ "version": "1.4.2",
+ "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.4.2.tgz",
+ "integrity": "sha512-gco1Ih54PgMsyIXgttLxEhNy/mXxq8+rLnCb5shQk+P5TsiySrwWU5gpB4zen626J4LIwBxHvDChyA8qDm57ww=="
+ },
+ "d3-geo": {
+ "version": "1.11.9",
+ "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-1.11.9.tgz",
+ "integrity": "sha512-9edcH6J3s/Aa3KJITWqFJbyB/8q3mMlA9Fi7z6yy+FAYMnRaxmC7jBhUnsINxVWD14GmqX3DK8uk7nV6/Ekt4A==",
+ "requires": {
+ "d3-array": "1.2.4"
+ }
+ },
+ "d3-hierarchy": {
+ "version": "1.1.9",
+ "resolved": "https://registry.npmjs.org/d3-hierarchy/-/d3-hierarchy-1.1.9.tgz",
+ "integrity": "sha512-j8tPxlqh1srJHAtxfvOUwKNYJkQuBFdM1+JAUfq6xqH5eAqf93L7oG1NVqDa4CpFZNvnNKtCYEUC8KY9yEn9lQ=="
+ },
+ "d3-interpolate": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-1.1.6.tgz",
+ "integrity": "sha512-mOnv5a+pZzkNIHtw/V6I+w9Lqm9L5bG3OTXPM5A+QO0yyVMQ4W1uZhR+VOJmazaOZXri2ppbiZ5BUNWT0pFM9A==",
+ "requires": {
+ "d3-color": "1.4.0"
+ }
+ },
+ "d3-path": {
+ "version": "1.0.9",
+ "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-1.0.9.tgz",
+ "integrity": "sha512-VLaYcn81dtHVTjEHd8B+pbe9yHWpXKZUC87PzoFmsFrJqgFwDe/qxfp5MlfsfM1V5E/iVt0MmEbWQ7FVIXh/bg=="
+ },
+ "d3-polygon": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/d3-polygon/-/d3-polygon-1.0.6.tgz",
+ "integrity": "sha512-k+RF7WvI08PC8reEoXa/w2nSg5AUMTi+peBD9cmFc+0ixHfbs4QmxxkarVal1IkVkgxVuk9JSHhJURHiyHKAuQ=="
+ },
+ "d3-quadtree": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/d3-quadtree/-/d3-quadtree-1.0.7.tgz",
+ "integrity": "sha512-RKPAeXnkC59IDGD0Wu5mANy0Q2V28L+fNe65pOCXVdVuTJS3WPKaJlFHer32Rbh9gIo9qMuJXio8ra4+YmIymA=="
+ },
+ "d3-random": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/d3-random/-/d3-random-1.1.2.tgz",
+ "integrity": "sha512-6AK5BNpIFqP+cx/sreKzNjWbwZQCSUatxq+pPRmFIQaWuoD+NrbVWw7YWpHiXpCQ/NanKdtGDuB+VQcZDaEmYQ=="
+ },
+ "d3-sankey": {
+ "version": "0.7.1",
+ "resolved": "https://registry.npmjs.org/d3-sankey/-/d3-sankey-0.7.1.tgz",
+ "integrity": "sha1-0imDImj8aaf+yEgD6WwiVqYUxSE=",
+ "requires": {
+ "d3-array": "1.2.4",
+ "d3-collection": "1.0.7",
+ "d3-shape": "1.3.7"
+ }
+ },
+ "d3-scale": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-2.2.2.tgz",
+ "integrity": "sha512-LbeEvGgIb8UMcAa0EATLNX0lelKWGYDQiPdHj+gLblGVhGLyNbaCn3EvrJf0A3Y/uOOU5aD6MTh5ZFCdEwGiCw==",
+ "requires": {
+ "d3-array": "1.2.4",
+ "d3-collection": "1.0.7",
+ "d3-format": "1.4.2",
+ "d3-interpolate": "1.1.6",
+ "d3-time": "1.1.0",
+ "d3-time-format": "2.2.2"
+ }
+ },
+ "d3-scale-chromatic": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/d3-scale-chromatic/-/d3-scale-chromatic-1.5.0.tgz",
+ "integrity": "sha512-ACcL46DYImpRFMBcpk9HhtIyC7bTBR4fNOPxwVSl0LfulDAwyiHyPOTqcDG1+t5d4P9W7t/2NAuWu59aKko/cg==",
+ "requires": {
+ "d3-color": "1.4.0",
+ "d3-interpolate": "1.1.6"
+ }
+ },
+ "d3-selection": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.4.1.tgz",
+ "integrity": "sha512-BTIbRjv/m5rcVTfBs4AMBLKs4x8XaaLkwm28KWu9S2vKNqXkXt2AH2Qf0sdPZHjFxcWg/YL53zcqAz+3g4/7PA=="
+ },
+ "d3-shape": {
+ "version": "1.3.7",
+ "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-1.3.7.tgz",
+ "integrity": "sha512-EUkvKjqPFUAZyOlhY5gzCxCeI0Aep04LwIRpsZ/mLFelJiUfnK56jo5JMDSE7yyP2kLSb6LtF+S5chMk7uqPqw==",
+ "requires": {
+ "d3-path": "1.0.9"
+ }
+ },
+ "d3-svg-legend": {
+ "version": "2.25.6",
+ "resolved": "https://registry.npmjs.org/d3-svg-legend/-/d3-svg-legend-2.25.6.tgz",
+ "integrity": "sha1-jY3BvWk8N47ki2+CPook5o8uGtI=",
+ "requires": {
+ "@types/d3-selection": "1.0.10",
+ "d3-array": "1.0.1",
+ "d3-dispatch": "1.0.1",
+ "d3-format": "1.0.2",
+ "d3-scale": "1.0.3",
+ "d3-selection": "1.0.2",
+ "d3-transition": "1.0.3"
+ },
+ "dependencies": {
+ "d3-array": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-1.0.1.tgz",
+ "integrity": "sha1-N1wCh0/NlsFu2fG89bSnvlPzWOc="
+ },
+ "d3-dispatch": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/d3-dispatch/-/d3-dispatch-1.0.1.tgz",
+ "integrity": "sha1-S9ZaQ87P9DGN653yRVKqi/KBqEA="
+ },
+ "d3-format": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-1.0.2.tgz",
+ "integrity": "sha1-E4YYMgtLvrQ7XA/zBRkHn7vXN14="
+ },
+ "d3-scale": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-1.0.3.tgz",
+ "integrity": "sha1-T56PDMLqDzkl/wSsJ63AkEX6TJA=",
+ "requires": {
+ "d3-array": "1.0.1",
+ "d3-collection": "1.0.7",
+ "d3-color": "1.4.0",
+ "d3-format": "1.0.2",
+ "d3-interpolate": "1.1.6",
+ "d3-time": "1.1.0",
+ "d3-time-format": "2.2.2"
+ }
+ },
+ "d3-selection": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/d3-selection/-/d3-selection-1.0.2.tgz",
+ "integrity": "sha1-rmYq/UcCrJxdoDmyEHoXZPockHA="
+ },
+ "d3-transition": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.0.3.tgz",
+ "integrity": "sha1-kdyYa92zCXNjkyCoXbcs5KsaJ7s=",
+ "requires": {
+ "d3-color": "1.4.0",
+ "d3-dispatch": "1.0.1",
+ "d3-ease": "1.0.6",
+ "d3-interpolate": "1.1.6",
+ "d3-selection": "1.0.2",
+ "d3-timer": "1.0.10"
+ }
+ }
+ }
+ },
+ "d3-time": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-1.1.0.tgz",
+ "integrity": "sha512-Xh0isrZ5rPYYdqhAVk8VLnMEidhz5aP7htAADH6MfzgmmicPkTo8LhkLxci61/lCB7n7UmE3bN0leRt+qvkLxA=="
+ },
+ "d3-time-format": {
+ "version": "2.2.2",
+ "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-2.2.2.tgz",
+ "integrity": "sha512-pweL2Ri2wqMY+wlW/wpkl8T3CUzKAha8S9nmiQlMABab8r5MJN0PD1V4YyRNVaKQfeh4Z0+VO70TLw6ESVOYzw==",
+ "requires": {
+ "d3-time": "1.1.0"
+ }
+ },
+ "d3-timer": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-1.0.10.tgz",
+ "integrity": "sha512-B1JDm0XDaQC+uvo4DT79H0XmBskgS3l6Ve+1SBCfxgmtIb1AVrPIoqd+nPSv+loMX8szQ0sVUhGngL7D5QPiXw=="
+ },
+ "d3-transition": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/d3-transition/-/d3-transition-1.3.2.tgz",
+ "integrity": "sha512-sc0gRU4PFqZ47lPVHloMn9tlPcv8jxgOQg+0zjhfZXMQuvppjG6YuwdMBE0TuqCZjeJkLecku/l9R0JPcRhaDA==",
+ "requires": {
+ "d3-color": "1.4.0",
+ "d3-dispatch": "1.0.6",
+ "d3-ease": "1.0.6",
+ "d3-interpolate": "1.1.6",
+ "d3-selection": "1.4.1",
+ "d3-timer": "1.0.10"
+ }
+ },
+ "d3-voronoi": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/d3-voronoi/-/d3-voronoi-1.1.4.tgz",
+ "integrity": "sha512-dArJ32hchFsrQ8uMiTBLq256MpnZjeuBtdHpaDlYuQyjU0CVzCJl/BVW+SkszaAeH95D/8gxqAhgx0ouAWAfRg=="
+ },
+ "d3-zoom": {
+ "version": "1.8.3",
+ "resolved": "https://registry.npmjs.org/d3-zoom/-/d3-zoom-1.8.3.tgz",
+ "integrity": "sha512-VoLXTK4wvy1a0JpH2Il+F2CiOhVu7VRXWF5M/LroMIh3/zBAC3WAt7QoIvPibOavVo20hN6/37vwAsdBejLyKQ==",
+ "requires": {
+ "d3-dispatch": "1.0.6",
+ "d3-drag": "1.2.5",
+ "d3-interpolate": "1.1.6",
+ "d3-selection": "1.4.1",
+ "d3-transition": "1.3.2"
+ }
+ },
+ "dagre": {
+ "version": "0.8.4",
+ "resolved": "https://registry.npmjs.org/dagre/-/dagre-0.8.4.tgz",
+ "integrity": "sha512-Dj0csFDrWYKdavwROb9FccHfTC4fJbyF/oJdL9LNZJ8WUvl968P6PAKEriGqfbdArVJEmmfA+UyumgWEwcHU6A==",
+ "requires": {
+ "graphlib": "2.1.7",
+ "lodash": "4.17.15"
+ }
+ },
+ "damerau-levenshtein": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz",
+ "integrity": "sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==",
+ "dev": true
+ },
+ "dashdash": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+ "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "assert-plus": "1.0.0"
+ }
+ },
+ "debug": {
+ "version": "2.6.9",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+ "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+ "dev": true,
+ "requires": {
+ "ms": "2.0.0"
+ }
+ },
+ "decamelize": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+ "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=",
+ "dev": true
+ },
+ "decode-uri-component": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
+ "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
+ "dev": true
+ },
+ "deep-equal": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
+ "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
+ "dev": true,
+ "requires": {
+ "is-arguments": "1.0.4",
+ "is-date-object": "1.0.1",
+ "is-regex": "1.0.4",
+ "object-is": "1.0.1",
+ "object-keys": "1.1.1",
+ "regexp.prototype.flags": "1.2.0"
+ }
+ },
+ "deep-is": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+ "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+ "dev": true
+ },
+ "default-gateway": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+ "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+ "dev": true,
+ "requires": {
+ "execa": "1.0.0",
+ "ip-regex": "2.1.0"
+ }
+ },
+ "define-properties": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+ "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+ "dev": true,
+ "requires": {
+ "object-keys": "1.1.1"
+ }
+ },
+ "define-property": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+ "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "1.0.2",
+ "isobject": "3.0.1"
+ },
+ "dependencies": {
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "1.0.0",
+ "is-data-descriptor": "1.0.0",
+ "kind-of": "6.0.2"
+ }
+ }
+ }
+ },
+ "del": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+ "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+ "dev": true,
+ "requires": {
+ "@types/glob": "7.1.1",
+ "globby": "6.1.0",
+ "is-path-cwd": "2.2.0",
+ "is-path-in-cwd": "2.1.0",
+ "p-map": "2.1.0",
+ "pify": "4.0.1",
+ "rimraf": "2.7.1"
+ }
+ },
+ "delayed-stream": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+ "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+ "dev": true
+ },
+ "depd": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+ "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+ "dev": true
+ },
+ "des.js": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
+ "integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.4",
+ "minimalistic-assert": "1.0.1"
+ }
+ },
+ "destroy": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
+ "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
+ "dev": true
+ },
+ "detect-file": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
+ "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=",
+ "dev": true
+ },
+ "detect-node": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz",
+ "integrity": "sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==",
+ "dev": true
+ },
+ "diffie-hellman": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz",
+ "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==",
+ "dev": true,
+ "requires": {
+ "bn.js": "4.11.8",
+ "miller-rabin": "4.0.1",
+ "randombytes": "2.1.0"
+ }
+ },
+ "dns-equal": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz",
+ "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=",
+ "dev": true
+ },
+ "dns-packet": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz",
+ "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==",
+ "dev": true,
+ "requires": {
+ "ip": "1.1.5",
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "dns-txt": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz",
+ "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=",
+ "dev": true,
+ "requires": {
+ "buffer-indexof": "1.1.1"
+ }
+ },
+ "doctrine": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
+ "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+ "dev": true,
+ "requires": {
+ "esutils": "2.0.3"
+ }
+ },
+ "dom-to-image": {
+ "version": "2.6.0",
+ "resolved": "https://registry.npmjs.org/dom-to-image/-/dom-to-image-2.6.0.tgz",
+ "integrity": "sha1-ilA2CAiMh7HCL5A0rgMuGJiVWGc="
+ },
+ "domain-browser": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+ "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+ "dev": true
+ },
+ "duplexify": {
+ "version": "3.7.1",
+ "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.7.1.tgz",
+ "integrity": "sha512-07z8uv2wMyS51kKhD1KsdXJg5WQ6t93RneqRxUHnskXVtlYYkLqM0gqStQZ3pj073g687jPCHrqNfCzawLYh5g==",
+ "dev": true,
+ "requires": {
+ "end-of-stream": "1.4.4",
+ "inherits": "2.0.4",
+ "readable-stream": "2.3.6",
+ "stream-shift": "1.0.0"
+ }
+ },
+ "ecc-jsbn": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz",
+ "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "jsbn": "0.1.1",
+ "safer-buffer": "2.1.2"
+ }
+ },
+ "ee-first": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+ "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+ "dev": true
+ },
+ "electron-to-chromium": {
+ "version": "1.3.309",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.309.tgz",
+ "integrity": "sha512-NZd91XD15v2UPLjYXoN/gLnkwIUQjdH4SQLpRCCQiYJH6BBkfgp5pWemBJPr1rZ2dl8Ee3o91O9Sa1QuAfZmog==",
+ "dev": true
+ },
+ "elliptic": {
+ "version": "6.5.1",
+ "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.1.tgz",
+ "integrity": "sha512-xvJINNLbTeWQjrl6X+7eQCrIy/YPv5XCpKW6kB5mKvtnGILoLDcySuwomfdzt0BMdLNVnuRNTuzKNHj0bva1Cg==",
+ "dev": true,
+ "requires": {
+ "bn.js": "4.11.8",
+ "brorand": "1.1.0",
+ "hash.js": "1.1.7",
+ "hmac-drbg": "1.0.1",
+ "inherits": "2.0.4",
+ "minimalistic-assert": "1.0.1",
+ "minimalistic-crypto-utils": "1.0.1"
+ }
+ },
+ "emoji-regex": {
+ "version": "7.0.3",
+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
+ "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==",
+ "dev": true
+ },
+ "emojis-list": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz",
+ "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=",
+ "dev": true
+ },
+ "encodeurl": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+ "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+ "dev": true
+ },
+ "encoding": {
+ "version": "0.1.12",
+ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz",
+ "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=",
+ "requires": {
+ "iconv-lite": "0.4.24"
+ }
+ },
+ "end-of-stream": {
+ "version": "1.4.4",
+ "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+ "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+ "dev": true,
+ "requires": {
+ "once": "1.4.0"
+ }
+ },
+ "enhanced-resolve": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz",
+ "integrity": "sha512-98p2zE+rL7/g/DzMHMTF4zZlCgeVdJ7yr6xzEpJRYwFYrGi9ANdn5DnJURg6RpBkyk60XYDnWIv51VfIhfNGuA==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.2.3",
+ "memory-fs": "0.5.0",
+ "tapable": "1.1.3"
+ },
+ "dependencies": {
+ "memory-fs": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.5.0.tgz",
+ "integrity": "sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==",
+ "dev": true,
+ "requires": {
+ "errno": "0.1.7",
+ "readable-stream": "2.3.6"
+ }
+ }
+ }
+ },
+ "errno": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
+ "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
+ "dev": true,
+ "requires": {
+ "prr": "1.0.1"
+ }
+ },
+ "error-ex": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+ "dev": true,
+ "requires": {
+ "is-arrayish": "0.2.1"
+ }
+ },
+ "es-abstract": {
+ "version": "1.16.0",
+ "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.16.0.tgz",
+ "integrity": "sha512-xdQnfykZ9JMEiasTAJZJdMWCQ1Vm00NBw79/AWi7ELfZuuPCSOMDZbT9mkOfSctVtfhb+sAAzrm+j//GjjLHLg==",
+ "dev": true,
+ "requires": {
+ "es-to-primitive": "1.2.1",
+ "function-bind": "1.1.1",
+ "has": "1.0.3",
+ "has-symbols": "1.0.1",
+ "is-callable": "1.1.4",
+ "is-regex": "1.0.4",
+ "object-inspect": "1.7.0",
+ "object-keys": "1.1.1",
+ "string.prototype.trimleft": "2.1.0",
+ "string.prototype.trimright": "2.1.0"
+ }
+ },
+ "es-to-primitive": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz",
+ "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==",
+ "dev": true,
+ "requires": {
+ "is-callable": "1.1.4",
+ "is-date-object": "1.0.1",
+ "is-symbol": "1.0.3"
+ }
+ },
+ "escape-html": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+ "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+ "dev": true
+ },
+ "escape-string-regexp": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+ "dev": true
+ },
+ "eslint": {
+ "version": "5.16.0",
+ "resolved": "https://registry.npmjs.org/eslint/-/eslint-5.16.0.tgz",
+ "integrity": "sha512-S3Rz11i7c8AA5JPv7xAH+dOyq/Cu/VXHiHXBPOU1k/JAM5dXqQPt3qcrhpHSorXmrpu2g0gkIBVXAqCpzfoZIg==",
+ "dev": true,
+ "requires": {
+ "@babel/code-frame": "7.5.5",
+ "ajv": "6.10.2",
+ "chalk": "2.4.2",
+ "cross-spawn": "6.0.5",
+ "debug": "4.1.1",
+ "doctrine": "3.0.0",
+ "eslint-scope": "4.0.3",
+ "eslint-utils": "1.4.3",
+ "eslint-visitor-keys": "1.1.0",
+ "espree": "5.0.1",
+ "esquery": "1.0.1",
+ "esutils": "2.0.3",
+ "file-entry-cache": "5.0.1",
+ "functional-red-black-tree": "1.0.1",
+ "glob": "7.1.6",
+ "globals": "11.12.0",
+ "ignore": "4.0.6",
+ "import-fresh": "3.2.1",
+ "imurmurhash": "0.1.4",
+ "inquirer": "6.5.2",
+ "js-yaml": "3.13.1",
+ "json-stable-stringify-without-jsonify": "1.0.1",
+ "levn": "0.3.0",
+ "lodash": "4.17.15",
+ "minimatch": "3.0.4",
+ "mkdirp": "0.5.1",
+ "natural-compare": "1.4.0",
+ "optionator": "0.8.3",
+ "path-is-inside": "1.0.2",
+ "progress": "2.0.3",
+ "regexpp": "2.0.1",
+ "semver": "5.7.1",
+ "strip-ansi": "4.0.0",
+ "strip-json-comments": "2.0.1",
+ "table": "5.4.6",
+ "text-table": "0.2.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
+ }
+ },
+ "eslint-config-airbnb": {
+ "version": "17.1.1",
+ "resolved": "https://registry.npmjs.org/eslint-config-airbnb/-/eslint-config-airbnb-17.1.1.tgz",
+ "integrity": "sha512-xCu//8a/aWqagKljt+1/qAM62BYZeNq04HmdevG5yUGWpja0I/xhqd6GdLRch5oetEGFiJAnvtGuTEAese53Qg==",
+ "dev": true,
+ "requires": {
+ "eslint-config-airbnb-base": "13.2.0",
+ "object.assign": "4.1.0",
+ "object.entries": "1.1.0"
+ }
+ },
+ "eslint-config-airbnb-base": {
+ "version": "13.2.0",
+ "resolved": "https://registry.npmjs.org/eslint-config-airbnb-base/-/eslint-config-airbnb-base-13.2.0.tgz",
+ "integrity": "sha512-1mg/7eoB4AUeB0X1c/ho4vb2gYkNH8Trr/EgCT/aGmKhhG+F6vF5s8+iRBlWAzFIAphxIdp3YfEKgEl0f9Xg+w==",
+ "dev": true,
+ "requires": {
+ "confusing-browser-globals": "1.0.9",
+ "object.assign": "4.1.0",
+ "object.entries": "1.1.0"
+ }
+ },
+ "eslint-import-resolver-node": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.2.tgz",
+ "integrity": "sha512-sfmTqJfPSizWu4aymbPr4Iidp5yKm8yDkHp+Ir3YiTHiiDfxh69mOUsmiqW6RZ9zRXFaF64GtYmN7e+8GHBv6Q==",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9",
+ "resolve": "1.12.0"
+ }
+ },
+ "eslint-module-utils": {
+ "version": "2.4.1",
+ "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.4.1.tgz",
+ "integrity": "sha512-H6DOj+ejw7Tesdgbfs4jeS4YMFrT8uI8xwd1gtQqXssaR0EQ26L+2O/w6wkYFy2MymON0fTwHmXBvvfLNZVZEw==",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9",
+ "pkg-dir": "2.0.0"
+ },
+ "dependencies": {
+ "find-up": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "dev": true,
+ "requires": {
+ "locate-path": "2.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+ "dev": true,
+ "requires": {
+ "p-locate": "2.0.0",
+ "path-exists": "3.0.0"
+ }
+ },
+ "p-limit": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+ "dev": true,
+ "requires": {
+ "p-try": "1.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+ "dev": true,
+ "requires": {
+ "p-limit": "1.3.0"
+ }
+ },
+ "p-try": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+ "dev": true
+ },
+ "pkg-dir": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz",
+ "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=",
+ "dev": true,
+ "requires": {
+ "find-up": "2.1.0"
+ }
+ }
+ }
+ },
+ "eslint-plugin-import": {
+ "version": "2.18.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.18.2.tgz",
+ "integrity": "sha512-5ohpsHAiUBRNaBWAF08izwUGlbrJoJJ+W9/TBwsGoR1MnlgfwMIKrFeSjWbt6moabiXW9xNvtFz+97KHRfI4HQ==",
+ "dev": true,
+ "requires": {
+ "array-includes": "3.0.3",
+ "contains-path": "0.1.0",
+ "debug": "2.6.9",
+ "doctrine": "1.5.0",
+ "eslint-import-resolver-node": "0.3.2",
+ "eslint-module-utils": "2.4.1",
+ "has": "1.0.3",
+ "minimatch": "3.0.4",
+ "object.values": "1.1.0",
+ "read-pkg-up": "2.0.0",
+ "resolve": "1.12.0"
+ },
+ "dependencies": {
+ "doctrine": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz",
+ "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=",
+ "dev": true,
+ "requires": {
+ "esutils": "2.0.3",
+ "isarray": "1.0.0"
+ }
+ }
+ }
+ },
+ "eslint-plugin-jsx-a11y": {
+ "version": "6.2.3",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.2.3.tgz",
+ "integrity": "sha512-CawzfGt9w83tyuVekn0GDPU9ytYtxyxyFZ3aSWROmnRRFQFT2BiPJd7jvRdzNDi6oLWaS2asMeYSNMjWTV4eNg==",
+ "dev": true,
+ "requires": {
+ "@babel/runtime": "7.7.2",
+ "aria-query": "3.0.0",
+ "array-includes": "3.0.3",
+ "ast-types-flow": "0.0.7",
+ "axobject-query": "2.0.2",
+ "damerau-levenshtein": "1.0.5",
+ "emoji-regex": "7.0.3",
+ "has": "1.0.3",
+ "jsx-ast-utils": "2.2.3"
+ }
+ },
+ "eslint-plugin-react": {
+ "version": "7.16.0",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.16.0.tgz",
+ "integrity": "sha512-GacBAATewhhptbK3/vTP09CbFrgUJmBSaaRcWdbQLFvUZy9yVcQxigBNHGPU/KE2AyHpzj3AWXpxoMTsIDiHug==",
+ "dev": true,
+ "requires": {
+ "array-includes": "3.0.3",
+ "doctrine": "2.1.0",
+ "has": "1.0.3",
+ "jsx-ast-utils": "2.2.3",
+ "object.entries": "1.1.0",
+ "object.fromentries": "2.0.1",
+ "object.values": "1.1.0",
+ "prop-types": "15.7.2",
+ "resolve": "1.12.0"
+ },
+ "dependencies": {
+ "doctrine": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+ "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+ "dev": true,
+ "requires": {
+ "esutils": "2.0.3"
+ }
+ }
+ }
+ },
+ "eslint-scope": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-4.0.3.tgz",
+ "integrity": "sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==",
+ "dev": true,
+ "requires": {
+ "esrecurse": "4.2.1",
+ "estraverse": "4.3.0"
+ }
+ },
+ "eslint-utils": {
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz",
+ "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==",
+ "dev": true,
+ "requires": {
+ "eslint-visitor-keys": "1.1.0"
+ }
+ },
+ "eslint-visitor-keys": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz",
+ "integrity": "sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==",
+ "dev": true
+ },
+ "espree": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/espree/-/espree-5.0.1.tgz",
+ "integrity": "sha512-qWAZcWh4XE/RwzLJejfcofscgMc9CamR6Tn1+XRXNzrvUSSbiAjGOI/fggztjIi7y9VLPqnICMIPiGyr8JaZ0A==",
+ "dev": true,
+ "requires": {
+ "acorn": "6.3.0",
+ "acorn-jsx": "5.1.0",
+ "eslint-visitor-keys": "1.1.0"
+ }
+ },
+ "esprima": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+ "dev": true
+ },
+ "esquery": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.0.1.tgz",
+ "integrity": "sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==",
+ "dev": true,
+ "requires": {
+ "estraverse": "4.3.0"
+ }
+ },
+ "esrecurse": {
+ "version": "4.2.1",
+ "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz",
+ "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==",
+ "dev": true,
+ "requires": {
+ "estraverse": "4.3.0"
+ }
+ },
+ "estraverse": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
+ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+ "dev": true
+ },
+ "esutils": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+ "dev": true
+ },
+ "etag": {
+ "version": "1.8.1",
+ "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+ "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=",
+ "dev": true
+ },
+ "eventemitter3": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.0.tgz",
+ "integrity": "sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==",
+ "dev": true
+ },
+ "events": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/events/-/events-3.0.0.tgz",
+ "integrity": "sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==",
+ "dev": true
+ },
+ "eventsource": {
+ "version": "1.0.7",
+ "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-1.0.7.tgz",
+ "integrity": "sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==",
+ "dev": true,
+ "requires": {
+ "original": "1.0.2"
+ }
+ },
+ "evp_bytestokey": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
+ "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+ "dev": true,
+ "requires": {
+ "md5.js": "1.3.5",
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "execa": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+ "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+ "dev": true,
+ "requires": {
+ "cross-spawn": "6.0.5",
+ "get-stream": "4.1.0",
+ "is-stream": "1.1.0",
+ "npm-run-path": "2.0.2",
+ "p-finally": "1.0.0",
+ "signal-exit": "3.0.2",
+ "strip-eof": "1.0.0"
+ }
+ },
+ "expand-brackets": {
+ "version": "2.1.4",
+ "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+ "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9",
+ "define-property": "0.2.5",
+ "extend-shallow": "2.0.1",
+ "posix-character-classes": "0.1.1",
+ "regex-not": "1.0.2",
+ "snapdragon": "0.8.2",
+ "to-regex": "3.0.2"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "0.1.6"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
+ "expand-tilde": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz",
+ "integrity": "sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=",
+ "dev": true,
+ "requires": {
+ "homedir-polyfill": "1.0.3"
+ }
+ },
+ "express": {
+ "version": "4.17.1",
+ "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
+ "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+ "dev": true,
+ "requires": {
+ "accepts": "1.3.7",
+ "array-flatten": "1.1.1",
+ "body-parser": "1.19.0",
+ "content-disposition": "0.5.3",
+ "content-type": "1.0.4",
+ "cookie": "0.4.0",
+ "cookie-signature": "1.0.6",
+ "debug": "2.6.9",
+ "depd": "1.1.2",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "etag": "1.8.1",
+ "finalhandler": "1.1.2",
+ "fresh": "0.5.2",
+ "merge-descriptors": "1.0.1",
+ "methods": "1.1.2",
+ "on-finished": "2.3.0",
+ "parseurl": "1.3.3",
+ "path-to-regexp": "0.1.7",
+ "proxy-addr": "2.0.5",
+ "qs": "6.7.0",
+ "range-parser": "1.2.1",
+ "safe-buffer": "5.1.2",
+ "send": "0.17.1",
+ "serve-static": "1.14.1",
+ "setprototypeof": "1.1.1",
+ "statuses": "1.5.0",
+ "type-is": "1.6.18",
+ "utils-merge": "1.0.1",
+ "vary": "1.1.2"
+ },
+ "dependencies": {
+ "array-flatten": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+ "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+ "dev": true
+ },
+ "qs": {
+ "version": "6.7.0",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
+ "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+ "dev": true
+ }
+ }
+ },
+ "extend": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
+ "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
+ "dev": true,
+ "optional": true
+ },
+ "extend-shallow": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+ "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
+ "dev": true,
+ "requires": {
+ "assign-symbols": "1.0.0",
+ "is-extendable": "1.0.1"
+ },
+ "dependencies": {
+ "is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "requires": {
+ "is-plain-object": "2.0.4"
+ }
+ }
+ }
+ },
+ "external-editor": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+ "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+ "dev": true,
+ "requires": {
+ "chardet": "0.7.0",
+ "iconv-lite": "0.4.24",
+ "tmp": "0.0.33"
+ }
+ },
+ "extglob": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+ "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+ "dev": true,
+ "requires": {
+ "array-unique": "0.3.2",
+ "define-property": "1.0.0",
+ "expand-brackets": "2.1.4",
+ "extend-shallow": "2.0.1",
+ "fragment-cache": "0.2.1",
+ "regex-not": "1.0.2",
+ "snapdragon": "0.8.2",
+ "to-regex": "3.0.2"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "1.0.2"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "1.0.0",
+ "is-data-descriptor": "1.0.0",
+ "kind-of": "6.0.2"
+ }
+ }
+ }
+ },
+ "extsprintf": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+ "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+ "dev": true
+ },
+ "fast-deep-equal": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz",
+ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=",
+ "dev": true
+ },
+ "fast-json-stable-stringify": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+ "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+ "dev": true
+ },
+ "fast-levenshtein": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+ "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+ "dev": true
+ },
+ "faye-websocket": {
+ "version": "0.10.0",
+ "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz",
+ "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=",
+ "dev": true,
+ "requires": {
+ "websocket-driver": "0.7.3"
+ }
+ },
+ "fbjs": {
+ "version": "0.8.17",
+ "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz",
+ "integrity": "sha1-xNWY6taUkRJlPWWIsBpc3Nn5D90=",
+ "requires": {
+ "core-js": "1.2.7",
+ "isomorphic-fetch": "2.2.1",
+ "loose-envify": "1.4.0",
+ "object-assign": "4.1.1",
+ "promise": "7.3.1",
+ "setimmediate": "1.0.5",
+ "ua-parser-js": "0.7.20"
+ },
+ "dependencies": {
+ "core-js": {
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-1.2.7.tgz",
+ "integrity": "sha1-ZSKUwUZR2yj6k70tX/KYOk8IxjY="
+ }
+ }
+ },
+ "fecha": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/fecha/-/fecha-2.3.3.tgz",
+ "integrity": "sha512-lUGBnIamTAwk4znq5BcqsDaxSmZ9nDVJaij6NvRt/Tg4R69gERA+otPKbS86ROw9nxVMw2/mp1fnaiWqbs6Sdg=="
+ },
+ "figgy-pudding": {
+ "version": "3.5.1",
+ "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
+ "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+ "dev": true
+ },
+ "figures": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz",
+ "integrity": "sha1-OrGi0qYsi/tDGgyUy3l6L84nyWI=",
+ "dev": true,
+ "requires": {
+ "escape-string-regexp": "1.0.5"
+ }
+ },
+ "file-entry-cache": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz",
+ "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==",
+ "dev": true,
+ "requires": {
+ "flat-cache": "2.0.1"
+ }
+ },
+ "fill-range": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+ "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "2.0.1",
+ "is-number": "3.0.0",
+ "repeat-string": "1.6.1",
+ "to-regex-range": "2.1.1"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
+ "finalhandler": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+ "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "on-finished": "2.3.0",
+ "parseurl": "1.3.3",
+ "statuses": "1.5.0",
+ "unpipe": "1.0.0"
+ }
+ },
+ "find-babel-config": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.0.tgz",
+ "integrity": "sha512-jB2CHJeqy6a820ssiqwrKMeyC6nNdmrcgkKWJWmpoxpE8RKciYJXCcXRq1h2AzCo5I5BJeN2tkGEO3hLTuePRA==",
+ "dev": true,
+ "requires": {
+ "json5": "0.5.1",
+ "path-exists": "3.0.0"
+ },
+ "dependencies": {
+ "json5": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
+ "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=",
+ "dev": true
+ }
+ }
+ },
+ "find-cache-dir": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+ "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+ "dev": true,
+ "requires": {
+ "commondir": "1.0.1",
+ "make-dir": "2.1.0",
+ "pkg-dir": "3.0.0"
+ }
+ },
+ "find-up": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+ "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+ "dev": true,
+ "requires": {
+ "locate-path": "3.0.0"
+ }
+ },
+ "findup-sync": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
+ "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+ "dev": true,
+ "requires": {
+ "detect-file": "1.0.0",
+ "is-glob": "4.0.1",
+ "micromatch": "3.1.10",
+ "resolve-dir": "1.0.1"
+ }
+ },
+ "flat-cache": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz",
+ "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==",
+ "dev": true,
+ "requires": {
+ "flatted": "2.0.1",
+ "rimraf": "2.6.3",
+ "write": "1.0.3"
+ },
+ "dependencies": {
+ "rimraf": {
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+ "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
+ "dev": true,
+ "requires": {
+ "glob": "7.1.6"
+ }
+ }
+ }
+ },
+ "flatted": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz",
+ "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==",
+ "dev": true
+ },
+ "flatten": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.3.tgz",
+ "integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
+ "dev": true
+ },
+ "flush-write-stream": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+ "integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.4",
+ "readable-stream": "2.3.6"
+ }
+ },
+ "follow-redirects": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.9.0.tgz",
+ "integrity": "sha512-CRcPzsSIbXyVDl0QI01muNDu69S8trU4jArW9LpOt2WtC6LyUJetcIrmfHsRBx7/Jb6GHJUiuqyYxPooFfNt6A==",
+ "dev": true,
+ "requires": {
+ "debug": "3.2.6"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
+ }
+ },
+ "for-in": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+ "dev": true
+ },
+ "forever-agent": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+ "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+ "dev": true,
+ "optional": true
+ },
+ "form-data": {
+ "version": "2.3.3",
+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz",
+ "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "asynckit": "0.4.0",
+ "combined-stream": "1.0.8",
+ "mime-types": "2.1.25"
+ }
+ },
+ "forwarded": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
+ "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
+ "dev": true
+ },
+ "fragment-cache": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+ "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
+ "dev": true,
+ "requires": {
+ "map-cache": "0.2.2"
+ }
+ },
+ "fresh": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+ "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=",
+ "dev": true
+ },
+ "from2": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz",
+ "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.4",
+ "readable-stream": "2.3.6"
+ }
+ },
+ "fs-readdir-recursive": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz",
+ "integrity": "sha512-GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==",
+ "dev": true
+ },
+ "fs-write-stream-atomic": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz",
+ "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.2.3",
+ "iferr": "0.1.5",
+ "imurmurhash": "0.1.4",
+ "readable-stream": "2.3.6"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+ "dev": true
+ },
+ "fsevents": {
+ "version": "1.2.9",
+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.9.tgz",
+ "integrity": "sha512-oeyj2H3EjjonWcFjD5NvZNE9Rqe4UW+nQBU2HNeKw0koVLEFIhtyETyAakeAM3de7Z/SW5kcA+fZUait9EApnw==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "nan": "2.14.0",
+ "node-pre-gyp": "0.12.0"
+ },
+ "dependencies": {
+ "abbrev": {
+ "version": "1.1.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "ansi-regex": {
+ "version": "2.1.1",
+ "bundled": true,
+ "dev": true
+ },
+ "aproba": {
+ "version": "1.2.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "are-we-there-yet": {
+ "version": "1.1.5",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "delegates": "1.0.0",
+ "readable-stream": "2.3.6"
+ }
+ },
+ "balanced-match": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true
+ },
+ "brace-expansion": {
+ "version": "1.1.11",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "balanced-match": "1.0.0",
+ "concat-map": "0.0.1"
+ }
+ },
+ "chownr": {
+ "version": "1.1.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "code-point-at": {
+ "version": "1.1.0",
+ "bundled": true,
+ "dev": true
+ },
+ "concat-map": {
+ "version": "0.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "console-control-strings": {
+ "version": "1.1.0",
+ "bundled": true,
+ "dev": true
+ },
+ "core-util-is": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "debug": {
+ "version": "4.1.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ms": "2.1.1"
+ }
+ },
+ "deep-extend": {
+ "version": "0.6.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "delegates": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "detect-libc": {
+ "version": "1.0.3",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "fs-minipass": {
+ "version": "1.2.5",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "minipass": "2.3.5"
+ }
+ },
+ "fs.realpath": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "gauge": {
+ "version": "2.7.4",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "aproba": "1.2.0",
+ "console-control-strings": "1.1.0",
+ "has-unicode": "2.0.1",
+ "object-assign": "4.1.1",
+ "signal-exit": "3.0.2",
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1",
+ "wide-align": "1.1.3"
+ }
+ },
+ "glob": {
+ "version": "7.1.3",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.3",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
+ }
+ },
+ "has-unicode": {
+ "version": "2.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "iconv-lite": {
+ "version": "0.4.24",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "safer-buffer": "2.1.2"
+ }
+ },
+ "ignore-walk": {
+ "version": "3.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "minimatch": "3.0.4"
+ }
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "once": "1.4.0",
+ "wrappy": "1.0.2"
+ }
+ },
+ "inherits": {
+ "version": "2.0.3",
+ "bundled": true,
+ "dev": true
+ },
+ "ini": {
+ "version": "1.3.5",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "number-is-nan": "1.0.1"
+ }
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "brace-expansion": "1.1.11"
+ }
+ },
+ "minimist": {
+ "version": "0.0.8",
+ "bundled": true,
+ "dev": true
+ },
+ "minipass": {
+ "version": "2.3.5",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "safe-buffer": "5.1.2",
+ "yallist": "3.0.3"
+ }
+ },
+ "minizlib": {
+ "version": "1.2.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "minipass": "2.3.5"
+ }
+ },
+ "mkdirp": {
+ "version": "0.5.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "minimist": "0.0.8"
+ }
+ },
+ "ms": {
+ "version": "2.1.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "needle": {
+ "version": "2.3.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "debug": "4.1.1",
+ "iconv-lite": "0.4.24",
+ "sax": "1.2.4"
+ }
+ },
+ "node-pre-gyp": {
+ "version": "0.12.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "detect-libc": "1.0.3",
+ "mkdirp": "0.5.1",
+ "needle": "2.3.0",
+ "nopt": "4.0.1",
+ "npm-packlist": "1.4.1",
+ "npmlog": "4.1.2",
+ "rc": "1.2.8",
+ "rimraf": "2.6.3",
+ "semver": "5.7.0",
+ "tar": "4.4.8"
+ }
+ },
+ "nopt": {
+ "version": "4.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "abbrev": "1.1.1",
+ "osenv": "0.1.5"
+ }
+ },
+ "npm-bundled": {
+ "version": "1.0.6",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "npm-packlist": {
+ "version": "1.4.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ignore-walk": "3.0.1",
+ "npm-bundled": "1.0.6"
+ }
+ },
+ "npmlog": {
+ "version": "4.1.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "are-we-there-yet": "1.1.5",
+ "console-control-strings": "1.1.0",
+ "gauge": "2.7.4",
+ "set-blocking": "2.0.0"
+ }
+ },
+ "number-is-nan": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true
+ },
+ "object-assign": {
+ "version": "4.1.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "once": {
+ "version": "1.4.0",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "wrappy": "1.0.2"
+ }
+ },
+ "os-homedir": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "osenv": {
+ "version": "0.1.5",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "os-homedir": "1.0.2",
+ "os-tmpdir": "1.0.2"
+ }
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "process-nextick-args": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "rc": {
+ "version": "1.2.8",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "deep-extend": "0.6.0",
+ "ini": "1.3.5",
+ "minimist": "1.2.0",
+ "strip-json-comments": "2.0.1"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "1.2.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "readable-stream": {
+ "version": "2.3.6",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.3",
+ "isarray": "1.0.0",
+ "process-nextick-args": "2.0.0",
+ "safe-buffer": "5.1.2",
+ "string_decoder": "1.1.1",
+ "util-deprecate": "1.0.2"
+ }
+ },
+ "rimraf": {
+ "version": "2.6.3",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "glob": "7.1.3"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "bundled": true,
+ "dev": true
+ },
+ "safer-buffer": {
+ "version": "2.1.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "sax": {
+ "version": "1.2.4",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "semver": {
+ "version": "5.7.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "set-blocking": {
+ "version": "2.0.0",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "signal-exit": {
+ "version": "3.0.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "string-width": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "code-point-at": "1.1.0",
+ "is-fullwidth-code-point": "1.0.0",
+ "strip-ansi": "3.0.1"
+ }
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "bundled": true,
+ "dev": true,
+ "requires": {
+ "ansi-regex": "2.1.1"
+ }
+ },
+ "strip-json-comments": {
+ "version": "2.0.1",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "tar": {
+ "version": "4.4.8",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "chownr": "1.1.1",
+ "fs-minipass": "1.2.5",
+ "minipass": "2.3.5",
+ "minizlib": "1.2.1",
+ "mkdirp": "0.5.1",
+ "safe-buffer": "5.1.2",
+ "yallist": "3.0.3"
+ }
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true,
+ "optional": true
+ },
+ "wide-align": {
+ "version": "1.1.3",
+ "bundled": true,
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "string-width": "1.0.2"
+ }
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "bundled": true,
+ "dev": true
+ },
+ "yallist": {
+ "version": "3.0.3",
+ "bundled": true,
+ "dev": true
+ }
+ }
+ },
+ "function-bind": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+ "dev": true
+ },
+ "functional-red-black-tree": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz",
+ "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=",
+ "dev": true
+ },
+ "get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "dev": true
+ },
+ "get-stream": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+ "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+ "dev": true,
+ "requires": {
+ "pump": "3.0.0"
+ }
+ },
+ "get-value": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+ "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
+ "dev": true
+ },
+ "getpass": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+ "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "assert-plus": "1.0.0"
+ }
+ },
+ "gg-editor-core": {
+ "version": "1.3.4",
+ "resolved": "https://registry.npmjs.org/gg-editor-core/-/gg-editor-core-1.3.4.tgz",
+ "integrity": "sha512-h2ALYh/os7XphrhR967HQoc48tX8+OoG+bCoDEphwLDwqOieoIAEngqjy7DBv1874fxhw7ry1F0bKHdzCvrVIQ==",
+ "requires": {
+ "@antv/g6": "2.2.6",
+ "ant-design-palettes": "1.1.3",
+ "wolfy87-eventemitter": "5.2.8"
+ }
+ },
+ "glob": {
+ "version": "7.1.6",
+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+ "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+ "dev": true,
+ "requires": {
+ "fs.realpath": "1.0.0",
+ "inflight": "1.0.6",
+ "inherits": "2.0.4",
+ "minimatch": "3.0.4",
+ "once": "1.4.0",
+ "path-is-absolute": "1.0.1"
+ }
+ },
+ "glob-parent": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz",
+ "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=",
+ "dev": true,
+ "requires": {
+ "is-glob": "3.1.0",
+ "path-dirname": "1.0.2"
+ },
+ "dependencies": {
+ "is-glob": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
+ "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+ "dev": true,
+ "requires": {
+ "is-extglob": "2.1.1"
+ }
+ }
+ }
+ },
+ "global-modules": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-2.0.0.tgz",
+ "integrity": "sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==",
+ "dev": true,
+ "requires": {
+ "global-prefix": "3.0.0"
+ },
+ "dependencies": {
+ "global-prefix": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-3.0.0.tgz",
+ "integrity": "sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==",
+ "dev": true,
+ "requires": {
+ "ini": "1.3.5",
+ "kind-of": "6.0.2",
+ "which": "1.3.1"
+ }
+ }
+ }
+ },
+ "global-prefix": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz",
+ "integrity": "sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=",
+ "dev": true,
+ "requires": {
+ "expand-tilde": "2.0.2",
+ "homedir-polyfill": "1.0.3",
+ "ini": "1.3.5",
+ "is-windows": "1.0.2",
+ "which": "1.3.1"
+ }
+ },
+ "globals": {
+ "version": "11.12.0",
+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+ "dev": true
+ },
+ "globby": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+ "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=",
+ "dev": true,
+ "requires": {
+ "array-union": "1.0.2",
+ "glob": "7.1.6",
+ "object-assign": "4.1.1",
+ "pify": "2.3.0",
+ "pinkie-promise": "2.0.1"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "dev": true
+ }
+ }
+ },
+ "graceful-fs": {
+ "version": "4.2.3",
+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.3.tgz",
+ "integrity": "sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==",
+ "dev": true
+ },
+ "graphlib": {
+ "version": "2.1.7",
+ "resolved": "https://registry.npmjs.org/graphlib/-/graphlib-2.1.7.tgz",
+ "integrity": "sha512-TyI9jIy2J4j0qgPmOOrHTCtpPqJGN/aurBwc6ZT+bRii+di1I+Wv3obRhVrmBEXet+qkMaEX67dXrwsd3QQM6w==",
+ "requires": {
+ "lodash": "4.17.15"
+ }
+ },
+ "handle-thing": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.0.tgz",
+ "integrity": "sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==",
+ "dev": true
+ },
+ "har-schema": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+ "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+ "dev": true,
+ "optional": true
+ },
+ "har-validator": {
+ "version": "5.1.3",
+ "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.3.tgz",
+ "integrity": "sha512-sNvOCzEQNr/qrvJgc3UG/kD4QtlHycrzwS+6mfTrrSq97BvaYcPZZI1ZSqGSPR73Cxn4LKTD4PttRwfU7jWq5g==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "ajv": "6.10.2",
+ "har-schema": "2.0.0"
+ }
+ },
+ "has": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
+ "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
+ "dev": true,
+ "requires": {
+ "function-bind": "1.1.1"
+ }
+ },
+ "has-flag": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+ "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=",
+ "dev": true
+ },
+ "has-symbols": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
+ "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
+ "dev": true
+ },
+ "has-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+ "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+ "dev": true,
+ "requires": {
+ "get-value": "2.0.6",
+ "has-values": "1.0.0",
+ "isobject": "3.0.1"
+ }
+ },
+ "has-values": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+ "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+ "dev": true,
+ "requires": {
+ "is-number": "3.0.0",
+ "kind-of": "4.0.0"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+ "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "hash-base": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz",
+ "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.4",
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "hash.js": {
+ "version": "1.1.7",
+ "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.7.tgz",
+ "integrity": "sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.4",
+ "minimalistic-assert": "1.0.1"
+ }
+ },
+ "hmac-drbg": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz",
+ "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=",
+ "dev": true,
+ "requires": {
+ "hash.js": "1.1.7",
+ "minimalistic-assert": "1.0.1",
+ "minimalistic-crypto-utils": "1.0.1"
+ }
+ },
+ "homedir-polyfill": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz",
+ "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==",
+ "dev": true,
+ "requires": {
+ "parse-passwd": "1.0.0"
+ }
+ },
+ "hosted-git-info": {
+ "version": "2.8.5",
+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.5.tgz",
+ "integrity": "sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==",
+ "dev": true
+ },
+ "hpack.js": {
+ "version": "2.1.6",
+ "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+ "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.4",
+ "obuf": "1.1.2",
+ "readable-stream": "2.3.6",
+ "wbuf": "1.7.3"
+ }
+ },
+ "html-entities": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz",
+ "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=",
+ "dev": true
+ },
+ "http-deceiver": {
+ "version": "1.2.7",
+ "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+ "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
+ "dev": true
+ },
+ "http-errors": {
+ "version": "1.7.2",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
+ "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
+ "dev": true,
+ "requires": {
+ "depd": "1.1.2",
+ "inherits": "2.0.3",
+ "setprototypeof": "1.1.1",
+ "statuses": "1.5.0",
+ "toidentifier": "1.0.0"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+ "dev": true
+ }
+ }
+ },
+ "http-parser-js": {
+ "version": "0.4.10",
+ "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.10.tgz",
+ "integrity": "sha1-ksnBN0w1CF912zWexWzCV8u5P6Q=",
+ "dev": true
+ },
+ "http-proxy": {
+ "version": "1.18.0",
+ "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.0.tgz",
+ "integrity": "sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==",
+ "dev": true,
+ "requires": {
+ "eventemitter3": "4.0.0",
+ "follow-redirects": "1.9.0",
+ "requires-port": "1.0.0"
+ }
+ },
+ "http-proxy-middleware": {
+ "version": "0.19.1",
+ "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz",
+ "integrity": "sha512-yHYTgWMQO8VvwNS22eLLloAkvungsKdKTLO8AJlftYIKNfJr3GK3zK0ZCfzDDGUBttdGc8xFy1mCitvNKQtC3Q==",
+ "dev": true,
+ "requires": {
+ "http-proxy": "1.18.0",
+ "is-glob": "4.0.1",
+ "lodash": "4.17.15",
+ "micromatch": "3.1.10"
+ }
+ },
+ "http-signature": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+ "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "assert-plus": "1.0.0",
+ "jsprim": "1.4.1",
+ "sshpk": "1.16.1"
+ }
+ },
+ "https-browserify": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
+ "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=",
+ "dev": true
+ },
+ "iconv-lite": {
+ "version": "0.4.24",
+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+ "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+ "requires": {
+ "safer-buffer": "2.1.2"
+ }
+ },
+ "icss-replace-symbols": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz",
+ "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=",
+ "dev": true
+ },
+ "icss-utils": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-4.1.1.tgz",
+ "integrity": "sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "ieee754": {
+ "version": "1.1.13",
+ "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.13.tgz",
+ "integrity": "sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==",
+ "dev": true
+ },
+ "iferr": {
+ "version": "0.1.5",
+ "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz",
+ "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=",
+ "dev": true
+ },
+ "ignore": {
+ "version": "4.0.6",
+ "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz",
+ "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==",
+ "dev": true
+ },
+ "image-size": {
+ "version": "0.5.5",
+ "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
+ "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
+ "dev": true,
+ "optional": true
+ },
+ "import-cwd": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/import-cwd/-/import-cwd-2.1.0.tgz",
+ "integrity": "sha1-qmzzbnInYShcs3HsZRn1PiQ1sKk=",
+ "dev": true,
+ "requires": {
+ "import-from": "2.1.0"
+ }
+ },
+ "import-fresh": {
+ "version": "3.2.1",
+ "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.1.tgz",
+ "integrity": "sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==",
+ "dev": true,
+ "requires": {
+ "parent-module": "1.0.1",
+ "resolve-from": "4.0.0"
+ }
+ },
+ "import-from": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/import-from/-/import-from-2.1.0.tgz",
+ "integrity": "sha1-M1238qev/VOqpHHUuAId7ja387E=",
+ "dev": true,
+ "requires": {
+ "resolve-from": "3.0.0"
+ },
+ "dependencies": {
+ "resolve-from": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+ "dev": true
+ }
+ }
+ },
+ "import-local": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/import-local/-/import-local-2.0.0.tgz",
+ "integrity": "sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==",
+ "dev": true,
+ "requires": {
+ "pkg-dir": "3.0.0",
+ "resolve-cwd": "2.0.0"
+ }
+ },
+ "imurmurhash": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+ "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=",
+ "dev": true
+ },
+ "indexes-of": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz",
+ "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=",
+ "dev": true
+ },
+ "infer-owner": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+ "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+ "dev": true
+ },
+ "inflight": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+ "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+ "dev": true,
+ "requires": {
+ "once": "1.4.0",
+ "wrappy": "1.0.2"
+ }
+ },
+ "inherits": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
+ "dev": true
+ },
+ "ini": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+ "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+ "dev": true
+ },
+ "inquirer": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-6.5.2.tgz",
+ "integrity": "sha512-cntlB5ghuB0iuO65Ovoi8ogLHiWGs/5yNrtUcKjFhSSiVeAIVpD7koaSU9RM8mpXw5YDi9RdYXGQMaOURB7ycQ==",
+ "dev": true,
+ "requires": {
+ "ansi-escapes": "3.2.0",
+ "chalk": "2.4.2",
+ "cli-cursor": "2.1.0",
+ "cli-width": "2.2.0",
+ "external-editor": "3.1.0",
+ "figures": "2.0.0",
+ "lodash": "4.17.15",
+ "mute-stream": "0.0.7",
+ "run-async": "2.3.0",
+ "rxjs": "6.5.3",
+ "string-width": "2.1.1",
+ "strip-ansi": "5.2.0",
+ "through": "2.3.8"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+ "dev": true
+ },
+ "strip-ansi": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "4.1.0"
+ }
+ }
+ }
+ },
+ "internal-ip": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+ "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+ "dev": true,
+ "requires": {
+ "default-gateway": "4.2.0",
+ "ipaddr.js": "1.9.0"
+ }
+ },
+ "interpret": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.2.0.tgz",
+ "integrity": "sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==",
+ "dev": true
+ },
+ "invariant": {
+ "version": "2.2.4",
+ "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+ "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+ "dev": true,
+ "requires": {
+ "loose-envify": "1.4.0"
+ }
+ },
+ "invert-kv": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-2.0.0.tgz",
+ "integrity": "sha512-wPVv/y/QQ/Uiirj/vh3oP+1Ww+AWehmi1g5fFWGPF6IpCBCDVrhgHRMvrLfdYcwDh3QJbGXDW4JAuzxElLSqKA==",
+ "dev": true
+ },
+ "ip": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+ "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+ "dev": true
+ },
+ "ip-regex": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+ "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=",
+ "dev": true
+ },
+ "ipaddr.js": {
+ "version": "1.9.0",
+ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
+ "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==",
+ "dev": true
+ },
+ "is-absolute-url": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+ "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==",
+ "dev": true
+ },
+ "is-accessor-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
+ "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "is-arguments": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.0.4.tgz",
+ "integrity": "sha512-xPh0Rmt8NE65sNzvyUmWgI1tz3mKq74lGA0mL8LYZcoIzKOzDh6HmrYm3d18k60nHerC8A9Km8kYu87zfSFnLA==",
+ "dev": true
+ },
+ "is-arrayish": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+ "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=",
+ "dev": true
+ },
+ "is-binary-path": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+ "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+ "dev": true,
+ "requires": {
+ "binary-extensions": "1.13.1"
+ }
+ },
+ "is-buffer": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+ "dev": true
+ },
+ "is-callable": {
+ "version": "1.1.4",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz",
+ "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==",
+ "dev": true
+ },
+ "is-data-descriptor": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
+ "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "is-date-object": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+ "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=",
+ "dev": true
+ },
+ "is-descriptor": {
+ "version": "0.1.6",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
+ "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "0.1.6",
+ "is-data-descriptor": "0.1.4",
+ "kind-of": "5.1.0"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
+ "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
+ "dev": true
+ }
+ }
+ },
+ "is-directory": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+ "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=",
+ "dev": true
+ },
+ "is-extendable": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+ "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+ "dev": true
+ },
+ "is-extglob": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
+ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=",
+ "dev": true
+ },
+ "is-glob": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.1.tgz",
+ "integrity": "sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==",
+ "dev": true,
+ "requires": {
+ "is-extglob": "2.1.1"
+ }
+ },
+ "is-number": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+ "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "is-path-cwd": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+ "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+ "dev": true
+ },
+ "is-path-in-cwd": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+ "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+ "dev": true,
+ "requires": {
+ "is-path-inside": "2.1.0"
+ }
+ },
+ "is-path-inside": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+ "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+ "dev": true,
+ "requires": {
+ "path-is-inside": "1.0.2"
+ }
+ },
+ "is-plain-object": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+ "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+ "dev": true,
+ "requires": {
+ "isobject": "3.0.1"
+ }
+ },
+ "is-promise": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
+ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
+ "dev": true
+ },
+ "is-regex": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+ "dev": true,
+ "requires": {
+ "has": "1.0.3"
+ }
+ },
+ "is-stream": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+ "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ="
+ },
+ "is-symbol": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz",
+ "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==",
+ "dev": true,
+ "requires": {
+ "has-symbols": "1.0.1"
+ }
+ },
+ "is-typedarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+ "dev": true,
+ "optional": true
+ },
+ "is-windows": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+ "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+ "dev": true
+ },
+ "is-wsl": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
+ "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=",
+ "dev": true
+ },
+ "isarray": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+ "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+ "dev": true
+ },
+ "isexe": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+ "dev": true
+ },
+ "isobject": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
+ "dev": true
+ },
+ "isomorphic-fetch": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-2.2.1.tgz",
+ "integrity": "sha1-YRrhrPFPXoH3KVB0coGf6XM1WKk=",
+ "requires": {
+ "node-fetch": "1.7.3",
+ "whatwg-fetch": "3.0.0"
+ }
+ },
+ "isstream": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+ "dev": true,
+ "optional": true
+ },
+ "js-levenshtein": {
+ "version": "1.1.6",
+ "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
+ "integrity": "sha512-X2BB11YZtrRqY4EnQcLX5Rh373zbK4alC1FW7D7MBhL2gtcC17cTnr6DmfHZeS0s2rTHjUTMMHfG7gO8SSdw+g==",
+ "dev": true
+ },
+ "js-tokens": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+ "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+ },
+ "js-yaml": {
+ "version": "3.13.1",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.1.tgz",
+ "integrity": "sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==",
+ "dev": true,
+ "requires": {
+ "argparse": "1.0.10",
+ "esprima": "4.0.1"
+ }
+ },
+ "jsbn": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+ "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+ "dev": true
+ },
+ "jsesc": {
+ "version": "2.5.2",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz",
+ "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==",
+ "dev": true
+ },
+ "json-parse-better-errors": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+ "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==",
+ "dev": true
+ },
+ "json-schema": {
+ "version": "0.2.3",
+ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+ "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+ "dev": true,
+ "optional": true
+ },
+ "json-schema-traverse": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+ "dev": true
+ },
+ "json-stable-stringify-without-jsonify": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+ "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=",
+ "dev": true
+ },
+ "json-stringify-safe": {
+ "version": "5.0.1",
+ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+ "dev": true,
+ "optional": true
+ },
+ "json3": {
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.3.tgz",
+ "integrity": "sha512-c7/8mbUsKigAbLkD5B010BK4D9LZm7A1pNItkEwiUZRpIN66exu/e7YQWysGun+TRKaJp8MhemM+VkfWv42aCA==",
+ "dev": true
+ },
+ "json5": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
+ "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+ "dev": true,
+ "requires": {
+ "minimist": "1.2.0"
+ }
+ },
+ "jsprim": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+ "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "assert-plus": "1.0.0",
+ "extsprintf": "1.3.0",
+ "json-schema": "0.2.3",
+ "verror": "1.10.0"
+ }
+ },
+ "jsx-ast-utils": {
+ "version": "2.2.3",
+ "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz",
+ "integrity": "sha512-EdIHFMm+1BPynpKOpdPqiOsvnIrInRGJD7bzPZdPkjitQEqpdpUuFpq4T0npZFKTiB3RhWFdGN+oqOJIdhDhQA==",
+ "dev": true,
+ "requires": {
+ "array-includes": "3.0.3",
+ "object.assign": "4.1.0"
+ }
+ },
+ "killable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.1.tgz",
+ "integrity": "sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==",
+ "dev": true
+ },
+ "kind-of": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+ "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+ "dev": true
+ },
+ "lcid": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/lcid/-/lcid-2.0.0.tgz",
+ "integrity": "sha512-avPEb8P8EGnwXKClwsNUgryVjllcRqtMYa49NTsbQagYuT1DcXnl1915oxWjoyGrXR6zH/Y0Zc96xWsPcoDKeA==",
+ "dev": true,
+ "requires": {
+ "invert-kv": "2.0.0"
+ }
+ },
+ "less": {
+ "version": "3.10.3",
+ "resolved": "https://registry.npmjs.org/less/-/less-3.10.3.tgz",
+ "integrity": "sha512-vz32vqfgmoxF1h3K4J+yKCtajH0PWmjkIFgbs5d78E/c/e+UQTnI+lWK+1eQRE95PXM2mC3rJlLSSP9VQHnaow==",
+ "dev": true,
+ "requires": {
+ "clone": "2.1.2",
+ "errno": "0.1.7",
+ "graceful-fs": "4.2.3",
+ "image-size": "0.5.5",
+ "mime": "1.6.0",
+ "mkdirp": "0.5.1",
+ "promise": "7.3.1",
+ "request": "2.88.0",
+ "source-map": "0.6.1"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "less-loader": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/less-loader/-/less-loader-4.1.0.tgz",
+ "integrity": "sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==",
+ "dev": true,
+ "requires": {
+ "clone": "2.1.2",
+ "loader-utils": "1.2.3",
+ "pify": "3.0.0"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+ "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+ "dev": true
+ }
+ }
+ },
+ "levn": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+ "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+ "dev": true,
+ "requires": {
+ "prelude-ls": "1.1.2",
+ "type-check": "0.3.2"
+ }
+ },
+ "load-json-file": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz",
+ "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.2.3",
+ "parse-json": "2.2.0",
+ "pify": "2.3.0",
+ "strip-bom": "3.0.0"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "dev": true
+ }
+ }
+ },
+ "loader-runner": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.4.0.tgz",
+ "integrity": "sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==",
+ "dev": true
+ },
+ "loader-utils": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.2.3.tgz",
+ "integrity": "sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==",
+ "dev": true,
+ "requires": {
+ "big.js": "5.2.2",
+ "emojis-list": "2.1.0",
+ "json5": "1.0.1"
+ },
+ "dependencies": {
+ "json5": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz",
+ "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
+ "dev": true,
+ "requires": {
+ "minimist": "1.2.0"
+ }
+ }
+ }
+ },
+ "locate-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+ "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+ "dev": true,
+ "requires": {
+ "p-locate": "3.0.0",
+ "path-exists": "3.0.0"
+ }
+ },
+ "lodash": {
+ "version": "4.17.15",
+ "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
+ "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+ },
+ "lodash._reinterpolate": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz",
+ "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=",
+ "dev": true
+ },
+ "lodash.debounce": {
+ "version": "4.0.8",
+ "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+ "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
+ },
+ "lodash.isequal": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz",
+ "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA="
+ },
+ "lodash.map": {
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
+ "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=",
+ "dev": true
+ },
+ "lodash.template": {
+ "version": "4.5.0",
+ "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-4.5.0.tgz",
+ "integrity": "sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==",
+ "dev": true,
+ "requires": {
+ "lodash._reinterpolate": "3.0.0",
+ "lodash.templatesettings": "4.2.0"
+ }
+ },
+ "lodash.templatesettings": {
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz",
+ "integrity": "sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==",
+ "dev": true,
+ "requires": {
+ "lodash._reinterpolate": "3.0.0"
+ }
+ },
+ "loglevel": {
+ "version": "1.6.6",
+ "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.6.tgz",
+ "integrity": "sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==",
+ "dev": true
+ },
+ "longest": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+ "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+ "dev": true
+ },
+ "loose-envify": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+ "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+ "requires": {
+ "js-tokens": "4.0.0"
+ }
+ },
+ "lru-cache": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+ "dev": true,
+ "requires": {
+ "yallist": "3.1.1"
+ }
+ },
+ "make-dir": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+ "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+ "dev": true,
+ "requires": {
+ "pify": "4.0.1",
+ "semver": "5.7.1"
+ }
+ },
+ "mamacro": {
+ "version": "0.0.3",
+ "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
+ "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
+ "dev": true
+ },
+ "map-age-cleaner": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
+ "integrity": "sha512-bJzx6nMoP6PDLPBFmg7+xRKeFZvFboMrGlxmNj9ClvX53KrmvM5bXFXEWjbz4cz1AFn+jWJ9z/DJSz7hrs0w3w==",
+ "dev": true,
+ "requires": {
+ "p-defer": "1.0.0"
+ }
+ },
+ "map-cache": {
+ "version": "0.2.2",
+ "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+ "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
+ "dev": true
+ },
+ "map-visit": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+ "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
+ "dev": true,
+ "requires": {
+ "object-visit": "1.0.1"
+ }
+ },
+ "md5.js": {
+ "version": "1.3.5",
+ "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
+ "integrity": "sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==",
+ "dev": true,
+ "requires": {
+ "hash-base": "3.0.4",
+ "inherits": "2.0.4",
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "media-typer": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+ "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+ "dev": true
+ },
+ "mem": {
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz",
+ "integrity": "sha512-qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==",
+ "dev": true,
+ "requires": {
+ "map-age-cleaner": "0.1.3",
+ "mimic-fn": "2.1.0",
+ "p-is-promise": "2.1.0"
+ },
+ "dependencies": {
+ "mimic-fn": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+ "dev": true
+ }
+ }
+ },
+ "memory-fs": {
+ "version": "0.4.1",
+ "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz",
+ "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=",
+ "dev": true,
+ "requires": {
+ "errno": "0.1.7",
+ "readable-stream": "2.3.6"
+ }
+ },
+ "merge-descriptors": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz",
+ "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=",
+ "dev": true
+ },
+ "methods": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+ "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=",
+ "dev": true
+ },
+ "micromatch": {
+ "version": "3.1.10",
+ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+ "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+ "dev": true,
+ "requires": {
+ "arr-diff": "4.0.0",
+ "array-unique": "0.3.2",
+ "braces": "2.3.2",
+ "define-property": "2.0.2",
+ "extend-shallow": "3.0.2",
+ "extglob": "2.0.4",
+ "fragment-cache": "0.2.1",
+ "kind-of": "6.0.2",
+ "nanomatch": "1.2.13",
+ "object.pick": "1.3.0",
+ "regex-not": "1.0.2",
+ "snapdragon": "0.8.2",
+ "to-regex": "3.0.2"
+ }
+ },
+ "miller-rabin": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz",
+ "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==",
+ "dev": true,
+ "requires": {
+ "bn.js": "4.11.8",
+ "brorand": "1.1.0"
+ }
+ },
+ "mime": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+ "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+ "dev": true
+ },
+ "mime-db": {
+ "version": "1.42.0",
+ "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.42.0.tgz",
+ "integrity": "sha512-UbfJCR4UAVRNgMpfImz05smAXK7+c+ZntjaA26ANtkXLlOe947Aag5zdIcKQULAiF9Cq4WxBi9jUs5zkA84bYQ==",
+ "dev": true
+ },
+ "mime-types": {
+ "version": "2.1.25",
+ "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.25.tgz",
+ "integrity": "sha512-5KhStqB5xpTAeGqKBAMgwaYMnQik7teQN4IAzC7npDv6kzeU6prfkR67bc87J1kWMPGkoaZSq1npmexMgkmEVg==",
+ "dev": true,
+ "requires": {
+ "mime-db": "1.42.0"
+ }
+ },
+ "mimic-fn": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+ "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+ "dev": true
+ },
+ "minimalistic-assert": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+ "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==",
+ "dev": true
+ },
+ "minimalistic-crypto-utils": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz",
+ "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=",
+ "dev": true
+ },
+ "minimatch": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+ "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+ "dev": true,
+ "requires": {
+ "brace-expansion": "1.1.11"
+ }
+ },
+ "minimist": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+ "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+ "dev": true
+ },
+ "mississippi": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-3.0.0.tgz",
+ "integrity": "sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==",
+ "dev": true,
+ "requires": {
+ "concat-stream": "1.6.2",
+ "duplexify": "3.7.1",
+ "end-of-stream": "1.4.4",
+ "flush-write-stream": "1.1.1",
+ "from2": "2.3.0",
+ "parallel-transform": "1.2.0",
+ "pump": "3.0.0",
+ "pumpify": "1.5.1",
+ "stream-each": "1.2.3",
+ "through2": "2.0.5"
+ }
+ },
+ "mixin-deep": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+ "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+ "dev": true,
+ "requires": {
+ "for-in": "1.0.2",
+ "is-extendable": "1.0.1"
+ },
+ "dependencies": {
+ "is-extendable": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+ "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+ "dev": true,
+ "requires": {
+ "is-plain-object": "2.0.4"
+ }
+ }
+ }
+ },
+ "mkdirp": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+ "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+ "dev": true,
+ "requires": {
+ "minimist": "0.0.8"
+ },
+ "dependencies": {
+ "minimist": {
+ "version": "0.0.8",
+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+ "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+ "dev": true
+ }
+ }
+ },
+ "move-concurrently": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz",
+ "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=",
+ "dev": true,
+ "requires": {
+ "aproba": "1.2.0",
+ "copy-concurrently": "1.0.5",
+ "fs-write-stream-atomic": "1.0.10",
+ "mkdirp": "0.5.1",
+ "rimraf": "2.7.1",
+ "run-queue": "1.0.3"
+ }
+ },
+ "ms": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+ "dev": true
+ },
+ "multicast-dns": {
+ "version": "6.2.3",
+ "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz",
+ "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==",
+ "dev": true,
+ "requires": {
+ "dns-packet": "1.3.1",
+ "thunky": "1.1.0"
+ }
+ },
+ "multicast-dns-service-types": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz",
+ "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
+ "dev": true
+ },
+ "mute-stream": {
+ "version": "0.0.7",
+ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz",
+ "integrity": "sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=",
+ "dev": true
+ },
+ "nan": {
+ "version": "2.14.0",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+ "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==",
+ "dev": true,
+ "optional": true
+ },
+ "nanomatch": {
+ "version": "1.2.13",
+ "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+ "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+ "dev": true,
+ "requires": {
+ "arr-diff": "4.0.0",
+ "array-unique": "0.3.2",
+ "define-property": "2.0.2",
+ "extend-shallow": "3.0.2",
+ "fragment-cache": "0.2.1",
+ "is-windows": "1.0.2",
+ "kind-of": "6.0.2",
+ "object.pick": "1.3.0",
+ "regex-not": "1.0.2",
+ "snapdragon": "0.8.2",
+ "to-regex": "3.0.2"
+ }
+ },
+ "natural-compare": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+ "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=",
+ "dev": true
+ },
+ "negotiator": {
+ "version": "0.6.2",
+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
+ "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==",
+ "dev": true
+ },
+ "neo-async": {
+ "version": "2.6.1",
+ "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
+ "integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==",
+ "dev": true
+ },
+ "nice-try": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+ "dev": true
+ },
+ "node-fetch": {
+ "version": "1.7.3",
+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz",
+ "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==",
+ "requires": {
+ "encoding": "0.1.12",
+ "is-stream": "1.1.0"
+ }
+ },
+ "node-forge": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.9.0.tgz",
+ "integrity": "sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==",
+ "dev": true
+ },
+ "node-libs-browser": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.2.1.tgz",
+ "integrity": "sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==",
+ "dev": true,
+ "requires": {
+ "assert": "1.5.0",
+ "browserify-zlib": "0.2.0",
+ "buffer": "4.9.2",
+ "console-browserify": "1.2.0",
+ "constants-browserify": "1.0.0",
+ "crypto-browserify": "3.12.0",
+ "domain-browser": "1.2.0",
+ "events": "3.0.0",
+ "https-browserify": "1.0.0",
+ "os-browserify": "0.3.0",
+ "path-browserify": "0.0.1",
+ "process": "0.11.10",
+ "punycode": "1.4.1",
+ "querystring-es3": "0.2.1",
+ "readable-stream": "2.3.6",
+ "stream-browserify": "2.0.2",
+ "stream-http": "2.8.3",
+ "string_decoder": "1.1.1",
+ "timers-browserify": "2.0.11",
+ "tty-browserify": "0.0.0",
+ "url": "0.11.0",
+ "util": "0.11.1",
+ "vm-browserify": "1.1.2"
+ },
+ "dependencies": {
+ "punycode": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+ "dev": true
+ }
+ }
+ },
+ "node-releases": {
+ "version": "1.1.40",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.40.tgz",
+ "integrity": "sha512-r4LPcC5b/bS8BdtWH1fbeK88ib/wg9aqmg6/s3ngNLn2Ewkn/8J6Iw3P9RTlfIAdSdvYvQl2thCY5Y+qTAQ2iQ==",
+ "dev": true,
+ "requires": {
+ "semver": "6.3.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ }
+ }
+ },
+ "normalize-package-data": {
+ "version": "2.5.0",
+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+ "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+ "dev": true,
+ "requires": {
+ "hosted-git-info": "2.8.5",
+ "resolve": "1.12.0",
+ "semver": "5.7.1",
+ "validate-npm-package-license": "3.0.4"
+ }
+ },
+ "normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+ "dev": true
+ },
+ "normalize-range": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
+ "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=",
+ "dev": true
+ },
+ "npm-run-path": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+ "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=",
+ "dev": true,
+ "requires": {
+ "path-key": "2.0.1"
+ }
+ },
+ "num2fraction": {
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
+ "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=",
+ "dev": true
+ },
+ "number-is-nan": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+ "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
+ "dev": true
+ },
+ "oauth-sign": {
+ "version": "0.9.0",
+ "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz",
+ "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==",
+ "dev": true,
+ "optional": true
+ },
+ "object-assign": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+ "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
+ },
+ "object-copy": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+ "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
+ "dev": true,
+ "requires": {
+ "copy-descriptor": "0.1.1",
+ "define-property": "0.2.5",
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "0.1.6"
+ }
+ },
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "object-inspect": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.7.0.tgz",
+ "integrity": "sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==",
+ "dev": true
+ },
+ "object-is": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.0.1.tgz",
+ "integrity": "sha1-CqYOyZiaCz7Xlc9NBvYs8a1lObY=",
+ "dev": true
+ },
+ "object-keys": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+ "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+ "dev": true
+ },
+ "object-visit": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+ "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
+ "dev": true,
+ "requires": {
+ "isobject": "3.0.1"
+ }
+ },
+ "object.assign": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
+ "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3",
+ "function-bind": "1.1.1",
+ "has-symbols": "1.0.1",
+ "object-keys": "1.1.1"
+ }
+ },
+ "object.entries": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.0.tgz",
+ "integrity": "sha512-l+H6EQ8qzGRxbkHOd5I/aHRhHDKoQXQ8g0BYt4uSweQU1/J6dZUOyWh9a2Vky35YCKjzmgxOzta2hH6kf9HuXA==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3",
+ "es-abstract": "1.16.0",
+ "function-bind": "1.1.1",
+ "has": "1.0.3"
+ }
+ },
+ "object.fromentries": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.1.tgz",
+ "integrity": "sha512-PUQv8Hbg3j2QX0IQYv3iAGCbGcu4yY4KQ92/dhA4sFSixBmSmp13UpDLs6jGK8rBtbmhNNIK99LD2k293jpiGA==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3",
+ "es-abstract": "1.16.0",
+ "function-bind": "1.1.1",
+ "has": "1.0.3"
+ }
+ },
+ "object.pick": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+ "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
+ "dev": true,
+ "requires": {
+ "isobject": "3.0.1"
+ }
+ },
+ "object.values": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.0.tgz",
+ "integrity": "sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3",
+ "es-abstract": "1.16.0",
+ "function-bind": "1.1.1",
+ "has": "1.0.3"
+ }
+ },
+ "obuf": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+ "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
+ "dev": true
+ },
+ "on-finished": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+ "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+ "dev": true,
+ "requires": {
+ "ee-first": "1.1.1"
+ }
+ },
+ "on-headers": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+ "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+ "dev": true
+ },
+ "once": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+ "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+ "dev": true,
+ "requires": {
+ "wrappy": "1.0.2"
+ }
+ },
+ "onetime": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+ "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+ "dev": true,
+ "requires": {
+ "mimic-fn": "1.2.0"
+ }
+ },
+ "opn": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+ "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
+ "dev": true,
+ "requires": {
+ "is-wsl": "1.1.0"
+ }
+ },
+ "optionator": {
+ "version": "0.8.3",
+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz",
+ "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==",
+ "dev": true,
+ "requires": {
+ "deep-is": "0.1.3",
+ "fast-levenshtein": "2.0.6",
+ "levn": "0.3.0",
+ "prelude-ls": "1.1.2",
+ "type-check": "0.3.2",
+ "word-wrap": "1.2.3"
+ }
+ },
+ "original": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/original/-/original-1.0.2.tgz",
+ "integrity": "sha512-hyBVl6iqqUOJ8FqRe+l/gS8H+kKYjrEndd5Pm1MfBtsEKA038HkkdbAl/72EAXGyonD/PFsvmVG+EvcIpliMBg==",
+ "dev": true,
+ "requires": {
+ "url-parse": "1.4.7"
+ }
+ },
+ "os-browserify": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz",
+ "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=",
+ "dev": true
+ },
+ "os-locale": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz",
+ "integrity": "sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==",
+ "dev": true,
+ "requires": {
+ "execa": "1.0.0",
+ "lcid": "2.0.0",
+ "mem": "4.3.0"
+ }
+ },
+ "os-tmpdir": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+ "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+ "dev": true
+ },
+ "p-defer": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-defer/-/p-defer-1.0.0.tgz",
+ "integrity": "sha1-n26xgvbJqozXQwBKfU+WsZaw+ww=",
+ "dev": true
+ },
+ "p-finally": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+ "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=",
+ "dev": true
+ },
+ "p-is-promise": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz",
+ "integrity": "sha512-Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==",
+ "dev": true
+ },
+ "p-limit": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.2.1.tgz",
+ "integrity": "sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==",
+ "dev": true,
+ "requires": {
+ "p-try": "2.2.0"
+ }
+ },
+ "p-locate": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+ "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+ "dev": true,
+ "requires": {
+ "p-limit": "2.2.1"
+ }
+ },
+ "p-map": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+ "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+ "dev": true
+ },
+ "p-retry": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-3.0.1.tgz",
+ "integrity": "sha512-XE6G4+YTTkT2a0UWb2kjZe8xNwf8bIbnqpc/IS/idOBVhyves0mK5OJgeocjx7q5pvX/6m23xuzVPYT1uGM73w==",
+ "dev": true,
+ "requires": {
+ "retry": "0.12.0"
+ }
+ },
+ "p-try": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+ "dev": true
+ },
+ "pako": {
+ "version": "1.0.10",
+ "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.10.tgz",
+ "integrity": "sha512-0DTvPVU3ed8+HNXOu5Bs+o//Mbdj9VNQMUOe9oKCwh8l0GNwpTDMKCWbRjgtD291AWnkAgkqA/LOnQS8AmS1tw==",
+ "dev": true
+ },
+ "parallel-transform": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+ "integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
+ "dev": true,
+ "requires": {
+ "cyclist": "1.0.1",
+ "inherits": "2.0.4",
+ "readable-stream": "2.3.6"
+ }
+ },
+ "parent-module": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+ "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+ "dev": true,
+ "requires": {
+ "callsites": "3.1.0"
+ }
+ },
+ "parse-asn1": {
+ "version": "5.1.5",
+ "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.5.tgz",
+ "integrity": "sha512-jkMYn1dcJqF6d5CpU689bq7w/b5ALS9ROVSpQDPrZsqqesUJii9qutvoT5ltGedNXMO2e16YUWIghG9KxaViTQ==",
+ "dev": true,
+ "requires": {
+ "asn1.js": "4.10.1",
+ "browserify-aes": "1.2.0",
+ "create-hash": "1.2.0",
+ "evp_bytestokey": "1.0.3",
+ "pbkdf2": "3.0.17",
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "parse-json": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
+ "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+ "dev": true,
+ "requires": {
+ "error-ex": "1.3.2"
+ }
+ },
+ "parse-passwd": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz",
+ "integrity": "sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=",
+ "dev": true
+ },
+ "parseurl": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+ "dev": true
+ },
+ "pascalcase": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+ "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
+ "dev": true
+ },
+ "path-browserify": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
+ "integrity": "sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==",
+ "dev": true
+ },
+ "path-dirname": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+ "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=",
+ "dev": true
+ },
+ "path-exists": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+ "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=",
+ "dev": true
+ },
+ "path-is-absolute": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+ "dev": true
+ },
+ "path-is-inside": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+ "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=",
+ "dev": true
+ },
+ "path-key": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=",
+ "dev": true
+ },
+ "path-parse": {
+ "version": "1.0.6",
+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
+ "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==",
+ "dev": true
+ },
+ "path-to-regexp": {
+ "version": "0.1.7",
+ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz",
+ "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=",
+ "dev": true
+ },
+ "path-type": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz",
+ "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=",
+ "dev": true,
+ "requires": {
+ "pify": "2.3.0"
+ },
+ "dependencies": {
+ "pify": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+ "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
+ "dev": true
+ }
+ }
+ },
+ "pbkdf2": {
+ "version": "3.0.17",
+ "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.17.tgz",
+ "integrity": "sha512-U/il5MsrZp7mGg3mSQfn742na2T+1/vHDCG5/iTI3X9MKUuYUZVLQhyRsg06mCgDBTd57TxzgZt7P+fYfjRLtA==",
+ "dev": true,
+ "requires": {
+ "create-hash": "1.2.0",
+ "create-hmac": "1.1.7",
+ "ripemd160": "2.0.2",
+ "safe-buffer": "5.1.2",
+ "sha.js": "2.4.11"
+ }
+ },
+ "performance-now": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+ "dev": true,
+ "optional": true
+ },
+ "pify": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+ "dev": true
+ },
+ "pinkie": {
+ "version": "2.0.4",
+ "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+ "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+ "dev": true
+ },
+ "pinkie-promise": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+ "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+ "dev": true,
+ "requires": {
+ "pinkie": "2.0.4"
+ }
+ },
+ "pkg-dir": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+ "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+ "dev": true,
+ "requires": {
+ "find-up": "3.0.0"
+ }
+ },
+ "pkg-up": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz",
+ "integrity": "sha1-yBmscoBZpGHKscOImivjxJoATX8=",
+ "dev": true,
+ "requires": {
+ "find-up": "2.1.0"
+ },
+ "dependencies": {
+ "find-up": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "dev": true,
+ "requires": {
+ "locate-path": "2.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+ "dev": true,
+ "requires": {
+ "p-locate": "2.0.0",
+ "path-exists": "3.0.0"
+ }
+ },
+ "p-limit": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+ "dev": true,
+ "requires": {
+ "p-try": "1.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+ "dev": true,
+ "requires": {
+ "p-limit": "1.3.0"
+ }
+ },
+ "p-try": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+ "dev": true
+ }
+ }
+ },
+ "portfinder": {
+ "version": "1.0.25",
+ "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.25.tgz",
+ "integrity": "sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==",
+ "dev": true,
+ "requires": {
+ "async": "2.6.3",
+ "debug": "3.2.6",
+ "mkdirp": "0.5.1"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
+ }
+ },
+ "posix-character-classes": {
+ "version": "0.1.1",
+ "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+ "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
+ "dev": true
+ },
+ "postcss": {
+ "version": "7.0.23",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.23.tgz",
+ "integrity": "sha512-hOlMf3ouRIFXD+j2VJecwssTwbvsPGJVMzupptg+85WA+i7MwyrydmQAgY3R+m0Bc0exunhbJmijy8u8+vufuQ==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.2",
+ "source-map": "0.6.1",
+ "supports-color": "6.1.0"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ },
+ "supports-color": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "postcss-attribute-case-insensitive": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-attribute-case-insensitive/-/postcss-attribute-case-insensitive-4.0.1.tgz",
+ "integrity": "sha512-L2YKB3vF4PetdTIthQVeT+7YiSzMoNMLLYxPXXppOOP7NoazEAy45sh2LvJ8leCQjfBcfkYQs8TtCcQjeZTp8A==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-selector-parser": "5.0.0"
+ },
+ "dependencies": {
+ "cssesc": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+ "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
+ "dev": true
+ },
+ "postcss-selector-parser": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+ "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+ "dev": true,
+ "requires": {
+ "cssesc": "2.0.0",
+ "indexes-of": "1.0.1",
+ "uniq": "1.0.1"
+ }
+ }
+ }
+ },
+ "postcss-color-functional-notation": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-color-functional-notation/-/postcss-color-functional-notation-2.0.1.tgz",
+ "integrity": "sha512-ZBARCypjEDofW4P6IdPVTLhDNXPRn8T2s1zHbZidW6rPaaZvcnCS2soYFIQJrMZSxiePJ2XIYTlcb2ztr/eT2g==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-values-parser": "2.0.1"
+ }
+ },
+ "postcss-color-gray": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-color-gray/-/postcss-color-gray-5.0.0.tgz",
+ "integrity": "sha512-q6BuRnAGKM/ZRpfDascZlIZPjvwsRye7UDNalqVz3s7GDxMtqPY6+Q871liNxsonUw8oC61OG+PSaysYpl1bnw==",
+ "dev": true,
+ "requires": {
+ "@csstools/convert-colors": "1.4.0",
+ "postcss": "7.0.23",
+ "postcss-values-parser": "2.0.1"
+ }
+ },
+ "postcss-color-hex-alpha": {
+ "version": "5.0.3",
+ "resolved": "https://registry.npmjs.org/postcss-color-hex-alpha/-/postcss-color-hex-alpha-5.0.3.tgz",
+ "integrity": "sha512-PF4GDel8q3kkreVXKLAGNpHKilXsZ6xuu+mOQMHWHLPNyjiUBOr75sp5ZKJfmv1MCus5/DWUGcK9hm6qHEnXYw==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-values-parser": "2.0.1"
+ }
+ },
+ "postcss-color-mod-function": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/postcss-color-mod-function/-/postcss-color-mod-function-3.0.3.tgz",
+ "integrity": "sha512-YP4VG+xufxaVtzV6ZmhEtc+/aTXH3d0JLpnYfxqTvwZPbJhWqp8bSY3nfNzNRFLgB4XSaBA82OE4VjOOKpCdVQ==",
+ "dev": true,
+ "requires": {
+ "@csstools/convert-colors": "1.4.0",
+ "postcss": "7.0.23",
+ "postcss-values-parser": "2.0.1"
+ }
+ },
+ "postcss-color-rebeccapurple": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-color-rebeccapurple/-/postcss-color-rebeccapurple-4.0.1.tgz",
+ "integrity": "sha512-aAe3OhkS6qJXBbqzvZth2Au4V3KieR5sRQ4ptb2b2O8wgvB3SJBsdG+jsn2BZbbwekDG8nTfcCNKcSfe/lEy8g==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-values-parser": "2.0.1"
+ }
+ },
+ "postcss-custom-media": {
+ "version": "7.0.8",
+ "resolved": "https://registry.npmjs.org/postcss-custom-media/-/postcss-custom-media-7.0.8.tgz",
+ "integrity": "sha512-c9s5iX0Ge15o00HKbuRuTqNndsJUbaXdiNsksnVH8H4gdc+zbLzr/UasOwNG6CTDpLFekVY4672eWdiiWu2GUg==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-custom-properties": {
+ "version": "8.0.11",
+ "resolved": "https://registry.npmjs.org/postcss-custom-properties/-/postcss-custom-properties-8.0.11.tgz",
+ "integrity": "sha512-nm+o0eLdYqdnJ5abAJeXp4CEU1c1k+eB2yMCvhgzsds/e0umabFrN6HoTy/8Q4K5ilxERdl/JD1LO5ANoYBeMA==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-values-parser": "2.0.1"
+ }
+ },
+ "postcss-custom-selectors": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/postcss-custom-selectors/-/postcss-custom-selectors-5.1.2.tgz",
+ "integrity": "sha512-DSGDhqinCqXqlS4R7KGxL1OSycd1lydugJ1ky4iRXPHdBRiozyMHrdu0H3o7qNOCiZwySZTUI5MV0T8QhCLu+w==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-selector-parser": "5.0.0"
+ },
+ "dependencies": {
+ "cssesc": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+ "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
+ "dev": true
+ },
+ "postcss-selector-parser": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+ "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+ "dev": true,
+ "requires": {
+ "cssesc": "2.0.0",
+ "indexes-of": "1.0.1",
+ "uniq": "1.0.1"
+ }
+ }
+ }
+ },
+ "postcss-dir-pseudo-class": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-dir-pseudo-class/-/postcss-dir-pseudo-class-5.0.0.tgz",
+ "integrity": "sha512-3pm4oq8HYWMZePJY+5ANriPs3P07q+LW6FAdTlkFH2XqDdP4HeeJYMOzn0HYLhRSjBO3fhiqSwwU9xEULSrPgw==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-selector-parser": "5.0.0"
+ },
+ "dependencies": {
+ "cssesc": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+ "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
+ "dev": true
+ },
+ "postcss-selector-parser": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+ "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+ "dev": true,
+ "requires": {
+ "cssesc": "2.0.0",
+ "indexes-of": "1.0.1",
+ "uniq": "1.0.1"
+ }
+ }
+ }
+ },
+ "postcss-double-position-gradients": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-double-position-gradients/-/postcss-double-position-gradients-1.0.0.tgz",
+ "integrity": "sha512-G+nV8EnQq25fOI8CH/B6krEohGWnF5+3A6H/+JEpOncu5dCnkS1QQ6+ct3Jkaepw1NGVqqOZH6lqrm244mCftA==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-values-parser": "2.0.1"
+ }
+ },
+ "postcss-env-function": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/postcss-env-function/-/postcss-env-function-2.0.2.tgz",
+ "integrity": "sha512-rwac4BuZlITeUbiBq60h/xbLzXY43qOsIErngWa4l7Mt+RaSkT7QBjXVGTcBHupykkblHMDrBFh30zchYPaOUw==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-values-parser": "2.0.1"
+ }
+ },
+ "postcss-focus-visible": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-focus-visible/-/postcss-focus-visible-4.0.0.tgz",
+ "integrity": "sha512-Z5CkWBw0+idJHSV6+Bgf2peDOFf/x4o+vX/pwcNYrWpXFrSfTkQ3JQ1ojrq9yS+upnAlNRHeg8uEwFTgorjI8g==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-focus-within": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-focus-within/-/postcss-focus-within-3.0.0.tgz",
+ "integrity": "sha512-W0APui8jQeBKbCGZudW37EeMCjDeVxKgiYfIIEo8Bdh5SpB9sxds/Iq8SEuzS0Q4YFOlG7EPFulbbxujpkrV2w==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-font-variant": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-font-variant/-/postcss-font-variant-4.0.0.tgz",
+ "integrity": "sha512-M8BFYKOvCrI2aITzDad7kWuXXTm0YhGdP9Q8HanmN4EF1Hmcgs1KK5rSHylt/lUJe8yLxiSwWAHdScoEiIxztg==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-gap-properties": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-gap-properties/-/postcss-gap-properties-2.0.0.tgz",
+ "integrity": "sha512-QZSqDaMgXCHuHTEzMsS2KfVDOq7ZFiknSpkrPJY6jmxbugUPTuSzs/vuE5I3zv0WAS+3vhrlqhijiprnuQfzmg==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-image-set-function": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-image-set-function/-/postcss-image-set-function-3.0.1.tgz",
+ "integrity": "sha512-oPTcFFip5LZy8Y/whto91L9xdRHCWEMs3e1MdJxhgt4jy2WYXfhkng59fH5qLXSCPN8k4n94p1Czrfe5IOkKUw==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-values-parser": "2.0.1"
+ }
+ },
+ "postcss-initial": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/postcss-initial/-/postcss-initial-3.0.2.tgz",
+ "integrity": "sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA==",
+ "dev": true,
+ "requires": {
+ "lodash.template": "4.5.0",
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-lab-function": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-lab-function/-/postcss-lab-function-2.0.1.tgz",
+ "integrity": "sha512-whLy1IeZKY+3fYdqQFuDBf8Auw+qFuVnChWjmxm/UhHWqNHZx+B99EwxTvGYmUBqe3Fjxs4L1BoZTJmPu6usVg==",
+ "dev": true,
+ "requires": {
+ "@csstools/convert-colors": "1.4.0",
+ "postcss": "7.0.23",
+ "postcss-values-parser": "2.0.1"
+ }
+ },
+ "postcss-load-config": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-2.1.0.tgz",
+ "integrity": "sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==",
+ "dev": true,
+ "requires": {
+ "cosmiconfig": "5.2.1",
+ "import-cwd": "2.1.0"
+ }
+ },
+ "postcss-loader": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-3.0.0.tgz",
+ "integrity": "sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==",
+ "dev": true,
+ "requires": {
+ "loader-utils": "1.2.3",
+ "postcss": "7.0.23",
+ "postcss-load-config": "2.1.0",
+ "schema-utils": "1.0.0"
+ }
+ },
+ "postcss-logical": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-logical/-/postcss-logical-3.0.0.tgz",
+ "integrity": "sha512-1SUKdJc2vuMOmeItqGuNaC+N8MzBWFWEkAnRnLpFYj1tGGa7NqyVBujfRtgNa2gXR+6RkGUiB2O5Vmh7E2RmiA==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-media-minmax": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-media-minmax/-/postcss-media-minmax-4.0.0.tgz",
+ "integrity": "sha512-fo9moya6qyxsjbFAYl97qKO9gyre3qvbMnkOZeZwlsW6XYFsvs2DMGDlchVLfAd8LHPZDxivu/+qW2SMQeTHBw==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-modules-extract-imports": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz",
+ "integrity": "sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-modules-local-by-default": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-2.0.6.tgz",
+ "integrity": "sha512-oLUV5YNkeIBa0yQl7EYnxMgy4N6noxmiwZStaEJUSe2xPMcdNc8WmBQuQCx18H5psYbVxz8zoHk0RAAYZXP9gA==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-selector-parser": "6.0.2",
+ "postcss-value-parser": "3.3.1"
+ }
+ },
+ "postcss-modules-scope": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-2.1.0.tgz",
+ "integrity": "sha512-91Rjps0JnmtUB0cujlc8KIKCsJXWjzuxGeT/+Q2i2HXKZ7nBUeF9YQTZZTNvHVoNYj1AthsjnGLtqDUE0Op79A==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-selector-parser": "6.0.2"
+ }
+ },
+ "postcss-modules-values": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-2.0.0.tgz",
+ "integrity": "sha512-Ki7JZa7ff1N3EIMlPnGTZfUMe69FFwiQPnVSXC9mnn3jozCRBYIxiZd44yJOV2AmabOo4qFf8s0dC/+lweG7+w==",
+ "dev": true,
+ "requires": {
+ "icss-replace-symbols": "1.1.0",
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-nesting": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-nesting/-/postcss-nesting-7.0.1.tgz",
+ "integrity": "sha512-FrorPb0H3nuVq0Sff7W2rnc3SmIcruVC6YwpcS+k687VxyxO33iE1amna7wHuRVzM8vfiYofXSBHNAZ3QhLvYg==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-overflow-shorthand": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-overflow-shorthand/-/postcss-overflow-shorthand-2.0.0.tgz",
+ "integrity": "sha512-aK0fHc9CBNx8jbzMYhshZcEv8LtYnBIRYQD5i7w/K/wS9c2+0NSR6B3OVMu5y0hBHYLcMGjfU+dmWYNKH0I85g==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-page-break": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-page-break/-/postcss-page-break-2.0.0.tgz",
+ "integrity": "sha512-tkpTSrLpfLfD9HvgOlJuigLuk39wVTbbd8RKcy8/ugV2bNBUW3xU+AIqyxhDrQr1VUj1RmyJrBn1YWrqUm9zAQ==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-place": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-place/-/postcss-place-4.0.1.tgz",
+ "integrity": "sha512-Zb6byCSLkgRKLODj/5mQugyuj9bvAAw9LqJJjgwz5cYryGeXfFZfSXoP1UfveccFmeq0b/2xxwcTEVScnqGxBg==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-values-parser": "2.0.1"
+ }
+ },
+ "postcss-preset-env": {
+ "version": "6.7.0",
+ "resolved": "https://registry.npmjs.org/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz",
+ "integrity": "sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==",
+ "dev": true,
+ "requires": {
+ "autoprefixer": "9.7.2",
+ "browserslist": "4.7.3",
+ "caniuse-lite": "1.0.30001011",
+ "css-blank-pseudo": "0.1.4",
+ "css-has-pseudo": "0.10.0",
+ "css-prefers-color-scheme": "3.1.1",
+ "cssdb": "4.4.0",
+ "postcss": "7.0.23",
+ "postcss-attribute-case-insensitive": "4.0.1",
+ "postcss-color-functional-notation": "2.0.1",
+ "postcss-color-gray": "5.0.0",
+ "postcss-color-hex-alpha": "5.0.3",
+ "postcss-color-mod-function": "3.0.3",
+ "postcss-color-rebeccapurple": "4.0.1",
+ "postcss-custom-media": "7.0.8",
+ "postcss-custom-properties": "8.0.11",
+ "postcss-custom-selectors": "5.1.2",
+ "postcss-dir-pseudo-class": "5.0.0",
+ "postcss-double-position-gradients": "1.0.0",
+ "postcss-env-function": "2.0.2",
+ "postcss-focus-visible": "4.0.0",
+ "postcss-focus-within": "3.0.0",
+ "postcss-font-variant": "4.0.0",
+ "postcss-gap-properties": "2.0.0",
+ "postcss-image-set-function": "3.0.1",
+ "postcss-initial": "3.0.2",
+ "postcss-lab-function": "2.0.1",
+ "postcss-logical": "3.0.0",
+ "postcss-media-minmax": "4.0.0",
+ "postcss-nesting": "7.0.1",
+ "postcss-overflow-shorthand": "2.0.0",
+ "postcss-page-break": "2.0.0",
+ "postcss-place": "4.0.1",
+ "postcss-pseudo-class-any-link": "6.0.0",
+ "postcss-replace-overflow-wrap": "3.0.0",
+ "postcss-selector-matches": "4.0.0",
+ "postcss-selector-not": "4.0.0"
+ }
+ },
+ "postcss-pseudo-class-any-link": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-pseudo-class-any-link/-/postcss-pseudo-class-any-link-6.0.0.tgz",
+ "integrity": "sha512-lgXW9sYJdLqtmw23otOzrtbDXofUdfYzNm4PIpNE322/swES3VU9XlXHeJS46zT2onFO7V1QFdD4Q9LiZj8mew==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23",
+ "postcss-selector-parser": "5.0.0"
+ },
+ "dependencies": {
+ "cssesc": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-2.0.0.tgz",
+ "integrity": "sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==",
+ "dev": true
+ },
+ "postcss-selector-parser": {
+ "version": "5.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz",
+ "integrity": "sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==",
+ "dev": true,
+ "requires": {
+ "cssesc": "2.0.0",
+ "indexes-of": "1.0.1",
+ "uniq": "1.0.1"
+ }
+ }
+ }
+ },
+ "postcss-replace-overflow-wrap": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-replace-overflow-wrap/-/postcss-replace-overflow-wrap-3.0.0.tgz",
+ "integrity": "sha512-2T5hcEHArDT6X9+9dVSPQdo7QHzG4XKclFT8rU5TzJPDN7RIRTbO9c4drUISOVemLj03aezStHCR2AIcr8XLpw==",
+ "dev": true,
+ "requires": {
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-selector-matches": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-selector-matches/-/postcss-selector-matches-4.0.0.tgz",
+ "integrity": "sha512-LgsHwQR/EsRYSqlwdGzeaPKVT0Ml7LAT6E75T8W8xLJY62CE4S/l03BWIt3jT8Taq22kXP08s2SfTSzaraoPww==",
+ "dev": true,
+ "requires": {
+ "balanced-match": "1.0.0",
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-selector-not": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/postcss-selector-not/-/postcss-selector-not-4.0.0.tgz",
+ "integrity": "sha512-W+bkBZRhqJaYN8XAnbbZPLWMvZD1wKTu0UxtFKdhtGjWYmxhkUneoeOhRJKdAE5V7ZTlnbHfCR+6bNwK9e1dTQ==",
+ "dev": true,
+ "requires": {
+ "balanced-match": "1.0.0",
+ "postcss": "7.0.23"
+ }
+ },
+ "postcss-selector-parser": {
+ "version": "6.0.2",
+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz",
+ "integrity": "sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==",
+ "dev": true,
+ "requires": {
+ "cssesc": "3.0.0",
+ "indexes-of": "1.0.1",
+ "uniq": "1.0.1"
+ }
+ },
+ "postcss-value-parser": {
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
+ "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
+ "dev": true
+ },
+ "postcss-values-parser": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/postcss-values-parser/-/postcss-values-parser-2.0.1.tgz",
+ "integrity": "sha512-2tLuBsA6P4rYTNKCXYG/71C7j1pU6pK503suYOmn4xYrQIzW+opD+7FAFNuGSdZC/3Qfy334QbeMu7MEb8gOxg==",
+ "dev": true,
+ "requires": {
+ "flatten": "1.0.3",
+ "indexes-of": "1.0.1",
+ "uniq": "1.0.1"
+ }
+ },
+ "prelude-ls": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+ "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+ "dev": true
+ },
+ "private": {
+ "version": "0.1.8",
+ "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz",
+ "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==",
+ "dev": true
+ },
+ "process": {
+ "version": "0.11.10",
+ "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+ "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=",
+ "dev": true
+ },
+ "process-nextick-args": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+ "dev": true
+ },
+ "progress": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
+ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
+ "dev": true
+ },
+ "promise": {
+ "version": "7.3.1",
+ "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+ "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+ "requires": {
+ "asap": "2.0.6"
+ }
+ },
+ "promise-inflight": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+ "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
+ "dev": true
+ },
+ "prop-types": {
+ "version": "15.7.2",
+ "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz",
+ "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==",
+ "requires": {
+ "loose-envify": "1.4.0",
+ "object-assign": "4.1.1",
+ "react-is": "16.12.0"
+ }
+ },
+ "proxy-addr": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
+ "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
+ "dev": true,
+ "requires": {
+ "forwarded": "0.1.2",
+ "ipaddr.js": "1.9.0"
+ }
+ },
+ "prr": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+ "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
+ "dev": true
+ },
+ "psl": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/psl/-/psl-1.4.0.tgz",
+ "integrity": "sha512-HZzqCGPecFLyoRj5HLfuDSKYTJkAfB5thKBIkRHtGjWwY7p1dAyveIbXIq4tO0KYfDF2tHqPUgY9SDnGm00uFw==",
+ "dev": true,
+ "optional": true
+ },
+ "public-encrypt": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.3.tgz",
+ "integrity": "sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==",
+ "dev": true,
+ "requires": {
+ "bn.js": "4.11.8",
+ "browserify-rsa": "4.0.1",
+ "create-hash": "1.2.0",
+ "parse-asn1": "5.1.5",
+ "randombytes": "2.1.0",
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "pump": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
+ "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+ "dev": true,
+ "requires": {
+ "end-of-stream": "1.4.4",
+ "once": "1.4.0"
+ }
+ },
+ "pumpify": {
+ "version": "1.5.1",
+ "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz",
+ "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==",
+ "dev": true,
+ "requires": {
+ "duplexify": "3.7.1",
+ "inherits": "2.0.4",
+ "pump": "2.0.1"
+ },
+ "dependencies": {
+ "pump": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz",
+ "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==",
+ "dev": true,
+ "requires": {
+ "end-of-stream": "1.4.4",
+ "once": "1.4.0"
+ }
+ }
+ }
+ },
+ "punycode": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
+ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==",
+ "dev": true
+ },
+ "qs": {
+ "version": "6.5.2",
+ "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+ "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+ "dev": true,
+ "optional": true
+ },
+ "querystring": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+ "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=",
+ "dev": true
+ },
+ "querystring-es3": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+ "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
+ "dev": true
+ },
+ "querystringify": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+ "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
+ "dev": true
+ },
+ "randombytes": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
+ "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "randomfill": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz",
+ "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==",
+ "dev": true,
+ "requires": {
+ "randombytes": "2.1.0",
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "range-parser": {
+ "version": "1.2.1",
+ "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz",
+ "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
+ "dev": true
+ },
+ "raw-body": {
+ "version": "2.4.0",
+ "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
+ "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
+ "dev": true,
+ "requires": {
+ "bytes": "3.1.0",
+ "http-errors": "1.7.2",
+ "iconv-lite": "0.4.24",
+ "unpipe": "1.0.0"
+ },
+ "dependencies": {
+ "bytes": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
+ "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
+ "dev": true
+ }
+ }
+ },
+ "react-codemirror": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/react-codemirror/-/react-codemirror-1.0.0.tgz",
+ "integrity": "sha1-kUZ7U7H12A2Rai/QtMetuFqQAbo=",
+ "requires": {
+ "classnames": "2.2.6",
+ "codemirror": "5.49.2",
+ "create-react-class": "15.6.3",
+ "lodash.debounce": "4.0.8",
+ "lodash.isequal": "4.5.0",
+ "prop-types": "15.7.2"
+ }
+ },
+ "react-is": {
+ "version": "16.12.0",
+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.12.0.tgz",
+ "integrity": "sha512-rPCkf/mWBtKc97aLL9/txD8DZdemK0vkA3JMLShjlJB3Pj3s+lpf1KaBzMfQrAmhMQB0n1cU/SUGgKKBCe837Q=="
+ },
+ "read-pkg": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz",
+ "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=",
+ "dev": true,
+ "requires": {
+ "load-json-file": "2.0.0",
+ "normalize-package-data": "2.5.0",
+ "path-type": "2.0.0"
+ }
+ },
+ "read-pkg-up": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz",
+ "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=",
+ "dev": true,
+ "requires": {
+ "find-up": "2.1.0",
+ "read-pkg": "2.0.0"
+ },
+ "dependencies": {
+ "find-up": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+ "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
+ "dev": true,
+ "requires": {
+ "locate-path": "2.0.0"
+ }
+ },
+ "locate-path": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+ "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+ "dev": true,
+ "requires": {
+ "p-locate": "2.0.0",
+ "path-exists": "3.0.0"
+ }
+ },
+ "p-limit": {
+ "version": "1.3.0",
+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+ "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+ "dev": true,
+ "requires": {
+ "p-try": "1.0.0"
+ }
+ },
+ "p-locate": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+ "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
+ "dev": true,
+ "requires": {
+ "p-limit": "1.3.0"
+ }
+ },
+ "p-try": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+ "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+ "dev": true
+ }
+ }
+ },
+ "readable-stream": {
+ "version": "2.3.6",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+ "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+ "dev": true,
+ "requires": {
+ "core-util-is": "1.0.2",
+ "inherits": "2.0.4",
+ "isarray": "1.0.0",
+ "process-nextick-args": "2.0.1",
+ "safe-buffer": "5.1.2",
+ "string_decoder": "1.1.1",
+ "util-deprecate": "1.0.2"
+ }
+ },
+ "readdirp": {
+ "version": "2.2.1",
+ "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
+ "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.2.3",
+ "micromatch": "3.1.10",
+ "readable-stream": "2.3.6"
+ }
+ },
+ "regenerate": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
+ "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+ "dev": true
+ },
+ "regenerate-unicode-properties": {
+ "version": "8.1.0",
+ "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
+ "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
+ "dev": true,
+ "requires": {
+ "regenerate": "1.4.0"
+ }
+ },
+ "regenerator-runtime": {
+ "version": "0.13.3",
+ "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz",
+ "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==",
+ "dev": true
+ },
+ "regenerator-transform": {
+ "version": "0.14.1",
+ "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.1.tgz",
+ "integrity": "sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==",
+ "dev": true,
+ "requires": {
+ "private": "0.1.8"
+ }
+ },
+ "regex-not": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+ "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "3.0.2",
+ "safe-regex": "1.1.0"
+ }
+ },
+ "regexp.prototype.flags": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz",
+ "integrity": "sha512-ztaw4M1VqgMwl9HlPpOuiYgItcHlunW0He2fE6eNfT6E/CF2FtYi9ofOYe4mKntstYk0Fyh/rDRBdS3AnxjlrA==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3"
+ }
+ },
+ "regexpp": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz",
+ "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==",
+ "dev": true
+ },
+ "regexpu-core": {
+ "version": "4.6.0",
+ "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
+ "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
+ "dev": true,
+ "requires": {
+ "regenerate": "1.4.0",
+ "regenerate-unicode-properties": "8.1.0",
+ "regjsgen": "0.5.1",
+ "regjsparser": "0.6.0",
+ "unicode-match-property-ecmascript": "1.0.4",
+ "unicode-match-property-value-ecmascript": "1.1.0"
+ }
+ },
+ "regjsgen": {
+ "version": "0.5.1",
+ "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.5.1.tgz",
+ "integrity": "sha512-5qxzGZjDs9w4tzT3TPhCJqWdCc3RLYwy9J2NB0nm5Lz+S273lvWcpjaTGHsT1dc6Hhfq41uSEOw8wBmxrKOuyg==",
+ "dev": true
+ },
+ "regjsparser": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.0.tgz",
+ "integrity": "sha512-RQ7YyokLiQBomUJuUG8iGVvkgOLxwyZM8k6d3q5SAXpg4r5TZJZigKFvC6PpD+qQ98bCDC5YelPeA3EucDoNeQ==",
+ "dev": true,
+ "requires": {
+ "jsesc": "0.5.0"
+ },
+ "dependencies": {
+ "jsesc": {
+ "version": "0.5.0",
+ "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz",
+ "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=",
+ "dev": true
+ }
+ }
+ },
+ "remove-trailing-separator": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+ "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+ "dev": true
+ },
+ "repeat-element": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
+ "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
+ "dev": true
+ },
+ "repeat-string": {
+ "version": "1.6.1",
+ "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+ "dev": true
+ },
+ "request": {
+ "version": "2.88.0",
+ "resolved": "https://registry.npmjs.org/request/-/request-2.88.0.tgz",
+ "integrity": "sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "aws-sign2": "0.7.0",
+ "aws4": "1.8.0",
+ "caseless": "0.12.0",
+ "combined-stream": "1.0.8",
+ "extend": "3.0.2",
+ "forever-agent": "0.6.1",
+ "form-data": "2.3.3",
+ "har-validator": "5.1.3",
+ "http-signature": "1.2.0",
+ "is-typedarray": "1.0.0",
+ "isstream": "0.1.2",
+ "json-stringify-safe": "5.0.1",
+ "mime-types": "2.1.25",
+ "oauth-sign": "0.9.0",
+ "performance-now": "2.1.0",
+ "qs": "6.5.2",
+ "safe-buffer": "5.1.2",
+ "tough-cookie": "2.4.3",
+ "tunnel-agent": "0.6.0",
+ "uuid": "3.3.3"
+ }
+ },
+ "require-directory": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
+ "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=",
+ "dev": true
+ },
+ "require-main-filename": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "dev": true
+ },
+ "requires-port": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+ "dev": true
+ },
+ "reselect": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/reselect/-/reselect-3.0.1.tgz",
+ "integrity": "sha1-79qpjqdFEyTQkrKyFjpqHXqaIUc=",
+ "dev": true
+ },
+ "resolve": {
+ "version": "1.12.0",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz",
+ "integrity": "sha512-B/dOmuoAik5bKcD6s6nXDCjzUKnaDvdkRyAk6rsmsKLipWj4797iothd7jmmUhWTfinVMU+wc56rYKsit2Qy4w==",
+ "dev": true,
+ "requires": {
+ "path-parse": "1.0.6"
+ }
+ },
+ "resolve-cwd": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
+ "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=",
+ "dev": true,
+ "requires": {
+ "resolve-from": "3.0.0"
+ },
+ "dependencies": {
+ "resolve-from": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+ "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=",
+ "dev": true
+ }
+ }
+ },
+ "resolve-dir": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz",
+ "integrity": "sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=",
+ "dev": true,
+ "requires": {
+ "expand-tilde": "2.0.2",
+ "global-modules": "1.0.0"
+ },
+ "dependencies": {
+ "global-modules": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz",
+ "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==",
+ "dev": true,
+ "requires": {
+ "global-prefix": "1.0.2",
+ "is-windows": "1.0.2",
+ "resolve-dir": "1.0.1"
+ }
+ }
+ }
+ },
+ "resolve-from": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+ "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+ "dev": true
+ },
+ "resolve-url": {
+ "version": "0.2.1",
+ "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+ "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
+ "dev": true
+ },
+ "restore-cursor": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
+ "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+ "dev": true,
+ "requires": {
+ "onetime": "2.0.1",
+ "signal-exit": "3.0.2"
+ }
+ },
+ "ret": {
+ "version": "0.1.15",
+ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+ "dev": true
+ },
+ "retry": {
+ "version": "0.12.0",
+ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz",
+ "integrity": "sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=",
+ "dev": true
+ },
+ "right-pad": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz",
+ "integrity": "sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA=",
+ "dev": true
+ },
+ "rimraf": {
+ "version": "2.7.1",
+ "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+ "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+ "dev": true,
+ "requires": {
+ "glob": "7.1.6"
+ }
+ },
+ "ripemd160": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz",
+ "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==",
+ "dev": true,
+ "requires": {
+ "hash-base": "3.0.4",
+ "inherits": "2.0.4"
+ }
+ },
+ "run-async": {
+ "version": "2.3.0",
+ "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz",
+ "integrity": "sha1-A3GrSuC91yDUFm19/aZP96RFpsA=",
+ "dev": true,
+ "requires": {
+ "is-promise": "2.1.0"
+ }
+ },
+ "run-queue": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz",
+ "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=",
+ "dev": true,
+ "requires": {
+ "aproba": "1.2.0"
+ }
+ },
+ "rw": {
+ "version": "1.3.3",
+ "resolved": "https://registry.npmjs.org/rw/-/rw-1.3.3.tgz",
+ "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q="
+ },
+ "rxjs": {
+ "version": "6.5.3",
+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.5.3.tgz",
+ "integrity": "sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==",
+ "dev": true,
+ "requires": {
+ "tslib": "1.10.0"
+ }
+ },
+ "safe-buffer": {
+ "version": "5.1.2",
+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+ "dev": true
+ },
+ "safe-regex": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+ "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
+ "dev": true,
+ "requires": {
+ "ret": "0.1.15"
+ }
+ },
+ "safer-buffer": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
+ },
+ "schema-utils": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+ "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+ "dev": true,
+ "requires": {
+ "ajv": "6.10.2",
+ "ajv-errors": "1.0.1",
+ "ajv-keywords": "3.4.1"
+ }
+ },
+ "select-hose": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+ "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=",
+ "dev": true
+ },
+ "selfsigned": {
+ "version": "1.10.7",
+ "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.7.tgz",
+ "integrity": "sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==",
+ "dev": true,
+ "requires": {
+ "node-forge": "0.9.0"
+ }
+ },
+ "semver": {
+ "version": "5.7.1",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
+ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+ "dev": true
+ },
+ "send": {
+ "version": "0.17.1",
+ "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
+ "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
+ "dev": true,
+ "requires": {
+ "debug": "2.6.9",
+ "depd": "1.1.2",
+ "destroy": "1.0.4",
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "etag": "1.8.1",
+ "fresh": "0.5.2",
+ "http-errors": "1.7.2",
+ "mime": "1.6.0",
+ "ms": "2.1.1",
+ "on-finished": "2.3.0",
+ "range-parser": "1.2.1",
+ "statuses": "1.5.0"
+ },
+ "dependencies": {
+ "ms": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
+ "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
+ "dev": true
+ }
+ }
+ },
+ "serialize-javascript": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz",
+ "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==",
+ "dev": true
+ },
+ "serve-index": {
+ "version": "1.9.1",
+ "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+ "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=",
+ "dev": true,
+ "requires": {
+ "accepts": "1.3.7",
+ "batch": "0.6.1",
+ "debug": "2.6.9",
+ "escape-html": "1.0.3",
+ "http-errors": "1.6.3",
+ "mime-types": "2.1.25",
+ "parseurl": "1.3.3"
+ },
+ "dependencies": {
+ "http-errors": {
+ "version": "1.6.3",
+ "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+ "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+ "dev": true,
+ "requires": {
+ "depd": "1.1.2",
+ "inherits": "2.0.3",
+ "setprototypeof": "1.1.0",
+ "statuses": "1.5.0"
+ }
+ },
+ "inherits": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+ "dev": true
+ },
+ "setprototypeof": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+ "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+ "dev": true
+ }
+ }
+ },
+ "serve-static": {
+ "version": "1.14.1",
+ "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
+ "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
+ "dev": true,
+ "requires": {
+ "encodeurl": "1.0.2",
+ "escape-html": "1.0.3",
+ "parseurl": "1.3.3",
+ "send": "0.17.1"
+ }
+ },
+ "set-blocking": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+ "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
+ "dev": true
+ },
+ "set-value": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+ "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "2.0.1",
+ "is-extendable": "0.1.1",
+ "is-plain-object": "2.0.4",
+ "split-string": "3.1.0"
+ },
+ "dependencies": {
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
+ "setimmediate": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz",
+ "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU="
+ },
+ "setprototypeof": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
+ "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
+ "dev": true
+ },
+ "sha.js": {
+ "version": "2.4.11",
+ "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
+ "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.4",
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "shebang-command": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+ "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=",
+ "dev": true,
+ "requires": {
+ "shebang-regex": "1.0.0"
+ }
+ },
+ "shebang-regex": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+ "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=",
+ "dev": true
+ },
+ "signal-exit": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+ "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+ "dev": true
+ },
+ "slash": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
+ "integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
+ "dev": true
+ },
+ "slice-ansi": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz",
+ "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "astral-regex": "1.0.0",
+ "is-fullwidth-code-point": "2.0.0"
+ }
+ },
+ "snapdragon": {
+ "version": "0.8.2",
+ "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+ "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+ "dev": true,
+ "requires": {
+ "base": "0.11.2",
+ "debug": "2.6.9",
+ "define-property": "0.2.5",
+ "extend-shallow": "2.0.1",
+ "map-cache": "0.2.2",
+ "source-map": "0.5.7",
+ "source-map-resolve": "0.5.2",
+ "use": "3.1.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "0.1.6"
+ }
+ },
+ "extend-shallow": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+ "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+ "dev": true,
+ "requires": {
+ "is-extendable": "0.1.1"
+ }
+ }
+ }
+ },
+ "snapdragon-node": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+ "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+ "dev": true,
+ "requires": {
+ "define-property": "1.0.0",
+ "isobject": "3.0.1",
+ "snapdragon-util": "3.0.1"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+ "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "1.0.2"
+ }
+ },
+ "is-accessor-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
+ "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-data-descriptor": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
+ "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "6.0.2"
+ }
+ },
+ "is-descriptor": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
+ "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+ "dev": true,
+ "requires": {
+ "is-accessor-descriptor": "1.0.0",
+ "is-data-descriptor": "1.0.0",
+ "kind-of": "6.0.2"
+ }
+ }
+ }
+ },
+ "snapdragon-util": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+ "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "sockjs": {
+ "version": "0.3.19",
+ "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz",
+ "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==",
+ "dev": true,
+ "requires": {
+ "faye-websocket": "0.10.0",
+ "uuid": "3.3.3"
+ }
+ },
+ "sockjs-client": {
+ "version": "1.4.0",
+ "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.4.0.tgz",
+ "integrity": "sha512-5zaLyO8/nri5cua0VtOrFXBPK1jbL4+1cebT/mmKA1E1ZXOvJrII75bPu0l0k843G/+iAbhEqzyKr0w/eCCj7g==",
+ "dev": true,
+ "requires": {
+ "debug": "3.2.6",
+ "eventsource": "1.0.7",
+ "faye-websocket": "0.11.3",
+ "inherits": "2.0.4",
+ "json3": "3.3.3",
+ "url-parse": "1.4.7"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "3.2.6",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
+ "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "faye-websocket": {
+ "version": "0.11.3",
+ "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.3.tgz",
+ "integrity": "sha512-D2y4bovYpzziGgbHYtGCMjlJM36vAl/y+xUyn1C+FVx8szd1E+86KwVw6XvYSzOP8iMpm1X0I4xJD+QtUb36OA==",
+ "dev": true,
+ "requires": {
+ "websocket-driver": "0.7.3"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
+ }
+ },
+ "source-list-map": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+ "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
+ "dev": true
+ },
+ "source-map": {
+ "version": "0.5.7",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+ "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=",
+ "dev": true
+ },
+ "source-map-resolve": {
+ "version": "0.5.2",
+ "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
+ "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
+ "dev": true,
+ "requires": {
+ "atob": "2.1.2",
+ "decode-uri-component": "0.2.0",
+ "resolve-url": "0.2.1",
+ "source-map-url": "0.4.0",
+ "urix": "0.1.0"
+ }
+ },
+ "source-map-support": {
+ "version": "0.5.16",
+ "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.16.tgz",
+ "integrity": "sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==",
+ "dev": true,
+ "requires": {
+ "buffer-from": "1.1.1",
+ "source-map": "0.6.1"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ }
+ }
+ },
+ "source-map-url": {
+ "version": "0.4.0",
+ "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
+ "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
+ "dev": true
+ },
+ "spdx-correct": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
+ "integrity": "sha512-lr2EZCctC2BNR7j7WzJ2FpDznxky1sjfxvvYEyzxNyb6lZXHODmEoJeFu4JupYlkfha1KZpJyoqiJ7pgA1qq8Q==",
+ "dev": true,
+ "requires": {
+ "spdx-expression-parse": "3.0.0",
+ "spdx-license-ids": "3.0.5"
+ }
+ },
+ "spdx-exceptions": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz",
+ "integrity": "sha512-2XQACfElKi9SlVb1CYadKDXvoajPgBVPn/gOQLrTvHdElaVhr7ZEbqJaRnJLVNeaI4cMEAgVCeBMKF6MWRDCRA==",
+ "dev": true
+ },
+ "spdx-expression-parse": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz",
+ "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==",
+ "dev": true,
+ "requires": {
+ "spdx-exceptions": "2.2.0",
+ "spdx-license-ids": "3.0.5"
+ }
+ },
+ "spdx-license-ids": {
+ "version": "3.0.5",
+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz",
+ "integrity": "sha512-J+FWzZoynJEXGphVIS+XEh3kFSjZX/1i9gFBaWQcB+/tmpe2qUsSBABpcxqxnAxFdiUFEgAX1bjYGQvIZmoz9Q==",
+ "dev": true
+ },
+ "spdy": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.1.tgz",
+ "integrity": "sha512-HeZS3PBdMA+sZSu0qwpCxl3DeALD5ASx8pAX0jZdKXSpPWbQ6SYGnlg3BBmYLx5LtiZrmkAZfErCm2oECBcioA==",
+ "dev": true,
+ "requires": {
+ "debug": "4.1.1",
+ "handle-thing": "2.0.0",
+ "http-deceiver": "1.2.7",
+ "select-hose": "2.0.0",
+ "spdy-transport": "3.0.0"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ }
+ }
+ },
+ "spdy-transport": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+ "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+ "dev": true,
+ "requires": {
+ "debug": "4.1.1",
+ "detect-node": "2.0.4",
+ "hpack.js": "2.1.6",
+ "obuf": "1.1.2",
+ "readable-stream": "3.4.0",
+ "wbuf": "1.7.3"
+ },
+ "dependencies": {
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ },
+ "readable-stream": {
+ "version": "3.4.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.4.0.tgz",
+ "integrity": "sha512-jItXPLmrSR8jmTRmRWJXCnGJsfy85mB3Wd/uINMXA65yrnFo0cPClFIUWzo2najVNSl+mx7/4W8ttlLWJe99pQ==",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.4",
+ "string_decoder": "1.1.1",
+ "util-deprecate": "1.0.2"
+ }
+ }
+ }
+ },
+ "split-string": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+ "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+ "dev": true,
+ "requires": {
+ "extend-shallow": "3.0.2"
+ }
+ },
+ "sprintf-js": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+ "dev": true
+ },
+ "sshpk": {
+ "version": "1.16.1",
+ "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz",
+ "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "asn1": "0.2.4",
+ "assert-plus": "1.0.0",
+ "bcrypt-pbkdf": "1.0.2",
+ "dashdash": "1.14.1",
+ "ecc-jsbn": "0.1.2",
+ "getpass": "0.1.7",
+ "jsbn": "0.1.1",
+ "safer-buffer": "2.1.2",
+ "tweetnacl": "0.14.5"
+ }
+ },
+ "ssri": {
+ "version": "6.0.1",
+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.1.tgz",
+ "integrity": "sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==",
+ "dev": true,
+ "requires": {
+ "figgy-pudding": "3.5.1"
+ }
+ },
+ "static-extend": {
+ "version": "0.1.2",
+ "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+ "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
+ "dev": true,
+ "requires": {
+ "define-property": "0.2.5",
+ "object-copy": "0.1.0"
+ },
+ "dependencies": {
+ "define-property": {
+ "version": "0.2.5",
+ "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+ "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+ "dev": true,
+ "requires": {
+ "is-descriptor": "0.1.6"
+ }
+ }
+ }
+ },
+ "statuses": {
+ "version": "1.5.0",
+ "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+ "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+ "dev": true
+ },
+ "stream-browserify": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz",
+ "integrity": "sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.4",
+ "readable-stream": "2.3.6"
+ }
+ },
+ "stream-each": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+ "integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
+ "dev": true,
+ "requires": {
+ "end-of-stream": "1.4.4",
+ "stream-shift": "1.0.0"
+ }
+ },
+ "stream-http": {
+ "version": "2.8.3",
+ "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz",
+ "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==",
+ "dev": true,
+ "requires": {
+ "builtin-status-codes": "3.0.0",
+ "inherits": "2.0.4",
+ "readable-stream": "2.3.6",
+ "to-arraybuffer": "1.0.1",
+ "xtend": "4.0.2"
+ }
+ },
+ "stream-shift": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz",
+ "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=",
+ "dev": true
+ },
+ "string-width": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
+ "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
+ "dev": true,
+ "requires": {
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "4.0.0"
+ }
+ },
+ "string.prototype.trimleft": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz",
+ "integrity": "sha512-FJ6b7EgdKxxbDxc79cOlok6Afd++TTs5szo+zJTUyow3ycrRfJVE2pq3vcN53XexvKZu/DJMDfeI/qMiZTrjTw==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3",
+ "function-bind": "1.1.1"
+ }
+ },
+ "string.prototype.trimright": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.0.tgz",
+ "integrity": "sha512-fXZTSV55dNBwv16uw+hh5jkghxSnc5oHq+5K/gXgizHwAvMetdAJlHqqoFC1FSDVPYWLkAKl2cxpUT41sV7nSg==",
+ "dev": true,
+ "requires": {
+ "define-properties": "1.1.3",
+ "function-bind": "1.1.1"
+ }
+ },
+ "string_decoder": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+ "dev": true,
+ "requires": {
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0"
+ }
+ },
+ "strip-bom": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz",
+ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=",
+ "dev": true
+ },
+ "strip-eof": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+ "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=",
+ "dev": true
+ },
+ "strip-json-comments": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
+ "dev": true
+ },
+ "style-loader": {
+ "version": "0.23.1",
+ "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-0.23.1.tgz",
+ "integrity": "sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==",
+ "dev": true,
+ "requires": {
+ "loader-utils": "1.2.3",
+ "schema-utils": "1.0.0"
+ }
+ },
+ "supports-color": {
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+ "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ },
+ "table": {
+ "version": "5.4.6",
+ "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz",
+ "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==",
+ "dev": true,
+ "requires": {
+ "ajv": "6.10.2",
+ "lodash": "4.17.15",
+ "slice-ansi": "2.1.0",
+ "string-width": "3.1.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+ "dev": true
+ },
+ "string-width": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "dev": true,
+ "requires": {
+ "emoji-regex": "7.0.3",
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "5.2.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "4.1.0"
+ }
+ }
+ }
+ },
+ "tapable": {
+ "version": "1.1.3",
+ "resolved": "https://registry.npmjs.org/tapable/-/tapable-1.1.3.tgz",
+ "integrity": "sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==",
+ "dev": true
+ },
+ "terser": {
+ "version": "4.4.0",
+ "resolved": "https://registry.npmjs.org/terser/-/terser-4.4.0.tgz",
+ "integrity": "sha512-oDG16n2WKm27JO8h4y/w3iqBGAOSCtq7k8dRmrn4Wf9NouL0b2WpMHGChFGZq4nFAQy1FsNJrVQHfurXOSTmOA==",
+ "dev": true,
+ "requires": {
+ "commander": "2.20.3",
+ "source-map": "0.6.1",
+ "source-map-support": "0.5.16"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ }
+ }
+ },
+ "terser-webpack-plugin": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-1.4.1.tgz",
+ "integrity": "sha512-ZXmmfiwtCLfz8WKZyYUuuHf3dMYEjg8NrjHMb0JqHVHVOSkzp3cW2/XG1fP3tRhqEqSzMwzzRQGtAPbs4Cncxg==",
+ "dev": true,
+ "requires": {
+ "cacache": "12.0.3",
+ "find-cache-dir": "2.1.0",
+ "is-wsl": "1.1.0",
+ "schema-utils": "1.0.0",
+ "serialize-javascript": "1.9.1",
+ "source-map": "0.6.1",
+ "terser": "4.4.0",
+ "webpack-sources": "1.4.3",
+ "worker-farm": "1.7.0"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ }
+ }
+ },
+ "text-table": {
+ "version": "0.2.0",
+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+ "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=",
+ "dev": true
+ },
+ "through": {
+ "version": "2.3.8",
+ "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+ "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+ "dev": true
+ },
+ "through2": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
+ "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
+ "dev": true,
+ "requires": {
+ "readable-stream": "2.3.6",
+ "xtend": "4.0.2"
+ }
+ },
+ "thunky": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+ "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==",
+ "dev": true
+ },
+ "timers-browserify": {
+ "version": "2.0.11",
+ "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz",
+ "integrity": "sha512-60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ==",
+ "dev": true,
+ "requires": {
+ "setimmediate": "1.0.5"
+ }
+ },
+ "tinycolor2": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
+ "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
+ },
+ "tmp": {
+ "version": "0.0.33",
+ "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+ "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+ "dev": true,
+ "requires": {
+ "os-tmpdir": "1.0.2"
+ }
+ },
+ "to-arraybuffer": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
+ "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=",
+ "dev": true
+ },
+ "to-fast-properties": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz",
+ "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=",
+ "dev": true
+ },
+ "to-object-path": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+ "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
+ "dev": true,
+ "requires": {
+ "kind-of": "3.2.2"
+ },
+ "dependencies": {
+ "kind-of": {
+ "version": "3.2.2",
+ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+ "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+ "dev": true,
+ "requires": {
+ "is-buffer": "1.1.6"
+ }
+ }
+ }
+ },
+ "to-regex": {
+ "version": "3.0.2",
+ "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+ "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+ "dev": true,
+ "requires": {
+ "define-property": "2.0.2",
+ "extend-shallow": "3.0.2",
+ "regex-not": "1.0.2",
+ "safe-regex": "1.1.0"
+ }
+ },
+ "to-regex-range": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+ "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+ "dev": true,
+ "requires": {
+ "is-number": "3.0.0",
+ "repeat-string": "1.6.1"
+ }
+ },
+ "toidentifier": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
+ "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
+ "dev": true
+ },
+ "tough-cookie": {
+ "version": "2.4.3",
+ "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz",
+ "integrity": "sha512-Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "psl": "1.4.0",
+ "punycode": "1.4.1"
+ },
+ "dependencies": {
+ "punycode": {
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+ "dev": true,
+ "optional": true
+ }
+ }
+ },
+ "tslib": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.10.0.tgz",
+ "integrity": "sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==",
+ "dev": true
+ },
+ "tty-browserify": {
+ "version": "0.0.0",
+ "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+ "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=",
+ "dev": true
+ },
+ "tunnel-agent": {
+ "version": "0.6.0",
+ "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+ "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "safe-buffer": "5.1.2"
+ }
+ },
+ "tweetnacl": {
+ "version": "0.14.5",
+ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+ "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+ "dev": true
+ },
+ "type-check": {
+ "version": "0.3.2",
+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+ "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+ "dev": true,
+ "requires": {
+ "prelude-ls": "1.1.2"
+ }
+ },
+ "type-is": {
+ "version": "1.6.18",
+ "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+ "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+ "dev": true,
+ "requires": {
+ "media-typer": "0.3.0",
+ "mime-types": "2.1.25"
+ }
+ },
+ "typedarray": {
+ "version": "0.0.6",
+ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+ "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+ "dev": true
+ },
+ "ua-parser-js": {
+ "version": "0.7.20",
+ "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.20.tgz",
+ "integrity": "sha512-8OaIKfzL5cpx8eCMAhhvTlft8GYF8b2eQr6JkCyVdrgjcytyOmPCXrqXFcUnhonRpLlh5yxEZVohm6mzaowUOw=="
+ },
+ "unicode-canonical-property-names-ecmascript": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
+ "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==",
+ "dev": true
+ },
+ "unicode-match-property-ecmascript": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz",
+ "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==",
+ "dev": true,
+ "requires": {
+ "unicode-canonical-property-names-ecmascript": "1.0.4",
+ "unicode-property-aliases-ecmascript": "1.0.5"
+ }
+ },
+ "unicode-match-property-value-ecmascript": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
+ "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
+ "dev": true
+ },
+ "unicode-property-aliases-ecmascript": {
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
+ "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
+ "dev": true
+ },
+ "union-value": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+ "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+ "dev": true,
+ "requires": {
+ "arr-union": "3.1.0",
+ "get-value": "2.0.6",
+ "is-extendable": "0.1.1",
+ "set-value": "2.0.1"
+ }
+ },
+ "uniq": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz",
+ "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=",
+ "dev": true
+ },
+ "unique-filename": {
+ "version": "1.1.1",
+ "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+ "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+ "dev": true,
+ "requires": {
+ "unique-slug": "2.0.2"
+ }
+ },
+ "unique-slug": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+ "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+ "dev": true,
+ "requires": {
+ "imurmurhash": "0.1.4"
+ }
+ },
+ "unpipe": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+ "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+ "dev": true
+ },
+ "unset-value": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+ "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
+ "dev": true,
+ "requires": {
+ "has-value": "0.3.1",
+ "isobject": "3.0.1"
+ },
+ "dependencies": {
+ "has-value": {
+ "version": "0.3.1",
+ "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+ "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
+ "dev": true,
+ "requires": {
+ "get-value": "2.0.6",
+ "has-values": "0.1.4",
+ "isobject": "2.1.0"
+ },
+ "dependencies": {
+ "isobject": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+ "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+ "dev": true,
+ "requires": {
+ "isarray": "1.0.0"
+ }
+ }
+ }
+ },
+ "has-values": {
+ "version": "0.1.4",
+ "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+ "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
+ "dev": true
+ }
+ }
+ },
+ "upath": {
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/upath/-/upath-1.2.0.tgz",
+ "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==",
+ "dev": true
+ },
+ "uri-js": {
+ "version": "4.2.2",
+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz",
+ "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==",
+ "dev": true,
+ "requires": {
+ "punycode": "2.1.1"
+ }
+ },
+ "urix": {
+ "version": "0.1.0",
+ "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+ "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
+ "dev": true
+ },
+ "url": {
+ "version": "0.11.0",
+ "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz",
+ "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=",
+ "dev": true,
+ "requires": {
+ "punycode": "1.3.2",
+ "querystring": "0.2.0"
+ },
+ "dependencies": {
+ "punycode": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+ "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=",
+ "dev": true
+ }
+ }
+ },
+ "url-parse": {
+ "version": "1.4.7",
+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.7.tgz",
+ "integrity": "sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==",
+ "dev": true,
+ "requires": {
+ "querystringify": "2.1.1",
+ "requires-port": "1.0.0"
+ }
+ },
+ "use": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+ "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+ "dev": true
+ },
+ "util": {
+ "version": "0.11.1",
+ "resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
+ "integrity": "sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==",
+ "dev": true,
+ "requires": {
+ "inherits": "2.0.3"
+ },
+ "dependencies": {
+ "inherits": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+ "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+ "dev": true
+ }
+ }
+ },
+ "util-deprecate": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+ "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+ "dev": true
+ },
+ "utils-merge": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+ "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+ "dev": true
+ },
+ "uuid": {
+ "version": "3.3.3",
+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
+ "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ==",
+ "dev": true
+ },
+ "v8-compile-cache": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz",
+ "integrity": "sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==",
+ "dev": true
+ },
+ "validate-npm-package-license": {
+ "version": "3.0.4",
+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+ "dev": true,
+ "requires": {
+ "spdx-correct": "3.1.0",
+ "spdx-expression-parse": "3.0.0"
+ }
+ },
+ "vary": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+ "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=",
+ "dev": true
+ },
+ "verror": {
+ "version": "1.10.0",
+ "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+ "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+ "dev": true,
+ "optional": true,
+ "requires": {
+ "assert-plus": "1.0.0",
+ "core-util-is": "1.0.2",
+ "extsprintf": "1.3.0"
+ }
+ },
+ "vm-browserify": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz",
+ "integrity": "sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==",
+ "dev": true
+ },
+ "watchpack": {
+ "version": "1.6.0",
+ "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
+ "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+ "dev": true,
+ "requires": {
+ "chokidar": "2.1.8",
+ "graceful-fs": "4.2.3",
+ "neo-async": "2.6.1"
+ }
+ },
+ "wbuf": {
+ "version": "1.7.3",
+ "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+ "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+ "dev": true,
+ "requires": {
+ "minimalistic-assert": "1.0.1"
+ }
+ },
+ "webpack": {
+ "version": "4.41.2",
+ "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.41.2.tgz",
+ "integrity": "sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==",
+ "dev": true,
+ "requires": {
+ "@webassemblyjs/ast": "1.8.5",
+ "@webassemblyjs/helper-module-context": "1.8.5",
+ "@webassemblyjs/wasm-edit": "1.8.5",
+ "@webassemblyjs/wasm-parser": "1.8.5",
+ "acorn": "6.3.0",
+ "ajv": "6.10.2",
+ "ajv-keywords": "3.4.1",
+ "chrome-trace-event": "1.0.2",
+ "enhanced-resolve": "4.1.1",
+ "eslint-scope": "4.0.3",
+ "json-parse-better-errors": "1.0.2",
+ "loader-runner": "2.4.0",
+ "loader-utils": "1.2.3",
+ "memory-fs": "0.4.1",
+ "micromatch": "3.1.10",
+ "mkdirp": "0.5.1",
+ "neo-async": "2.6.1",
+ "node-libs-browser": "2.2.1",
+ "schema-utils": "1.0.0",
+ "tapable": "1.1.3",
+ "terser-webpack-plugin": "1.4.1",
+ "watchpack": "1.6.0",
+ "webpack-sources": "1.4.3"
+ }
+ },
+ "webpack-cli": {
+ "version": "3.3.10",
+ "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-3.3.10.tgz",
+ "integrity": "sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==",
+ "dev": true,
+ "requires": {
+ "chalk": "2.4.2",
+ "cross-spawn": "6.0.5",
+ "enhanced-resolve": "4.1.0",
+ "findup-sync": "3.0.0",
+ "global-modules": "2.0.0",
+ "import-local": "2.0.0",
+ "interpret": "1.2.0",
+ "loader-utils": "1.2.3",
+ "supports-color": "6.1.0",
+ "v8-compile-cache": "2.0.3",
+ "yargs": "13.2.4"
+ },
+ "dependencies": {
+ "enhanced-resolve": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz",
+ "integrity": "sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==",
+ "dev": true,
+ "requires": {
+ "graceful-fs": "4.2.3",
+ "memory-fs": "0.4.1",
+ "tapable": "1.1.3"
+ }
+ },
+ "supports-color": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ }
+ }
+ },
+ "webpack-dev-middleware": {
+ "version": "3.7.2",
+ "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.7.2.tgz",
+ "integrity": "sha512-1xC42LxbYoqLNAhV6YzTYacicgMZQTqRd27Sim9wn5hJrX3I5nxYy1SxSd4+gjUFsz1dQFj+yEe6zEVmSkeJjw==",
+ "dev": true,
+ "requires": {
+ "memory-fs": "0.4.1",
+ "mime": "2.4.4",
+ "mkdirp": "0.5.1",
+ "range-parser": "1.2.1",
+ "webpack-log": "2.0.0"
+ },
+ "dependencies": {
+ "mime": {
+ "version": "2.4.4",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.4.tgz",
+ "integrity": "sha512-LRxmNwziLPT828z+4YkNzloCFC2YM4wrB99k+AV5ZbEyfGNWfG8SO1FUXLmLDBSo89NrJZ4DIWeLjy1CHGhMGA==",
+ "dev": true
+ }
+ }
+ },
+ "webpack-dev-server": {
+ "version": "3.9.0",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.9.0.tgz",
+ "integrity": "sha512-E6uQ4kRrTX9URN9s/lIbqTAztwEPdvzVrcmHE8EQ9YnuT9J8Es5Wrd8n9BKg1a0oZ5EgEke/EQFgUsp18dSTBw==",
+ "dev": true,
+ "requires": {
+ "ansi-html": "0.0.7",
+ "bonjour": "3.5.0",
+ "chokidar": "2.1.8",
+ "compression": "1.7.4",
+ "connect-history-api-fallback": "1.6.0",
+ "debug": "4.1.1",
+ "del": "4.1.1",
+ "express": "4.17.1",
+ "html-entities": "1.2.1",
+ "http-proxy-middleware": "0.19.1",
+ "import-local": "2.0.0",
+ "internal-ip": "4.3.0",
+ "ip": "1.1.5",
+ "is-absolute-url": "3.0.3",
+ "killable": "1.0.1",
+ "loglevel": "1.6.6",
+ "opn": "5.5.0",
+ "p-retry": "3.0.1",
+ "portfinder": "1.0.25",
+ "schema-utils": "1.0.0",
+ "selfsigned": "1.10.7",
+ "semver": "6.3.0",
+ "serve-index": "1.9.1",
+ "sockjs": "0.3.19",
+ "sockjs-client": "1.4.0",
+ "spdy": "4.0.1",
+ "strip-ansi": "3.0.1",
+ "supports-color": "6.1.0",
+ "url": "0.11.0",
+ "webpack-dev-middleware": "3.7.2",
+ "webpack-log": "2.0.0",
+ "ws": "6.2.1",
+ "yargs": "12.0.5"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+ "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+ "dev": true
+ },
+ "cliui": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-4.1.0.tgz",
+ "integrity": "sha512-4FG+RSG9DL7uEwRUZXZn3SS34DiDPfzP0VOiEwtUWlE+AR2EIg+hSyvrIgUUfhdgR/UkAeW2QHgeP+hWrXs7jQ==",
+ "dev": true,
+ "requires": {
+ "string-width": "2.1.1",
+ "strip-ansi": "4.0.0",
+ "wrap-ansi": "2.1.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
+ "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
+ "dev": true
+ },
+ "strip-ansi": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
+ "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "3.0.0"
+ }
+ }
+ }
+ },
+ "debug": {
+ "version": "4.1.1",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
+ "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+ "dev": true,
+ "requires": {
+ "ms": "2.1.2"
+ }
+ },
+ "get-caller-file": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz",
+ "integrity": "sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==",
+ "dev": true
+ },
+ "is-fullwidth-code-point": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+ "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+ "dev": true,
+ "requires": {
+ "number-is-nan": "1.0.1"
+ }
+ },
+ "ms": {
+ "version": "2.1.2",
+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+ "dev": true
+ },
+ "require-main-filename": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz",
+ "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=",
+ "dev": true
+ },
+ "semver": {
+ "version": "6.3.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+ "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+ "dev": true
+ },
+ "strip-ansi": {
+ "version": "3.0.1",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+ "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "2.1.1"
+ }
+ },
+ "supports-color": {
+ "version": "6.1.0",
+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz",
+ "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==",
+ "dev": true,
+ "requires": {
+ "has-flag": "3.0.0"
+ }
+ },
+ "wrap-ansi": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz",
+ "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=",
+ "dev": true,
+ "requires": {
+ "string-width": "1.0.2",
+ "strip-ansi": "3.0.1"
+ },
+ "dependencies": {
+ "string-width": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+ "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+ "dev": true,
+ "requires": {
+ "code-point-at": "1.1.0",
+ "is-fullwidth-code-point": "1.0.0",
+ "strip-ansi": "3.0.1"
+ }
+ }
+ }
+ },
+ "yargs": {
+ "version": "12.0.5",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.5.tgz",
+ "integrity": "sha512-Lhz8TLaYnxq/2ObqHDql8dX8CJi97oHxrjUcYtzKbbykPtVW9WB+poxI+NM2UIzsMgNCZTIf0AQwsjK5yMAqZw==",
+ "dev": true,
+ "requires": {
+ "cliui": "4.1.0",
+ "decamelize": "1.2.0",
+ "find-up": "3.0.0",
+ "get-caller-file": "1.0.3",
+ "os-locale": "3.1.0",
+ "require-directory": "2.1.1",
+ "require-main-filename": "1.0.1",
+ "set-blocking": "2.0.0",
+ "string-width": "2.1.1",
+ "which-module": "2.0.0",
+ "y18n": "4.0.0",
+ "yargs-parser": "11.1.1"
+ }
+ },
+ "yargs-parser": {
+ "version": "11.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-11.1.1.tgz",
+ "integrity": "sha512-C6kB/WJDiaxONLJQnF8ccx9SEeoTTLek8RVbaOIsrAUS8VrBEXfmeSnCZxygc+XC2sNMBIwOOnfcxiynjHsVSQ==",
+ "dev": true,
+ "requires": {
+ "camelcase": "5.3.1",
+ "decamelize": "1.2.0"
+ }
+ }
+ }
+ },
+ "webpack-log": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/webpack-log/-/webpack-log-2.0.0.tgz",
+ "integrity": "sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==",
+ "dev": true,
+ "requires": {
+ "ansi-colors": "3.2.4",
+ "uuid": "3.3.3"
+ }
+ },
+ "webpack-sources": {
+ "version": "1.4.3",
+ "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.4.3.tgz",
+ "integrity": "sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==",
+ "dev": true,
+ "requires": {
+ "source-list-map": "2.0.1",
+ "source-map": "0.6.1"
+ },
+ "dependencies": {
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+ "dev": true
+ }
+ }
+ },
+ "websocket-driver": {
+ "version": "0.7.3",
+ "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.3.tgz",
+ "integrity": "sha512-bpxWlvbbB459Mlipc5GBzzZwhoZgGEZLuqPaR0INBGnPAY1vdBX6hPnoFXiw+3yWxDuHyQjO2oXTMyS8A5haFg==",
+ "dev": true,
+ "requires": {
+ "http-parser-js": "0.4.10",
+ "safe-buffer": "5.1.2",
+ "websocket-extensions": "0.1.3"
+ }
+ },
+ "websocket-extensions": {
+ "version": "0.1.3",
+ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz",
+ "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
+ "dev": true
+ },
+ "whatwg-fetch": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz",
+ "integrity": "sha512-9GSJUgz1D4MfyKU7KRqwOjXCXTqWdFNvEr7eUBYchQiVc744mqK/MzXPNR2WsPkmkOa4ywfg8C2n8h+13Bey1Q=="
+ },
+ "which": {
+ "version": "1.3.1",
+ "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+ "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+ "dev": true,
+ "requires": {
+ "isexe": "2.0.0"
+ }
+ },
+ "which-module": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz",
+ "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=",
+ "dev": true
+ },
+ "wolfy87-eventemitter": {
+ "version": "5.2.8",
+ "resolved": "https://registry.npmjs.org/wolfy87-eventemitter/-/wolfy87-eventemitter-5.2.8.tgz",
+ "integrity": "sha512-Z+wAU9SyuOZgFj22zBl8sg0auJOkrKBZl8TTlEM5dRDDs2zPtlm72vPJUIlf6tUJ4w2JLgrF7VznRnQHP+Rn/Q=="
+ },
+ "word-wrap": {
+ "version": "1.2.3",
+ "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+ "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+ "dev": true
+ },
+ "worker-farm": {
+ "version": "1.7.0",
+ "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.7.0.tgz",
+ "integrity": "sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==",
+ "dev": true,
+ "requires": {
+ "errno": "0.1.7"
+ }
+ },
+ "wrap-ansi": {
+ "version": "5.1.0",
+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
+ "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
+ "dev": true,
+ "requires": {
+ "ansi-styles": "3.2.1",
+ "string-width": "3.1.0",
+ "strip-ansi": "5.2.0"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+ "dev": true
+ },
+ "string-width": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "dev": true,
+ "requires": {
+ "emoji-regex": "7.0.3",
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "5.2.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "4.1.0"
+ }
+ }
+ }
+ },
+ "wrappy": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+ "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+ "dev": true
+ },
+ "write": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz",
+ "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==",
+ "dev": true,
+ "requires": {
+ "mkdirp": "0.5.1"
+ }
+ },
+ "ws": {
+ "version": "6.2.1",
+ "resolved": "https://registry.npmjs.org/ws/-/ws-6.2.1.tgz",
+ "integrity": "sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==",
+ "dev": true,
+ "requires": {
+ "async-limiter": "1.0.1"
+ }
+ },
+ "xtend": {
+ "version": "4.0.2",
+ "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+ "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+ "dev": true
+ },
+ "y18n": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
+ "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+ "dev": true
+ },
+ "yallist": {
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+ "dev": true
+ },
+ "yargs": {
+ "version": "13.2.4",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.4.tgz",
+ "integrity": "sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==",
+ "dev": true,
+ "requires": {
+ "cliui": "5.0.0",
+ "find-up": "3.0.0",
+ "get-caller-file": "2.0.5",
+ "os-locale": "3.1.0",
+ "require-directory": "2.1.1",
+ "require-main-filename": "2.0.0",
+ "set-blocking": "2.0.0",
+ "string-width": "3.1.0",
+ "which-module": "2.0.0",
+ "y18n": "4.0.0",
+ "yargs-parser": "13.1.1"
+ },
+ "dependencies": {
+ "ansi-regex": {
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz",
+ "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==",
+ "dev": true
+ },
+ "string-width": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "dev": true,
+ "requires": {
+ "emoji-regex": "7.0.3",
+ "is-fullwidth-code-point": "2.0.0",
+ "strip-ansi": "5.2.0"
+ }
+ },
+ "strip-ansi": {
+ "version": "5.2.0",
+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+ "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+ "dev": true,
+ "requires": {
+ "ansi-regex": "4.1.0"
+ }
+ }
+ }
+ },
+ "yargs-parser": {
+ "version": "13.1.1",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
+ "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+ "dev": true,
+ "requires": {
+ "camelcase": "5.3.1",
+ "decamelize": "1.2.0"
+ }
+ }
+ }
+}
diff --git a/saga/seata-saga-statemachine-designer/package.json b/saga/seata-saga-statemachine-designer/package.json
new file mode 100644
index 0000000000000000000000000000000000000000..76a7412bc1fc8fe60fd1ac76a6a6ef8ce5270a3b
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/package.json
@@ -0,0 +1,95 @@
+{
+ "name": "seata-saga-statemachine-designer",
+ "version": "0.0.1",
+ "description": "A visual graph designer for Seata Saga StateMachine based on GGEdior 2.0.4",
+ "keywords": [
+ "react",
+ "graphics",
+ "designer",
+ "seata",
+ "saga",
+ "state machine"
+ ],
+ "main": "cjs/index.js",
+ "module": "es/index.js",
+ "types": "typings/index.d.ts",
+ "files": [
+ "src",
+ "es",
+ "cjs",
+ "dist",
+ "*.md",
+ "typings"
+ ],
+ "scripts": {
+ "start": "webpack-dev-server --config ./tools/webpack.config.dev.js --open",
+ "build": "rimraf ./dist && webpack --config ./tools/webpack.config.prod.js"
+ },
+ "repository": {
+ "type": "git",
+ "url": "git+https://github.com/seata/seata.git"
+ },
+ "authors": [
+ {
+ "name": "陈龙",
+ "email": "long_187@126.com"
+ },
+ {
+ "name": "高力",
+ "email": "3071730@qq.com"
+ }
+ ],
+ "license": "Apache License, Version 2.0",
+ "bugs": {
+ "url": "https://github.com/seata/seata/issues"
+ },
+ "homepage": "http://seata.io/",
+ "peerDependencies": {
+ "react": "^16.3.0"
+ },
+ "dependencies": {
+ "@antv/g6": "^2.2.6",
+ "codemirror": "^5.49.2",
+ "core-js": "^3.0.0",
+ "gg-editor-core": "1.3.4",
+ "lodash": "^4.17.10",
+ "react-codemirror": "^1.0.0"
+ },
+ "devDependencies": {
+ "@babel/cli": "^7.2.3",
+ "@babel/core": "^7.2.2",
+ "@babel/plugin-proposal-class-properties": "^7.2.3",
+ "@babel/plugin-transform-modules-commonjs": "^7.2.0",
+ "@babel/plugin-transform-runtime": "^7.2.0",
+ "@babel/polyfill": "^7.2.5",
+ "@babel/preset-env": "^7.2.3",
+ "@babel/preset-react": "^7.0.0",
+ "@babel/runtime": "^7.2.0",
+ "babel-eslint": "^10.0.1",
+ "babel-loader": "^8.0.4",
+ "babel-plugin-module-resolver": "^3.1.1",
+ "babel-plugin-transform-inline-environment-variables": "^0.4.3",
+ "cross-env": "^5.2.0",
+ "css-loader": "^2.1.0",
+ "cz-conventional-changelog": "^2.1.0",
+ "eslint": "^5.11.1",
+ "eslint-config-airbnb": "^17.1.0",
+ "eslint-plugin-import": "^2.14.0",
+ "eslint-plugin-jsx-a11y": "^6.1.2",
+ "eslint-plugin-react": "^7.11.1",
+ "less": "^3.9.0",
+ "less-loader": "^4.1.0",
+ "postcss-loader": "^3.0.0",
+ "postcss-preset-env": "^6.5.0",
+ "rimraf": "^2.6.2",
+ "style-loader": "^0.23.1",
+ "webpack": "^4.28.2",
+ "webpack-cli": "^3.1.2",
+ "webpack-dev-server": "^3.1.14"
+ },
+ "config": {
+ "commitizen": {
+ "path": "./node_modules/cz-conventional-changelog"
+ }
+ }
+}
\ No newline at end of file
diff --git a/saga/seata-saga-statemachine-designer/src/Flow/WorkSpace.js b/saga/seata-saga-statemachine-designer/src/Flow/WorkSpace.js
new file mode 100644
index 0000000000000000000000000000000000000000..c0e91916b2f542412af185fde241bbfed4294908
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/Flow/WorkSpace.js
@@ -0,0 +1,102 @@
+import React from 'react';
+import { withPropsAPI, Flow } from 'gg-editor';
+import styles from './index.less';
+import CodeMirror from 'react-codemirror';
+import 'codemirror/lib/codemirror.css'
+import 'codemirror/mode/javascript/javascript'
+
+const nodeIndexes = {
+ Start: 1,
+ ServiceTask: 1,
+ Compensation: 1,
+ Choice: 1,
+ Succeed: 1,
+ Fail: 1,
+ Catch: 1,
+ CompensationTrigger: 1,
+ SubStateMachine: 1
+}
+
+class WorkSpaceBase extends React.Component {
+
+ toGGEditorData(dataMap) {
+ const data = { nodes: [], edges: [] };
+ Object.values(dataMap).map(value => {
+
+ if (value.type && value.type == 'node') {
+ data.nodes[data.nodes.length] = value;
+ }
+ else if (value.source && value.target) {
+ data.edges[data.edges.length] = value;
+ }
+ });
+ return data;
+ };
+
+ changeFlowData(param) {
+ const { propsAPI, setFlowData } = this.props;
+ const { executeCommand, update } = propsAPI;
+
+ if (param.action == 'add' && param.item.type == 'edge') {
+ if (param.item.target && param.item.target.model && param.item.target.model.stateType == 'Compensation') {
+ executeCommand(() => {
+ update(param.item, {
+ style: {
+ lineDash: "4",
+ }
+ });
+ });
+ }
+ else if (param.item.source && param.item.source.model) {
+ if (param.item.source.model.stateType == 'Choice') {
+ const choiceLinePropsTemplate = {
+ "Expression": "",
+ "Default": false
+ };
+ executeCommand(() => {
+ update(param.item, {
+ stateProps: choiceLinePropsTemplate
+ });
+ });
+ }
+ else if (param.item.source.model.stateType == 'Catch') {
+ const catchLinePropsTemplate = {
+ "Exceptions": [""]
+ };
+ executeCommand(() => {
+ update(param.item, {
+ stateProps: catchLinePropsTemplate
+ });
+ });
+ }
+ }
+ }
+
+ if (param.action == 'add' && param.item.type == 'node' && param.item.model) {
+ param.item.model.stateId = param.item.model.stateId + nodeIndexes[param.item.model.stateType]++;
+ if (param.item.model.stateType == 'ServiceTask'
+ || param.item.model.stateType == 'Compensation'
+ || param.item.model.stateType == 'SubStateMachine') {
+ param.item.model.label = param.item.model.stateId;
+ }
+ }
+
+ param.item && setFlowData(this.toGGEditorData(param.item.dataMap));
+ };
+
+ render() {
+ const { showJson, flowData, setFlowData } = this.props;
+
+ return <>
+ {showJson && <CodeMirror value={JSON.stringify(flowData, null, 2)} options={{
+ lineNumbers: true,
+ mode: 'javascript'
+ }} onChange={(newValue) => {
+ setFlowData(JSON.parse(newValue));
+ }}></CodeMirror>}
+ <Flow className={styles.flow + (showJson ? ' ' + styles.hidden : '')} data={flowData} onAfterChange={this.changeFlowData.bind(this)} />
+ </>
+ }
+}
+
+export const WorkSpace = withPropsAPI(WorkSpaceBase)
\ No newline at end of file
diff --git a/saga/seata-saga-statemachine-designer/src/Flow/index.js b/saga/seata-saga-statemachine-designer/src/Flow/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..2c64a6ab36d26847a761f6d15c43ff430e213135
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/Flow/index.js
@@ -0,0 +1,41 @@
+import React, { useState } from 'react';
+import { Row, Col } from 'antd';
+import GGEditor from 'gg-editor';
+import EditorMinimap from '../components/EditorMinimap';
+import { FlowContextMenu } from '../components/EditorContextMenu';
+import { FlowToolbar } from '../components/EditorToolbar';
+import { FlowItemPanel } from '../components/EditorItemPanel';
+import { FlowDetailPanel } from '../components/EditorDetailPanel';
+import styles from './index.less';
+import { WorkSpace } from './WorkSpace';
+
+const FlowPage = () => {
+
+ const [showJson, setShowJson] = useState(false);
+ const [flowData, setFlowData] = useState({});
+
+ return (
+ <GGEditor className={styles.editor}>
+ <Row type="flex" className={styles.editorHd}>
+ <Col span={24}>
+ <FlowToolbar setShowJson={setShowJson} />
+ </Col>
+ </Row>
+ <Row type="flex" className={styles.editorBd}>
+ <Col span={3} className={styles.editorSidebar}>
+ <FlowItemPanel />
+ </Col>
+ <Col span={16} className={styles.editorContent}>
+ <WorkSpace showJson={showJson} flowData={flowData} setFlowData={setFlowData} />
+ </Col>
+ <Col span={5} className={styles.editorSidebar}>
+ <FlowDetailPanel />
+ <EditorMinimap />
+ </Col>
+ </Row>
+ <FlowContextMenu />
+ </GGEditor>
+ );
+};
+
+export default FlowPage;
diff --git a/saga/seata-saga-statemachine-designer/src/Flow/index.less b/saga/seata-saga-statemachine-designer/src/Flow/index.less
new file mode 100644
index 0000000000000000000000000000000000000000..dc114e9bba73b50300f80f2baf3f2a2550a53fd9
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/Flow/index.less
@@ -0,0 +1,57 @@
+.editor {
+ display: flex;
+ flex-direction: column;
+ height: 100vh;
+ background: #fff;
+}
+
+.editorHd {
+ padding: 8px;
+ border: 1px solid #e6e9ed;
+}
+
+.editorBd {
+ flex: 1;
+ overflow: auto;
+}
+
+.editorSidebar,
+.editorContent {
+ display: flex;
+ flex-direction: column;
+}
+
+.editorSidebar {
+ background: #fafafa;
+
+ &:first-child {
+ border-right: 1px solid #e6e9ed;
+ }
+
+ &:last-child {
+ border-left: 1px solid #e6e9ed;
+ }
+}
+
+.flow,
+.mind,
+.koni {
+ flex: 1;
+ // https://github.com/philipwalton/flexbugs/issues/197#issuecomment-378908438
+ height: 0;
+}
+
+.hidden {
+ display: none;
+}
+
+:global {
+ .ReactCodeMirror {
+ flex: 1;
+
+ .CodeMirror {
+ height: 100%;
+ }
+ }
+}
+
diff --git a/saga/seata-saga-statemachine-designer/src/common/IconFont/index.js b/saga/seata-saga-statemachine-designer/src/common/IconFont/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..cc5b126a2ea7b617dd8702199a56f50e0d60a024
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/common/IconFont/index.js
@@ -0,0 +1,13 @@
+import { Icon } from 'antd';
+
+const IconFont = Icon.createFromIconfontCN({
+ scriptUrl: 'https://at.alicdn.com/t/font_1101588_01zniftxm9yp.js',
+});
+
+export default IconFont;
+
+export const IconFontExt = Icon.createFromIconfontCN({
+ scriptUrl: 'https://at.alicdn.com/t/font_1529997_6nr9bramkvp.js',
+});
+
+
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/FlowContextMenu.js b/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/FlowContextMenu.js
new file mode 100644
index 0000000000000000000000000000000000000000..c29e1a0ee1f52c998c1ae3c299eec5bc4bb5d3da
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/FlowContextMenu.js
@@ -0,0 +1,34 @@
+import React from 'react';
+import { NodeMenu, EdgeMenu, GroupMenu, MultiMenu, CanvasMenu, ContextMenu } from 'gg-editor';
+import MenuItem from './MenuItem';
+import styles from './index.less';
+
+const FlowContextMenu = () => {
+ return (
+ <ContextMenu className={styles.contextMenu}>
+ <NodeMenu>
+ <MenuItem command="copy" />
+ <MenuItem command="delete" />
+ </NodeMenu>
+ <EdgeMenu>
+ <MenuItem command="delete" />
+ </EdgeMenu>
+ <GroupMenu>
+ <MenuItem command="copy" />
+ <MenuItem command="delete" />
+ </GroupMenu>
+ <MultiMenu>
+ <MenuItem command="copy" />
+ <MenuItem command="paste" />
+ <MenuItem command="delete" />
+ </MultiMenu>
+ <CanvasMenu>
+ <MenuItem command="undo" />
+ <MenuItem command="redo" />
+ <MenuItem command="pasteHere" icon="paste" text="Paste Here" />
+ </CanvasMenu>
+ </ContextMenu>
+ );
+};
+
+export default FlowContextMenu;
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/MenuItem.js b/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/MenuItem.js
new file mode 100644
index 0000000000000000000000000000000000000000..09f5b4622c4d09d1c67b62222d0c0801b36338d7
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/MenuItem.js
@@ -0,0 +1,20 @@
+import React from 'react';
+import { Command } from 'gg-editor';
+import upperFirst from 'lodash/upperFirst';
+import IconFont from '../../common/IconFont';
+import styles from './index.less';
+
+const MenuItem = (props) => {
+ const { command, icon, text } = props;
+
+ return (
+ <Command name={command}>
+ <div className={styles.item}>
+ <IconFont type={`icon-${icon || command}`} />
+ <span>{text || upperFirst(command)}</span>
+ </div>
+ </Command>
+ );
+};
+
+export default MenuItem;
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/index.js b/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..a30124952072f259ae30fbe029b617a67edb4e64
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/index.js
@@ -0,0 +1,3 @@
+import FlowContextMenu from './FlowContextMenu';
+
+export { FlowContextMenu };
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/index.less b/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/index.less
new file mode 100644
index 0000000000000000000000000000000000000000..8a2cdae3bfbe5ffaaef812f8ab22677f5340dc91
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorContextMenu/index.less
@@ -0,0 +1,39 @@
+.contextMenu {
+ display: none;
+ overflow: hidden;
+ background: #fff;
+ border-radius: 4px;
+ box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+
+ .item {
+ display: flex;
+ align-items: center;
+ padding: 5px 12px;
+ cursor: pointer;
+ transition: all 0.3s;
+ user-select: none;
+
+ &:hover {
+ background: #e6f7ff;
+ }
+
+ i {
+ margin-right: 8px;
+ }
+ }
+
+ :global {
+ .disable {
+ :local {
+ .item {
+ color: rgba(0, 0, 0, 0.25);
+ cursor: auto;
+
+ &:hover {
+ background: #fff;
+ }
+ }
+ }
+ }
+ }
+}
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/DetailForm.js b/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/DetailForm.js
new file mode 100644
index 0000000000000000000000000000000000000000..9b89c260a561e298f5fb449d365502fa8594212c
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/DetailForm.js
@@ -0,0 +1,162 @@
+import React, { Fragment } from 'react';
+import { Card, Form, Input, Select, Button } from 'antd';
+import { withPropsAPI } from 'gg-editor';
+import upperFirst from 'lodash/upperFirst';
+
+const { Item } = Form;
+const { Option } = Select;
+const { TextArea } = Input;
+
+const inlineFormItemLayout = {
+ labelCol: {
+ sm: { span: 5 },
+ },
+ wrapperCol: {
+ sm: { span: 19 },
+ },
+};
+
+let lastSelectedItem;
+
+class DetailForm extends React.Component {
+ get item() {
+ const { propsAPI } = this.props;
+
+ return propsAPI.getSelected()[0] ? propsAPI.getSelected()[0] : lastSelectedItem;
+ }
+
+ handleSubmit = (e) => {
+ if (e && e.preventDefault) {
+ e.preventDefault();
+ }
+
+ const { form, propsAPI } = this.props;
+ const { executeCommand, update } = propsAPI;
+
+ setTimeout(() => {
+ form.validateFieldsAndScroll((err, values) => {
+ if (err) {
+ return;
+ }
+
+ const item = this.item;
+
+ if (!item) {
+ return;
+ }
+
+ if (values.stateProps) {
+ values.stateProps = JSON.parse(values.stateProps);
+ }
+
+ lastSelectedItem = item;
+
+ executeCommand(() => {
+ update(item, {
+ ...values,
+ });
+ });
+ });
+ }, 0);
+ };
+
+ renderEdgeShapeSelect = () => {
+ return (
+ <Select onChange={this.handleSubmit}>
+ <Option value="flow-smooth">Smooth</Option>
+ <Option value="flow-polyline">Polyline</Option>
+ <Option value="flow-polyline-round">Polyline Round</Option>
+ </Select>
+ );
+ };
+
+ renderNodeDetail = () => {
+ const { form } = this.props;
+ const { label, stateId, stateType, stateProps } = this.item.getModel();
+
+ return (
+ <Fragment>
+ <Item label="Label" {...inlineFormItemLayout}>
+ {form.getFieldDecorator('label', {
+ initialValue: label,
+ })(<Input onBlur={this.handleSubmit} />)}
+ </Item>
+ <Item label="Id" {...inlineFormItemLayout}>
+ {form.getFieldDecorator('stateId', {
+ initialValue: stateId,
+ })(<Input onBlur={this.handleSubmit} />)}
+ </Item>
+ <Item label="Type" {...inlineFormItemLayout}>
+ {form.getFieldDecorator('stateType', {
+ initialValue: stateType,
+ })(<Input readOnly={true} />)}
+ </Item>
+ <Item label="Props" {...inlineFormItemLayout}>
+ {form.getFieldDecorator('stateProps', {
+ initialValue: JSON.stringify(stateProps, null, 2),
+ })(<TextArea onBlur={this.handleSubmit} rows={16} />)}
+ </Item>
+ <a target="_blank" style={{ float: 'right' }} href="http://seata.io/zh-cn/docs/user/saga.html">How to fill the properties?</a>
+ </Fragment >
+ );
+ };
+
+ renderEdgeDetail = () => {
+ const { form } = this.props;
+ const { label = '', shape = 'flow-smooth', stateProps } = this.item.getModel();
+
+ return (
+ <Fragment>
+ <Item label="Label" {...inlineFormItemLayout}>
+ {form.getFieldDecorator('label', {
+ initialValue: label,
+ })(<Input onBlur={this.handleSubmit} />)}
+ </Item>
+ <Item label="Shape" {...inlineFormItemLayout}>
+ {form.getFieldDecorator('shape', {
+ initialValue: shape,
+ })(this.renderEdgeShapeSelect())}
+ </Item>
+ <Item label="Props" {...inlineFormItemLayout}>
+ {form.getFieldDecorator('stateProps', {
+ initialValue: JSON.stringify(stateProps, null, 2),
+ })(<TextArea onBlur={this.handleSubmit} rows={16} />)}
+ </Item>
+ <a target="_blank" style={{ float: 'right' }} href="http://seata.io/zh-cn/docs/user/saga.html">How to fill the properties?</a>
+ </Fragment>
+ );
+ };
+
+ renderGroupDetail = () => {
+ const { form } = this.props;
+ const { label = 'New Group' } = this.item.getModel();
+
+ return (
+ <Item label="Label" {...inlineFormItemLayout}>
+ {form.getFieldDecorator('label', {
+ initialValue: label,
+ })(<Input onBlur={this.handleSubmit} />)}
+ </Item>
+ );
+ };
+
+ render() {
+ const { type } = this.props;
+
+ if (!this.item) {
+ return null;
+ }
+
+ return (
+ <Card type="inner" size="small" title={upperFirst(type)} bordered={false}>
+ <Form onSubmit={this.handleSubmit}>
+ {type === 'node' && this.renderNodeDetail()}
+ {type === 'edge' && this.renderEdgeDetail()}
+ {type === 'group' && this.renderGroupDetail()}
+ </Form>
+ </Card>
+ );
+ }
+}
+
+export default Form.create()(withPropsAPI(DetailForm));
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/FlowDetailPanel.js b/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/FlowDetailPanel.js
new file mode 100644
index 0000000000000000000000000000000000000000..8d6816186b96e555406d5c5534903e3dc3d98b6b
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/FlowDetailPanel.js
@@ -0,0 +1,29 @@
+import React from 'react';
+import { Card } from 'antd';
+import { NodePanel, EdgePanel, GroupPanel, MultiPanel, CanvasPanel, DetailPanel } from 'gg-editor';
+import DetailForm from './DetailForm';
+import styles from './index.less';
+
+const FlowDetailPanel = () => {
+ return (
+ <DetailPanel className={styles.detailPanel}>
+ <NodePanel>
+ <DetailForm type="node" />
+ </NodePanel>
+ <EdgePanel>
+ <DetailForm type="edge" />
+ </EdgePanel>
+ <GroupPanel>
+ <DetailForm type="group" />
+ </GroupPanel>
+ <MultiPanel>
+ <Card type="inner" size="small" title="Multi Select" bordered={false} />
+ </MultiPanel>
+ <CanvasPanel>
+ <Card type="inner" size="small" title="Canvas" bordered={false} />
+ </CanvasPanel>
+ </DetailPanel>
+ );
+};
+
+export default FlowDetailPanel;
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/index.js b/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..9decde104366f6ff7d7dc86fb447eed41a563adc
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/index.js
@@ -0,0 +1,3 @@
+import FlowDetailPanel from './FlowDetailPanel';
+
+export { FlowDetailPanel };
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/index.less b/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/index.less
new file mode 100644
index 0000000000000000000000000000000000000000..081945be43c093076bab1744984f5377a34f0fe2
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorDetailPanel/index.less
@@ -0,0 +1,10 @@
+.detailPanel {
+ flex: 1;
+ background: #fafafa;
+
+ :global {
+ .ant-card {
+ background: #fafafa;
+ }
+ }
+}
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorItemPanel/FlowItemPanel.js b/saga/seata-saga-statemachine-designer/src/components/EditorItemPanel/FlowItemPanel.js
new file mode 100644
index 0000000000000000000000000000000000000000..1b6ff57651d1a30d99c3f4f9ea58c2c28c206769
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorItemPanel/FlowItemPanel.js
@@ -0,0 +1,174 @@
+import React from 'react';
+import { Card } from 'antd';
+import { ItemPanel, Item } from 'gg-editor';
+import styles from './index.less';
+
+const startPropsTemplate = {
+ "StateMachine": {
+ "Name": "",
+ "Comment": "",
+ "Version": "0.0.1"
+ }
+};
+const serviceTaskPropsTemplate = {
+ "ServiceName": "",
+ "ServiceMethod": "",
+ "Input": [
+ {}
+ ],
+ "Output": {
+ },
+ "Status": {
+ },
+ "Retry": [
+ ]
+};
+const compensationPropsTemplate = {
+ "ServiceName": "",
+ "ServiceMethod": "",
+ "Input": [
+ {}
+ ],
+ "Output": {
+ },
+ "Status": {
+ },
+ "Retry": [
+ ]
+};
+const failPropsTemplate = {
+ "ErrorCode": "",
+ "Message": ""
+};
+const subStateMachinePropsTemplate = {
+ "StateMachineName": "",
+ "Input": [
+ {}
+ ],
+ "Output": {
+ }
+}
+
+const FlowItemPanel = () => {
+ return (
+ <ItemPanel className={styles.itemPanel}>
+ <Card bordered={false}>
+ <Item
+ type="node"
+ size="72*72"
+ shape="flow-circle"
+ model={{
+ color: '#FA8C16',
+ label: 'Start',
+ stateId: 'Start',
+ stateType: 'Start',
+ stateProps: startPropsTemplate,
+ }}
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODAiIGhlaWdodD0iODAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxjaXJjbGUgaWQ9ImIiIGN4PSIzNiIgY3k9IjM2IiByPSIzNiIvPjxmaWx0ZXIgeD0iLTkuNyUiIHk9Ii02LjklIiB3aWR0aD0iMTE5LjQlIiBoZWlnaHQ9IjExOS40JSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IiBpZD0iYSI+PGZlT2Zmc2V0IGR5PSIyIiBpbj0iU291cmNlQWxwaGEiIHJlc3VsdD0ic2hhZG93T2Zmc2V0T3V0ZXIxIi8+PGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iMiIgaW49InNoYWRvd09mZnNldE91dGVyMSIgcmVzdWx0PSJzaGFkb3dCbHVyT3V0ZXIxIi8+PGZlQ29tcG9zaXRlIGluPSJzaGFkb3dCbHVyT3V0ZXIxIiBpbjI9IlNvdXJjZUFscGhhIiBvcGVyYXRvcj0ib3V0IiByZXN1bHQ9InNoYWRvd0JsdXJPdXRlcjEiLz48ZmVDb2xvck1hdHJpeCB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAuMDQgMCIgaW49InNoYWRvd0JsdXJPdXRlcjEiLz48L2ZpbHRlcj48L2RlZnM+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSg0IDIpIj48dXNlIGZpbGw9IiMwMDAiIGZpbHRlcj0idXJsKCNhKSIgeGxpbms6aHJlZj0iI2IiLz48dXNlIGZpbGwtb3BhY2l0eT0iLjkyIiBmaWxsPSIjRkZGMkU4IiB4bGluazpocmVmPSIjYiIvPjxjaXJjbGUgc3Ryb2tlPSIjRkZDMDY5IiBjeD0iMzYiIGN5PSIzNiIgcj0iMzUuNSIvPjwvZz48dGV4dCBmb250LWZhbWlseT0iUGluZ0ZhbmdTQy1SZWd1bGFyLCBQaW5nRmFuZyBTQyIgZm9udC1zaXplPSIxMiIgZmlsbD0iIzAwMCIgZmlsbC1vcGFjaXR5PSIuNjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDQgMikiPjx0c3BhbiB4PSIyMyIgeT0iNDEiPlN0YXJ0PC90c3Bhbj48L3RleHQ+PC9nPjwvc3ZnPg=="
+ />
+ <Item
+ type="node"
+ size="110*48"
+ shape="flow-rect"
+ model={{
+ color: '#1890FF',
+ label: 'ServiceTask',
+ stateId: 'ServiceTask',
+ stateType: 'ServiceTask',
+ stateProps: serviceTaskPropsTemplate,
+ }}
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTE4IiBoZWlnaHQ9IjU2IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj48ZGVmcz48cmVjdCBpZD0iYiIgeD0iMCIgeT0iMCIgd2lkdGg9IjExMCIgaGVpZ2h0PSI0OCIgcng9IjQiLz48ZmlsdGVyIHg9Ii04LjglIiB5PSItMTAuNCUiIHdpZHRoPSIxMTcuNSUiIGhlaWdodD0iMTI5LjIlIiBmaWx0ZXJVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giIGlkPSJhIj48ZmVPZmZzZXQgZHk9IjIiIGluPSJTb3VyY2VBbHBoYSIgcmVzdWx0PSJzaGFkb3dPZmZzZXRPdXRlcjEiLz48ZmVHYXVzc2lhbkJsdXIgc3RkRGV2aWF0aW9uPSIyIiBpbj0ic2hhZG93T2Zmc2V0T3V0ZXIxIiByZXN1bHQ9InNoYWRvd0JsdXJPdXRlcjEiLz48ZmVDb21wb3NpdGUgaW49InNoYWRvd0JsdXJPdXRlcjEiIGluMj0iU291cmNlQWxwaGEiIG9wZXJhdG9yPSJvdXQiIHJlc3VsdD0ic2hhZG93Qmx1ck91dGVyMSIvPjxmZUNvbG9yTWF0cml4IHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMC4wNCAwIiBpbj0ic2hhZG93Qmx1ck91dGVyMSIvPjwvZmlsdGVyPjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKDQgMikiPjx1c2UgZmlsbD0iIzAwMCIgZmlsdGVyPSJ1cmwoI2EpIiB4bGluazpocmVmPSIjYiIvPjx1c2UgZmlsbC1vcGFjaXR5PSIuOTIiIGZpbGw9IiNFNkY3RkYiIHhsaW5rOmhyZWY9IiNiIi8+PHJlY3Qgc3Ryb2tlPSIjMTg5MEZGIiB4PSIuNSIgeT0iLjUiIHdpZHRoPSIxMDkiIGhlaWdodD0iNDciIHJ4PSI0Ii8+PC9nPjx0ZXh0IGZvbnQtZmFtaWx5PSJQaW5nRmFuZ1NDLVJlZ3VsYXIsIFBpbmdGYW5nIFNDIiBmb250LXNpemU9IjEyIiBmaWxsPSIjMDAwIiBmaWxsLW9wYWNpdHk9Ii42NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNCAyKSI+PHRzcGFuIHg9IjIxIiB5PSIyOSI+U2VydmljZVRhc2s8L3RzcGFuPjwvdGV4dD48L2c+PC9zdmc+"
+ />
+ <Item
+ type="node"
+ size="80*72"
+ shape="flow-rhombus"
+ model={{
+ color: '#13C2C2',
+ label: 'Choice',
+ stateId: 'Choice',
+ stateType: 'Choice'
+ }}
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODYiIGhlaWdodD0iNzgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxwYXRoIGQ9Ik00Mi42NyAxLjY3bDM0Ljk2NSAzMS4zNTJhNCA0IDAgMCAxIDAgNS45NTZMNDIuNjcgNzAuMzNhNCA0IDAgMCAxLTUuMzQgMEwyLjM2NSAzOC45NzhhNCA0IDAgMCAxIDAtNS45NTZMMzcuMzMgMS42N2E0IDQgMCAwIDEgNS4zNCAweiIgaWQ9ImIiLz48ZmlsdGVyIHg9Ii04LjglIiB5PSItNi45JSIgd2lkdGg9IjExNy41JSIgaGVpZ2h0PSIxMTkuNCUiIGZpbHRlclVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgaWQ9ImEiPjxmZU9mZnNldCBkeT0iMiIgaW49IlNvdXJjZUFscGhhIiByZXN1bHQ9InNoYWRvd09mZnNldE91dGVyMSIvPjxmZUdhdXNzaWFuQmx1ciBzdGREZXZpYXRpb249IjIiIGluPSJzaGFkb3dPZmZzZXRPdXRlcjEiIHJlc3VsdD0ic2hhZG93Qmx1ck91dGVyMSIvPjxmZUNvbXBvc2l0ZSBpbj0ic2hhZG93Qmx1ck91dGVyMSIgaW4yPSJTb3VyY2VBbHBoYSIgb3BlcmF0b3I9Im91dCIgcmVzdWx0PSJzaGFkb3dCbHVyT3V0ZXIxIi8+PGZlQ29sb3JNYXRyaXggdmFsdWVzPSIwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwLjA0IDAiIGluPSJzaGFkb3dCbHVyT3V0ZXIxIi8+PC9maWx0ZXI+PC9kZWZzPjxnIGZpbGw9Im5vbmUiIGZpbGwtcnVsZT0iZXZlbm9kZCI+PGcgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoMyAxKSI+PHVzZSBmaWxsPSIjMDAwIiBmaWx0ZXI9InVybCgjYSkiIHhsaW5rOmhyZWY9IiNiIi8+PHVzZSBmaWxsLW9wYWNpdHk9Ii45MiIgZmlsbD0iI0U2RkZGQiIgeGxpbms6aHJlZj0iI2IiLz48cGF0aCBzdHJva2U9IiM1Q0RCRDMiIGQ9Ik00Mi4zMzcgMi4wNDJhMy41IDMuNSAwIDAgMC00LjY3NCAwTDIuNjk4IDMzLjM5NGEzLjUgMy41IDAgMCAwIDAgNS4yMTJsMzQuOTY1IDMxLjM1MmEzLjUgMy41IDAgMCAwIDQuNjc0IDBsMzQuOTY1LTMxLjM1MmEzLjUgMy41IDAgMCAwIDAtNS4yMTJMNDIuMzM3IDIuMDQyeiIvPjwvZz48dGV4dCBmb250LWZhbWlseT0iUGluZ0ZhbmdTQy1SZWd1bGFyLCBQaW5nRmFuZyBTQyIgZm9udC1zaXplPSIxMiIgZmlsbD0iIzAwMCIgZmlsbC1vcGFjaXR5PSIuNjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDMgMSkiPjx0c3BhbiB4PSIyMSIgeT0iNDIiPkNob2ljZTwvdHNwYW4+PC90ZXh0PjwvZz48L3N2Zz4="
+ />
+ <Item
+ type="node"
+ size="110*48"
+ shape="flow-capsule"
+ model={{
+ color: '#722ED1',
+ label: 'Compensation',
+ stateId: 'Compensation',
+ stateType: 'Compensation',
+ stateProps: compensationPropsTemplate,
+ }}
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTE4IiBoZWlnaHQ9IjU2IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj48ZGVmcz48cmVjdCBpZD0iYiIgeD0iMCIgeT0iMCIgd2lkdGg9IjExMCIgaGVpZ2h0PSI0OCIgcng9IjI0Ii8+PGZpbHRlciB4PSItOC44JSIgeT0iLTEwLjQlIiB3aWR0aD0iMTE3LjUlIiBoZWlnaHQ9IjEyOS4yJSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IiBpZD0iYSI+PGZlT2Zmc2V0IGR5PSIyIiBpbj0iU291cmNlQWxwaGEiIHJlc3VsdD0ic2hhZG93T2Zmc2V0T3V0ZXIxIi8+PGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iMiIgaW49InNoYWRvd09mZnNldE91dGVyMSIgcmVzdWx0PSJzaGFkb3dCbHVyT3V0ZXIxIi8+PGZlQ29tcG9zaXRlIGluPSJzaGFkb3dCbHVyT3V0ZXIxIiBpbjI9IlNvdXJjZUFscGhhIiBvcGVyYXRvcj0ib3V0IiByZXN1bHQ9InNoYWRvd0JsdXJPdXRlcjEiLz48ZmVDb2xvck1hdHJpeCB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAuMDQgMCIgaW49InNoYWRvd0JsdXJPdXRlcjEiLz48L2ZpbHRlcj48L2RlZnM+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSg0IDIpIj48dXNlIGZpbGw9IiMwMDAiIGZpbHRlcj0idXJsKCNhKSIgeGxpbms6aHJlZj0iI2IiLz48dXNlIGZpbGwtb3BhY2l0eT0iLjkyIiBmaWxsPSIjRjlGMEZGIiB4bGluazpocmVmPSIjYiIvPjxyZWN0IHN0cm9rZT0iI0IzN0ZFQiIgeD0iLjUiIHk9Ii41IiB3aWR0aD0iMTA5IiBoZWlnaHQ9IjQ3IiByeD0iMjMuNSIvPjwvZz48dGV4dCBmb250LWZhbWlseT0iUGluZ0ZhbmdTQy1SZWd1bGFyLCBQaW5nRmFuZyBTQyIgZm9udC1zaXplPSIxMiIgZmlsbD0iIzAwMCIgZmlsbC1vcGFjaXR5PSIuNjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDQgMikiPjx0c3BhbiB4PSIxNSIgeT0iMjkiPkNvbXBlbnNhdGlvbjwvdHNwYW4+PC90ZXh0PjwvZz48L3N2Zz4="
+ />
+ <Item
+ type="node"
+ size="72*72"
+ shape="flow-circle"
+ model={{
+ color: '#05A465',
+ label: 'Succeed',
+ stateId: 'Succeed',
+ stateType: 'Succeed',
+ }}
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODAiIGhlaWdodD0iODAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxjaXJjbGUgaWQ9ImIiIGN4PSIzNiIgY3k9IjM2IiByPSIzNiIvPjxmaWx0ZXIgeD0iLTkuNyUiIHk9Ii02LjklIiB3aWR0aD0iMTE5LjQlIiBoZWlnaHQ9IjExOS40JSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IiBpZD0iYSI+PGZlT2Zmc2V0IGR5PSIyIiBpbj0iU291cmNlQWxwaGEiIHJlc3VsdD0ic2hhZG93T2Zmc2V0T3V0ZXIxIi8+PGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iMiIgaW49InNoYWRvd09mZnNldE91dGVyMSIgcmVzdWx0PSJzaGFkb3dCbHVyT3V0ZXIxIi8+PGZlQ29tcG9zaXRlIGluPSJzaGFkb3dCbHVyT3V0ZXIxIiBpbjI9IlNvdXJjZUFscGhhIiBvcGVyYXRvcj0ib3V0IiByZXN1bHQ9InNoYWRvd0JsdXJPdXRlcjEiLz48ZmVDb2xvck1hdHJpeCB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAuMDQgMCIgaW49InNoYWRvd0JsdXJPdXRlcjEiLz48L2ZpbHRlcj48L2RlZnM+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSg0IDIpIj48dXNlIGZpbGw9IiMwMDAiIGZpbHRlcj0idXJsKCNhKSIgeGxpbms6aHJlZj0iI2IiLz48dXNlIGZpbGwtb3BhY2l0eT0iLjkyIiBmaWxsPSIjQ0ZFNEQ4IiB4bGluazpocmVmPSIjYiIvPjxjaXJjbGUgc3Ryb2tlPSIjMDVBNDY1IiBjeD0iMzYiIGN5PSIzNiIgcj0iMzUuNSIvPjwvZz48dGV4dCBmb250LWZhbWlseT0iUGluZ0ZhbmdTQy1SZWd1bGFyLCBQaW5nRmFuZyBTQyIgZm9udC1zaXplPSIxMiIgZmlsbD0iIzAwMCIgZmlsbC1vcGFjaXR5PSIuNjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDQgMikiPjx0c3BhbiB4PSIxMyIgeT0iNDEiPlN1Y2NlZWQ8L3RzcGFuPjwvdGV4dD48L2c+PC9zdmc+"
+ />
+ <Item
+ type="node"
+ size="72*72"
+ shape="flow-circle"
+ model={{
+ color: 'red',
+ label: 'Fail',
+ stateId: 'Fail',
+ stateType: 'Fail',
+ stateProps: failPropsTemplate,
+ }}
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODAiIGhlaWdodD0iODAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxjaXJjbGUgaWQ9ImIiIGN4PSIzNiIgY3k9IjM2IiByPSIzNiIvPjxmaWx0ZXIgeD0iLTkuNyUiIHk9Ii02LjklIiB3aWR0aD0iMTE5LjQlIiBoZWlnaHQ9IjExOS40JSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IiBpZD0iYSI+PGZlT2Zmc2V0IGR5PSIyIiBpbj0iU291cmNlQWxwaGEiIHJlc3VsdD0ic2hhZG93T2Zmc2V0T3V0ZXIxIi8+PGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iMiIgaW49InNoYWRvd09mZnNldE91dGVyMSIgcmVzdWx0PSJzaGFkb3dCbHVyT3V0ZXIxIi8+PGZlQ29tcG9zaXRlIGluPSJzaGFkb3dCbHVyT3V0ZXIxIiBpbjI9IlNvdXJjZUFscGhhIiBvcGVyYXRvcj0ib3V0IiByZXN1bHQ9InNoYWRvd0JsdXJPdXRlcjEiLz48ZmVDb2xvck1hdHJpeCB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAuMDQgMCIgaW49InNoYWRvd0JsdXJPdXRlcjEiLz48L2ZpbHRlcj48L2RlZnM+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSg0IDIpIj48dXNlIGZpbGw9IiMwMDAiIGZpbHRlcj0idXJsKCNhKSIgeGxpbms6aHJlZj0iI2IiLz48dXNlIGZpbGwtb3BhY2l0eT0iLjkyIiBmaWxsPSIjRkVFQUU3IiB4bGluazpocmVmPSIjYiIvPjxjaXJjbGUgc3Ryb2tlPSJyZWQiIGN4PSIzNiIgY3k9IjM2IiByPSIzNS41Ii8+PC9nPjx0ZXh0IGZvbnQtZmFtaWx5PSJQaW5nRmFuZ1NDLVJlZ3VsYXIsIFBpbmdGYW5nIFNDIiBmb250LXNpemU9IjEyIiBmaWxsPSIjMDAwIiBmaWxsLW9wYWNpdHk9Ii42NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNCAyKSI+PHRzcGFuIHg9IjI2IiB5PSI0MSI+RmFpbDwvdHNwYW4+PC90ZXh0PjwvZz48L3N2Zz4="
+ />
+ <Item
+ type="node"
+ size="39*39"
+ shape="flow-circle"
+ model={{
+ color: 'red',
+ label: 'Catch',
+ stateId: 'Catch',
+ stateType: 'Catch'
+ }}
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNDUiIGhlaWdodD0iNDUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxjaXJjbGUgaWQ9ImIiIGN4PSIyMCIgY3k9IjIwIiByPSIyMCIvPjxmaWx0ZXIgeD0iLTkuNyUiIHk9Ii02LjklIiB3aWR0aD0iMTE5LjQlIiBoZWlnaHQ9IjExOS40JSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IiBpZD0iYSI+PGZlT2Zmc2V0IGR5PSIyIiBpbj0iU291cmNlQWxwaGEiIHJlc3VsdD0ic2hhZG93T2Zmc2V0T3V0ZXIxIi8+PGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iMiIgaW49InNoYWRvd09mZnNldE91dGVyMSIgcmVzdWx0PSJzaGFkb3dCbHVyT3V0ZXIxIi8+PGZlQ29tcG9zaXRlIGluPSJzaGFkb3dCbHVyT3V0ZXIxIiBpbjI9IlNvdXJjZUFscGhhIiBvcGVyYXRvcj0ib3V0IiByZXN1bHQ9InNoYWRvd0JsdXJPdXRlcjEiLz48ZmVDb2xvck1hdHJpeCB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAuMDQgMCIgaW49InNoYWRvd0JsdXJPdXRlcjEiLz48L2ZpbHRlcj48L2RlZnM+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSg0IDIpIj48dXNlIGZpbGw9IiMwMDAiIGZpbHRlcj0idXJsKCNhKSIgeGxpbms6aHJlZj0iI2IiLz48dXNlIGZpbGwtb3BhY2l0eT0iLjkyIiBmaWxsPSIjRkVFQUU3IiB4bGluazpocmVmPSIjYiIvPjxjaXJjbGUgc3Ryb2tlPSJyZWQiIGN4PSIxOS41IiBjeT0iMTkuNSIgcj0iMTkuNSIvPjwvZz48dGV4dCBmb250LWZhbWlseT0iUGluZ0ZhbmdTQy1SZWd1bGFyLCBQaW5nRmFuZyBTQyIgZm9udC1zaXplPSIxMiIgZmlsbD0iIzAwMCIgZmlsbC1vcGFjaXR5PSIuNjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDQgMikiPjx0c3BhbiB4PSIzIiB5PSIyNCI+Q2F0Y2g8L3RzcGFuPjwvdGV4dD48L2c+PC9zdmc+"
+ />
+ <Item
+ type="node"
+ size="110*48"
+ shape="flow-capsule"
+ model={{
+ color: 'red',
+ label: 'Compensation\nTrigger',
+ stateId: 'CompensationTrigger',
+ stateType: 'CompensationTrigger',
+ }}
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTE4IiBoZWlnaHQ9IjU2IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj48ZGVmcz48cmVjdCBpZD0iYiIgeD0iMCIgeT0iMCIgd2lkdGg9IjExMCIgaGVpZ2h0PSI0OCIgcng9IjI0Ii8+PGZpbHRlciB4PSItOC44JSIgeT0iLTEwLjQlIiB3aWR0aD0iMTE3LjUlIiBoZWlnaHQ9IjEyOS4yJSIgZmlsdGVyVW5pdHM9Im9iamVjdEJvdW5kaW5nQm94IiBpZD0iYSI+PGZlT2Zmc2V0IGR5PSIyIiBpbj0iU291cmNlQWxwaGEiIHJlc3VsdD0ic2hhZG93T2Zmc2V0T3V0ZXIxIi8+PGZlR2F1c3NpYW5CbHVyIHN0ZERldmlhdGlvbj0iMiIgaW49InNoYWRvd09mZnNldE91dGVyMSIgcmVzdWx0PSJzaGFkb3dCbHVyT3V0ZXIxIi8+PGZlQ29tcG9zaXRlIGluPSJzaGFkb3dCbHVyT3V0ZXIxIiBpbjI9IlNvdXJjZUFscGhhIiBvcGVyYXRvcj0ib3V0IiByZXN1bHQ9InNoYWRvd0JsdXJPdXRlcjEiLz48ZmVDb2xvck1hdHJpeCB2YWx1ZXM9IjAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAuMDQgMCIgaW49InNoYWRvd0JsdXJPdXRlcjEiLz48L2ZpbHRlcj48L2RlZnM+PGcgZmlsbD0ibm9uZSIgZmlsbC1ydWxlPSJldmVub2RkIj48ZyB0cmFuc2Zvcm09InRyYW5zbGF0ZSg0IDIpIj48dXNlIGZpbGw9IiMwMDAiIGZpbHRlcj0idXJsKCNhKSIgeGxpbms6aHJlZj0iI2IiLz48dXNlIGZpbGwtb3BhY2l0eT0iLjkyIiBmaWxsPSIjRkVFQUU3IiB4bGluazpocmVmPSIjYiIvPjxyZWN0IHN0cm9rZT0icmVkIiB4PSIuNSIgeT0iLjUiIHdpZHRoPSIxMDkiIGhlaWdodD0iNDciIHJ4PSIyMy41Ii8+PC9nPjx0ZXh0IGZvbnQtZmFtaWx5PSJQaW5nRmFuZ1NDLVJlZ3VsYXIsIFBpbmdGYW5nIFNDIiBmb250LXNpemU9IjEyIiBmaWxsPSIjMDAwIiBmaWxsLW9wYWNpdHk9Ii42NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNCAyKSI+PHRzcGFuIHg9IjE1IiB5PSIyMiI+Q29tcGVuc2F0aW9uPC90c3Bhbj48L3RleHQ+PHRleHQgZm9udC1mYW1pbHk9IlBpbmdGYW5nU0MtUmVndWxhciwgUGluZ0ZhbmcgU0MiIGZvbnQtc2l6ZT0iMTIiIGZpbGw9IiMwMDAiIGZpbGwtb3BhY2l0eT0iLjY1IiB0cmFuc2Zvcm09InRyYW5zbGF0ZSg0IDIpIj48dHNwYW4geD0iMzYiIHk9IjM2Ij5UcmlnZ2VyPC90c3Bhbj48L3RleHQ+PC9nPjwvc3ZnPg=="
+ />
+ <Item
+ type="node"
+ size="110*48"
+ shape="flow-rect"
+ model={{
+ color: '#FA8C16',
+ label: 'SubStateMachine',
+ stateId: 'SubStateMachine',
+ stateType: 'SubStateMachine',
+ stateProps: subStateMachinePropsTemplate,
+ }}
+ src="data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTE4IiBoZWlnaHQ9IjU2IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj48ZGVmcz48cmVjdCBpZD0iYiIgeD0iMCIgeT0iMCIgd2lkdGg9IjExMCIgaGVpZ2h0PSI0OCIgcng9IjQiLz48ZmlsdGVyIHg9Ii04LjglIiB5PSItMTAuNCUiIHdpZHRoPSIxMTcuNSUiIGhlaWdodD0iMTI5LjIlIiBmaWx0ZXJVbml0cz0ib2JqZWN0Qm91bmRpbmdCb3giIGlkPSJhIj48ZmVPZmZzZXQgZHk9IjIiIGluPSJTb3VyY2VBbHBoYSIgcmVzdWx0PSJzaGFkb3dPZmZzZXRPdXRlcjEiLz48ZmVHYXVzc2lhbkJsdXIgc3RkRGV2aWF0aW9uPSIyIiBpbj0ic2hhZG93T2Zmc2V0T3V0ZXIxIiByZXN1bHQ9InNoYWRvd0JsdXJPdXRlcjEiLz48ZmVDb21wb3NpdGUgaW49InNoYWRvd0JsdXJPdXRlcjEiIGluMj0iU291cmNlQWxwaGEiIG9wZXJhdG9yPSJvdXQiIHJlc3VsdD0ic2hhZG93Qmx1ck91dGVyMSIvPjxmZUNvbG9yTWF0cml4IHZhbHVlcz0iMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMCAwIDAgMC4wNCAwIiBpbj0ic2hhZG93Qmx1ck91dGVyMSIvPjwvZmlsdGVyPjwvZGVmcz48ZyBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPjxnIHRyYW5zZm9ybT0idHJhbnNsYXRlKDQgMikiPjx1c2UgZmlsbD0iIzAwMCIgZmlsdGVyPSJ1cmwoI2EpIiB4bGluazpocmVmPSIjYiIvPjx1c2UgZmlsbC1vcGFjaXR5PSIuOTIiIGZpbGw9IiNGRkYyRTgiIHhsaW5rOmhyZWY9IiNiIi8+PHJlY3Qgc3Ryb2tlPSIjRkZDMDY5IiB4PSIuNSIgeT0iLjUiIHdpZHRoPSIxMDkiIGhlaWdodD0iNDciIHJ4PSI0Ii8+PC9nPjx0ZXh0IGZvbnQtZmFtaWx5PSJQaW5nRmFuZ1NDLVJlZ3VsYXIsIFBpbmdGYW5nIFNDIiBmb250LXNpemU9IjEyIiBmaWxsPSIjMDAwIiBmaWxsLW9wYWNpdHk9Ii42NSIgdHJhbnNmb3JtPSJ0cmFuc2xhdGUoNCAyKSI+PHRzcGFuIHg9IjYiIHk9IjI5Ij5TdWJTdGF0ZU1hY2hpbmU8L3RzcGFuPjwvdGV4dD48L2c+PC9zdmc+"
+ />
+ </Card>
+ </ItemPanel>
+ );
+};
+
+export default FlowItemPanel;
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorItemPanel/index.js b/saga/seata-saga-statemachine-designer/src/components/EditorItemPanel/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..f93111b87538a11e321eb2a8dc40a7b1c5bd0bea
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorItemPanel/index.js
@@ -0,0 +1,3 @@
+import FlowItemPanel from './FlowItemPanel';
+
+export { FlowItemPanel };
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorItemPanel/index.less b/saga/seata-saga-statemachine-designer/src/components/EditorItemPanel/index.less
new file mode 100644
index 0000000000000000000000000000000000000000..a7acc366d1715dc50003f7e7c1335e2844112a41
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorItemPanel/index.less
@@ -0,0 +1,20 @@
+.itemPanel {
+ flex: 1;
+ background: #fafafa;
+
+ :global {
+ .ant-card {
+ background: #fafafa;
+ }
+
+ .ant-card-body {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+
+ > div {
+ margin-bottom: 16px;
+ }
+ }
+ }
+}
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorMinimap/index.js b/saga/seata-saga-statemachine-designer/src/components/EditorMinimap/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..8c86b242845629d533e8d55ce436c0cd63ae59d5
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorMinimap/index.js
@@ -0,0 +1,13 @@
+import React from 'react';
+import { Card } from 'antd';
+import { Minimap } from 'gg-editor';
+
+const EditorMinimap = () => {
+ return (
+ <Card type="inner" size="small" title="Minimap" bordered={false}>
+ <Minimap height={200} />
+ </Card>
+ );
+};
+
+export default EditorMinimap;
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/FlowToolbar.js b/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/FlowToolbar.js
new file mode 100644
index 0000000000000000000000000000000000000000..2f02fd5b4635154d4e29a4d28f0565caa2c45ab2
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/FlowToolbar.js
@@ -0,0 +1,33 @@
+import React from 'react';
+import { Divider } from 'antd';
+import { Toolbar } from 'gg-editor';
+import ToolbarButton from './ToolbarButton';
+import styles from './index.less';
+
+const FlowToolbar = ({ setShowJson }) => {
+ return (
+ <Toolbar className={styles.toolbar}>
+ <ToolbarButton command="undo" />
+ <ToolbarButton command="redo" />
+ <Divider type="vertical" />
+ <ToolbarButton command="copy" />
+ <ToolbarButton command="paste" />
+ <ToolbarButton command="delete" />
+ <Divider type="vertical" />
+ <ToolbarButton command="zoomIn" icon="zoom-in" text="Zoom In" />
+ <ToolbarButton command="zoomOut" icon="zoom-out" text="Zoom Out" />
+ <ToolbarButton command="autoZoom" icon="fit-map" text="Fit Map" />
+ <ToolbarButton command="resetZoom" icon="actual-size" text="Actual Size" />
+ <Divider type="vertical" />
+ <ToolbarButton command="toBack" icon="to-back" text="To Back" />
+ <ToolbarButton command="toFront" icon="to-front" text="To Front" />
+ <Divider type="vertical" />
+ <ToolbarButton command="multiSelect" icon="multi-select" text="Multi Select" />
+ <Divider type="vertical" />
+ <ToolbarButton command="switchWorkspace" icon="iconjson" text="Json View" onClick={() => setShowJson(true)} />
+ <ToolbarButton command="switchWorkspace" icon="icondesign" text="Designer View" onClick={() => setShowJson(false)} />
+ </Toolbar>
+ );
+};
+
+export default FlowToolbar;
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/ToolbarButton.js b/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/ToolbarButton.js
new file mode 100644
index 0000000000000000000000000000000000000000..a25468886ce02c7e801e4a3d9f104f08a72cbc0b
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/ToolbarButton.js
@@ -0,0 +1,36 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+import { Command } from 'gg-editor';
+import upperFirst from 'lodash/upperFirst';
+import IconFont from '../../common/IconFont';
+import { IconFontExt } from '../../common/IconFont';
+import styles from './index.less';
+
+const ToolbarButton = (props) => {
+ const { command, icon, text, onClick } = props;
+
+ if (command == 'switchWorkspace') {
+ return (
+ <Tooltip className={styles.buttonExt}
+ title={text || upperFirst(command)}
+ onClick={onClick}
+ >
+ <IconFontExt type={`${icon || command}`} />
+ </Tooltip>
+ );
+ }
+
+ return (
+ <Command name={command}>
+ <Tooltip
+ title={text || upperFirst(command)}
+ placement="bottom"
+ overlayClassName={styles.tooltip}
+ >
+ <IconFont type={`icon-${icon || command}`} />
+ </Tooltip>
+ </Command>
+ );
+};
+
+export default ToolbarButton;
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/index.js b/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..294a520511c1d0ce4222b4d7922e7097dda6677a
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/index.js
@@ -0,0 +1,3 @@
+import FlowToolbar from './FlowToolbar';
+
+export { FlowToolbar };
diff --git a/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/index.less b/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/index.less
new file mode 100644
index 0000000000000000000000000000000000000000..4cab14c75a9fa7623bbd53923f36ac19c9a4c726
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/components/EditorToolbar/index.less
@@ -0,0 +1,54 @@
+.toolbar {
+ display: flex;
+ align-items: center;
+
+ :global {
+ .command i {
+ display: inline-block;
+ width: 27px;
+ height: 27px;
+ margin: 0 6px;
+ padding-top: 6px;
+ text-align: center;
+ border: 1px solid #fff;
+ cursor: pointer;
+
+ &:hover {
+ border: 1px solid #e6e9ed;
+ }
+ }
+
+ .disable i {
+ color: rgba(0, 0, 0, 0.25);
+ cursor: auto;
+
+ &:hover {
+ border: 1px solid #fff;
+ }
+ }
+ }
+}
+
+.tooltip {
+ :global {
+ .ant-tooltip-inner {
+ font-size: 12px;
+ border-radius: 0;
+ }
+ }
+}
+
+.buttonExt {
+ display: inline-block;
+ width: 27px;
+ height: 27px;
+ margin: 0 6px;
+ padding-top: 6px;
+ text-align: center;
+ border: 1px solid #fff;
+ cursor: pointer;
+
+ &:hover {
+ border: 1px solid #e6e9ed;
+ }
+}
\ No newline at end of file
diff --git a/saga/seata-saga-statemachine-designer/src/index.js b/saga/seata-saga-statemachine-designer/src/index.js
new file mode 100644
index 0000000000000000000000000000000000000000..9fd5c065b318472811a60c4d09bbb2cf2acfd928
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/src/index.js
@@ -0,0 +1,11 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { HashRouter as Router, Route } from 'react-router-dom';
+import FlowPage from './Flow';
+
+ReactDOM.render(
+ <Router>
+ <Route path="/" component={FlowPage} />
+ </Router>,
+ document.getElementById('root'),
+);
diff --git a/saga/seata-saga-statemachine-designer/tools/postcss.config.js b/saga/seata-saga-statemachine-designer/tools/postcss.config.js
new file mode 100644
index 0000000000000000000000000000000000000000..0f7a20cb605d4c39c55c2f0d19fc82acdb4f9539
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/tools/postcss.config.js
@@ -0,0 +1,7 @@
+const postcssPresetEnv = require('postcss-preset-env');
+
+module.exports = {
+ plugins: [
+ postcssPresetEnv,
+ ],
+};
diff --git a/saga/seata-saga-statemachine-designer/tools/webpack.config.base.js b/saga/seata-saga-statemachine-designer/tools/webpack.config.base.js
new file mode 100644
index 0000000000000000000000000000000000000000..52cdcc729f9d8984dbfd8222b9b6a6f140b691db
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/tools/webpack.config.base.js
@@ -0,0 +1,56 @@
+const path = require('path');
+
+const rules = [{
+ test: /\.js$/,
+ exclude: [
+ path.resolve(__dirname, 'node_modules'),
+ ],
+ use: {
+ loader: 'babel-loader',
+ },
+}, {
+ test: /\.less$/,
+ use: [{
+ loader: 'style-loader',
+ }, {
+ loader: 'css-loader',
+ options: {
+ modules: true,
+ camelCase: true,
+ importLoaders: 1,
+ localIdentName: '[local]--[hash:base64:5]',
+ },
+ }, {
+ loader: 'postcss-loader',
+ options: {
+ config: {
+ path: path.resolve(__dirname, './postcss.config.js'),
+ },
+ },
+ }, {
+ loader: 'less-loader',
+ }],
+}, {
+ test: /\.css$/,
+ use: [{
+ loader: 'style-loader',
+ }, {
+ loader: 'css-loader',
+ }],
+}];
+
+const externals = {
+ react: {
+ root: 'React',
+ commonjs: 'react',
+ commonjs2: 'react',
+ amd: 'react',
+ },
+};
+
+module.exports = {
+ module: {
+ rules,
+ },
+ externals,
+};
diff --git a/saga/seata-saga-statemachine-designer/tools/webpack.config.dev.js b/saga/seata-saga-statemachine-designer/tools/webpack.config.dev.js
new file mode 100644
index 0000000000000000000000000000000000000000..0b39ef1cfab14a1985d605828f97afff1c8b6f76
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/tools/webpack.config.dev.js
@@ -0,0 +1,60 @@
+const path = require('path');
+const { merge } = require('lodash');
+const baseConfig = require('./webpack.config.base');
+
+const mode = 'development';
+
+const entry = {
+ bundle: path.resolve(__dirname, '..', 'src/index.js'),
+};
+
+const alias = {
+ 'gg-editor': path.resolve(__dirname, '..', 'ggeditor'),
+};
+
+const externals = {
+ 'react-dom': {
+ root: 'ReactDOM',
+ commonjs2: 'react-dom',
+ commonjs: 'react-dom',
+ amd: 'react-dom',
+ },
+ 'react-router-dom': {
+ root: 'ReactRouterDOM',
+ commonjs: 'react-router-dom',
+ commonjs2: 'react-router-dom',
+ amd: 'react-router-dom',
+ },
+ antd: {
+ root: 'antd',
+ commonjs: 'antd',
+ commonjs2: 'antd',
+ amd: 'antd',
+ },
+};
+
+const devtool = 'cheap-module-eval-source-map';
+
+const devServer = {
+ contentBase: path.resolve(__dirname, '..', ''),
+ publicPath: '/dist',
+ disableHostCheck: true,
+};
+
+const output = {
+ path: path.resolve(__dirname, '..', 'dist'),
+ filename: '[name].js',
+ libraryTarget: 'umd',
+};
+
+module.exports = merge(baseConfig, {
+ mode,
+ entry,
+ resolve: {
+ alias,
+ },
+ externals,
+ devtool,
+ devServer,
+ output,
+});
diff --git a/saga/seata-saga-statemachine-designer/tools/webpack.config.prod.js b/saga/seata-saga-statemachine-designer/tools/webpack.config.prod.js
new file mode 100644
index 0000000000000000000000000000000000000000..97367424eb3dfd406ae3b971ee2b6258a4e5509c
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/tools/webpack.config.prod.js
@@ -0,0 +1,53 @@
+const path = require('path');
+const { merge } = require('lodash');
+const baseConfig = require('./webpack.config.base');
+
+const mode = 'production';
+
+const entry = {
+ bundle: path.resolve(__dirname, '..', 'src/index.js'),
+};
+
+const alias = {
+ 'gg-editor': path.resolve(__dirname, '..', 'ggeditor'),
+};
+
+const externals = {
+ 'react-dom': {
+ root: 'ReactDOM',
+ commonjs2: 'react-dom',
+ commonjs: 'react-dom',
+ amd: 'react-dom',
+ },
+ 'react-router-dom': {
+ root: 'ReactRouterDOM',
+ commonjs: 'react-router-dom',
+ commonjs2: 'react-router-dom',
+ amd: 'react-router-dom',
+ },
+ antd: {
+ root: 'antd',
+ commonjs: 'antd',
+ commonjs2: 'antd',
+ amd: 'antd',
+ },
+};
+
+const devtool = 'cheap-module-source-map';
+
+const output = {
+ path: path.resolve(__dirname, '..', 'dist'),
+ filename: '[name].js',
+ libraryTarget: 'umd',
+};
+
+module.exports = merge(baseConfig, {
+ mode,
+ entry,
+ resolve: {
+ alias,
+ },
+ externals,
+ devtool,
+ output,
+});
diff --git a/saga/seata-saga-statemachine-designer/typings/index.d.ts b/saga/seata-saga-statemachine-designer/typings/index.d.ts
new file mode 100644
index 0000000000000000000000000000000000000000..d32e0b0b85fca196c39b1e6f07094e0d9bc87949
--- /dev/null
+++ b/saga/seata-saga-statemachine-designer/typings/index.d.ts
@@ -0,0 +1,283 @@
+declare module 'gg-editor' {
+
+ export interface Align {
+ line?: any
+ item?: boolean | 'horizontal' | 'vertical' | 'center'
+ grid?: boolean | 'cc' | 'tl'
+ }
+
+ export interface Grid {
+ cell?: number
+ line?: any
+ }
+
+ export interface Shortcut {
+ clear?: boolean
+ selectAll?: boolean
+ undo?: boolean
+ redo?: boolean
+ delete?: boolean
+ zoomIn?: boolean
+ zoomOut?: boolean
+ autoZoom?: boolean
+ resetZoom?: boolean
+ toFront?: boolean
+ toBack?: boolean
+ copy?: boolean
+ paste?: boolean
+ multiSelect?: boolean
+ addGroup?: boolean
+ unGroup?: boolean
+ append?: boolean
+ appendChild?: boolean
+ collaspeExpand?: boolean
+ }
+
+ interface ReactProps {
+ style?: React.CSSProperties
+ className?: string
+ }
+
+ export interface BasicProps extends ReactProps {
+ /** 初始数据 */
+ data?: any
+ /** G6的配置项 @see https://www.yuque.com/antv/g6/graph */
+ graph?: any
+ /** 快捷键配置，内置命令 */
+ shortcut?: Shortcut
+ }
+
+ export interface FlowProps extends BasicProps {
+ /** 对齐配置 */
+ align?: Align
+ /** 网格线配置 */
+ grid?: Grid
+ /** default: true */
+ noEndEdge?: boolean
+ }
+
+ export interface MindProps extends BasicProps {
+
+ }
+
+ export interface KoniProps extends BasicProps {
+
+ }
+
+ export interface CommondProps {
+ name: string
+ }
+
+ export interface MninimapProps extends ReactProps {
+ /** 容器 id */
+ container?: string
+ width?: number
+ height?: number
+ /** 视窗样式，参考 G 绘图属性 */
+ viewportWindowStyle?: any
+ /** 背景样式，参考 G 绘图属性 */
+ viewportBackStyle?: any
+ }
+
+ export interface ItemPanelProps extends ReactProps {
+ /** 元素类型，可选类型：node edge */
+ type: string
+ /** 元素尺寸，书写格式：50*50 */
+ size: string
+ /** 元素形状，内置形状：node、edge */
+ shape: string
+ /** 元素初始 model */
+ model?: any
+ /** 元素概览 src */
+ src: string
+ }
+
+ export interface RegisterProps extends ReactProps{
+ /** 节点名称 */
+ name?: string
+ /** 节点配置 */
+ config?: any
+ /** 继承图形 */
+ extend?: string
+ }
+
+ export interface RegisterBehaviourProps extends ReactProps{
+ /** 行为名称 */
+ name?: string
+ /** 行为配置 function(page) */
+ behaviour?: any
+ /** 继承行为 */
+ dependences?: string[]
+ }
+
+ export interface GGEditorEvent {
+ action: 'add' | 'update' | 'remove' | 'changeData'
+ item?: any
+ shape?: any
+ x?: number
+ y?: number
+ domX?: number
+ domY?: number
+ /** DOM 原生事件 */
+ domeEvent?: any
+ /** drag 拖动图项 */
+ currentIem?: any
+ /** drag 拖动图形 */
+ currentShape?: any
+ /** mouseleave dragleave 到达的图形 */
+ toShape?: any
+ /** mouseleave dragleave 到达的图项 */
+ toItem?: any
+ }
+
+ /** 此类事件可以结合前缀 node、edge、group、guide、anchor 组合使用，例如： */
+ export interface GraphMouseReactEventsProps {
+ /** 鼠标左键点击事件 */
+ onClick?: (e: GGEditorEvent) => void
+ /** 鼠标左键双击事件 */
+ onDoubleClick?: (e: GGEditorEvent) => void
+ /** 鼠标移入事件 */
+ onMouseEnter?: (e: GGEditorEvent) => void
+ /** 鼠标移除事件 */
+ onMouseLeave?: (e: GGEditorEvent) => void
+ /** 鼠标按下事件 */
+ onMouseDown?: (e: GGEditorEvent) => void
+ /** 鼠标抬起事件 */
+ onMouseUp?: (e: GGEditorEvent) => void
+ /** 鼠标移动事件 */
+ onMouseMove?: (e: GGEditorEvent) => void
+ /** 鼠标开始拖拽事件 */
+ onDragStart?: (e: GGEditorEvent) => void
+ /** 鼠标拖拽事件 */
+ onDrag?: (e: GGEditorEvent) => void
+ /** 鼠标拖拽结束事件 */
+ onDragEnd?: (e: GGEditorEvent) => void
+ /** 鼠标拖拽进入事件 */
+ onDragEnter?: (e: GGEditorEvent) => void
+ /** 鼠标拖拽移出事件 */
+ onDragLeave?: (e: GGEditorEvent) => void
+ /** 鼠标拖拽放置事件 */
+ onDrop?: (e: GGEditorEvent) => void
+ /** 鼠标右键菜单事件 */
+ onContextMenu?: (e: GGEditorEvent) => void
+ }
+
+ export interface GraphOtherReactEventsProps {
+ /** 鼠标滚轮事件 */
+ onMouseWheel?: (e: GGEditorEvent) => void
+ /** 键盘按键按下事件 */
+ onKeyDown?: (e: GGEditorEvent) => void
+ /** 键盘按键抬起事件 */
+ onKeyUp?: (e: GGEditorEvent) => void
+ /** 子项数据变化前 */
+ onBeforeChange?: (e: GGEditorEvent) => void
+ /** 子项数据变化后 */
+ onAfterChange?: (e: GGEditorEvent) => void
+ /** 画布尺寸变化前 */
+ onBeforeChangeSize?: (e: GGEditorEvent) => void
+ /** 画布尺寸变化后 */
+ onAfterChangeSize?: (e: GGEditorEvent) => void
+ /** 视口变化前 */
+ onBeforeViewportChange?: (e: GGEditorEvent) => void
+ /** 视口变化后 */
+ onAfterViewportChange?: (e: GGEditorEvent) => void
+ /** 激活前 */
+ onBeforeItemActived?: (e: GGEditorEvent) => void
+ }
+
+ export interface PageReactEventsProps {
+ /** 激活后 */
+ onAfterItemActived?: (e: GGEditorEvent) => void
+ /** 取消激活前 */
+ onBeforeItemInactivated?: (e: GGEditorEvent) => void
+ /** 取消激活后 */
+ onAfterItemInactivated?: (e: GGEditorEvent) => void
+ /** 选中前 */
+ onBeforeItemSelected?: (e: GGEditorEvent) => void
+ /** 选中后 */
+ onAfterItemSelected?: (e: GGEditorEvent) => void
+ /** 取消选中前 */
+ onBeforeItemUnselected?: (e: GGEditorEvent) => void
+ /** 取消选中后 */
+ onAfterItemUnselected?: (e: GGEditorEvent) => void
+ /** 键盘按键抬起事件（节点编辑 */
+ onKeyUpEditLabel?: (e: GGEditorEvent) => void
+ }
+
+ export interface EditorCommand {
+ name: string
+ queue: boolean
+ }
+
+ export interface PropsApi {
+ propsApi: {
+ executeCommand?(command: EditorCommand)
+ read?(data: any)
+ save?(): any
+ add?(type: any, model: any)
+ find?(id: any)
+ update?(item: any, model: any)
+ remove?(item: any)
+ getSelected?()
+ }
+ }
+
+ export interface EditorReactEventsProps {
+ onAfterCommandExecute?: (e: EditorCommand) => void
+ onBeforeCommandExecute?: (e: EditorCommand) => void
+ }
+ export default class GGEditor extends React.Component<ReactProps & EditorReactEventsProps, any> {
+ static setTrackable(state: boolean)
+ }
+
+ /** 流程图 @see http://ggeditor.com/docs/api/flow.zh-CN.html */
+ export const Flow: React.ComponentClass<FlowProps & GraphMouseReactEventsProps & GraphOtherReactEventsProps & PageReactEventsProps, any>
+
+ /** 思维导图 @see http://ggeditor.com/docs/api/mind.zh-CN.html */
+ export const Mind: React.ComponentClass<MindProps & GraphMouseReactEventsProps & GraphOtherReactEventsProps & PageReactEventsProps, any>
+
+ /** 脑图 */
+ export const Koni: React.ComponentClass<KoniProps & GraphMouseReactEventsProps & GraphOtherReactEventsProps & PageReactEventsProps, any>
+
+ /** 此组件只能嵌套在 <Toolbar /> 或 <ContextMenu /> 组件内使用： @see http://ggeditor.com/docs/api/command.zh-CN.html */
+ export const Command: React.ComponentClass<CommondProps, any>
+
+ /** 不指定宽高的情况下则自动适应容器尺寸 @see http://ggeditor.com/docs/api/minimap.zh-CN.html */
+ export const Minimap: React.ComponentClass<MninimapProps, any>
+
+ /** 右键菜单，负责菜单显示隐藏，命令按钮绑定与可用禁用状态控制。 @see http://ggeditor.com/docs/api/contextMenu.zh-CN.html */
+ export const ContextMenu: React.ComponentClass<BasicProps, any>
+
+ /** 工具栏，负责命令按钮绑定与可用禁用状态控制。 @see http://ggeditor.com/docs/api/toolbar.zh-CN.html */
+ export const Toolbar: React.ComponentClass<BasicProps, any>
+
+ /** 元素面板栏 必需配合 <Item /> 组件使用，如果 <Item /> 包含 src 属性则自动显示元素概览图片。 @see http://ggeditor.com/docs/api/itemPanel.zh-CN.html */
+ export const ItemPanel: React.ComponentClass<ReactProps, any>
+ export const Item: React.ComponentClass<ItemPanelProps, any>
+
+ /** 属性栏会自动根据不同页面状态显示对应面板，例如：选中节点时则只会显示 NodePanel @see http://ggeditor.com/docs/api/detailPanel.zh-CN.html */
+ export const DetailPanel: React.ComponentClass<ReactProps, any>
+
+ export const RegisterNode: React.ComponentClass<RegisterProps, any>
+ export const RegisterEdge: React.ComponentClass<RegisterProps, any>
+ export const RegisterGroup: React.ComponentClass<RegisterProps, any>
+ export const RegisterCommand: React.ComponentClass<RegisterProps, any>
+ export const RegisterBehaviour: React.ComponentClass<RegisterBehaviourProps, any>
+
+ export const CanvasMenu: React.ComponentClass<ReactProps, any>
+ export const EdgeMenu: React.ComponentClass<ReactProps, any>
+ export const GroupMenu: React.ComponentClass<ReactProps, any>
+ export const MultiMenu: React.ComponentClass<ReactProps, any>
+ export const NodeMenu: React.ComponentClass<ReactProps, any>
+
+ export const CanvasPanel: React.ComponentClass<ReactProps, any>
+ export const EdgePanel: React.ComponentClass<ReactProps, any>
+ export const GroupPanel: React.ComponentClass<ReactProps, any>
+ export const MultiPanel: React.ComponentClass<ReactProps, any>
+ export const NodePanel: React.ComponentClass<ReactProps, any>
+
+ export const KoniCustomNode: React.ComponentClass<ReactProps & GraphMouseReactEventsProps & GraphOtherReactEventsProps & PageReactEventsProps, any>
+
+ /** 这里会带一个 Props 属性 @see http://ggeditor.com/docs/api/propsAPI.zh-CN.html */
+ export function withPropsAPI(com: React.ComponentClass<ReactProps, any>): React.ComponentClass<any, any>
+}
diff --git a/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/DefaultSagaTransactionalTemplate.java b/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/DefaultSagaTransactionalTemplate.java
index 5fa447b0e5c5d6671b3dd9099bbc399c5ff9bbd3..41b1847ac00b666d1461c6487ede344b708ffb98 100644
--- a/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/DefaultSagaTransactionalTemplate.java
+++ b/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/DefaultSagaTransactionalTemplate.java
@@ -15,6 +15,8 @@
*/
package io.seata.saga.tm;
+import java.util.List;
+
import io.seata.core.exception.TransactionException;
import io.seata.core.model.BranchStatus;
import io.seata.core.model.BranchType;
@@ -29,6 +31,7 @@ import io.seata.tm.TMClient;
import io.seata.tm.api.GlobalTransaction;
import io.seata.tm.api.GlobalTransactionContext;
import io.seata.tm.api.TransactionalExecutor;
+import io.seata.tm.api.TransactionalExecutor.ExecutionException;
import io.seata.tm.api.transaction.TransactionHook;
import io.seata.tm.api.transaction.TransactionHookManager;
import io.seata.tm.api.transaction.TransactionInfo;
@@ -41,22 +44,21 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
-import java.util.List;
-
/**
* Template of executing business logic with a global transaction for SAGA mode
*
* @author lorne.cl
*/
-public class DefaultSagaTransactionalTemplate implements SagaTransactionalTemplate, ApplicationContextAware, DisposableBean, InitializingBean {
+public class DefaultSagaTransactionalTemplate
+ implements SagaTransactionalTemplate, ApplicationContextAware, DisposableBean, InitializingBean {
private static final Logger LOGGER = LoggerFactory.getLogger(DefaultSagaTransactionalTemplate.class);
private static final int DEFAULT_TRANS_OPER_TIMEOUT = 60000 * 10;
private int timeout = DEFAULT_TRANS_OPER_TIMEOUT;
- private String applicationId;
- private String txServiceGroup;
+ private String applicationId;
+ private String txServiceGroup;
private ApplicationContext applicationContext;
@Override
@@ -67,13 +69,13 @@ public class DefaultSagaTransactionalTemplate implements SagaTransactionalTempla
triggerAfterCommit();
} catch (TransactionException txe) {
// 4.1 Failed to commit
- throw new TransactionalExecutor.ExecutionException(tx, txe,
- TransactionalExecutor.Code.CommitFailure);
+ throw new TransactionalExecutor.ExecutionException(tx, txe, TransactionalExecutor.Code.CommitFailure);
}
}
@Override
- public void rollbackTransaction(GlobalTransaction tx, Throwable ex) throws TransactionException, TransactionalExecutor.ExecutionException {
+ public void rollbackTransaction(GlobalTransaction tx, Throwable ex)
+ throws TransactionException, TransactionalExecutor.ExecutionException {
triggerBeforeRollback();
tx.rollback();
triggerAfterRollback();
@@ -88,33 +90,39 @@ public class DefaultSagaTransactionalTemplate implements SagaTransactionalTempla
tx.begin(txInfo.getTimeOut(), txInfo.getName());
triggerAfterBegin();
} catch (TransactionException txe) {
- throw new TransactionalExecutor.ExecutionException(tx, txe,
- TransactionalExecutor.Code.BeginFailure);
+ throw new TransactionalExecutor.ExecutionException(tx, txe, TransactionalExecutor.Code.BeginFailure);
}
return tx;
}
@Override
- public void reportTransaction(GlobalTransaction tx, GlobalStatus globalStatus) throws TransactionalExecutor.ExecutionException {
+ public GlobalTransaction reloadTransaction(String xid) throws ExecutionException, TransactionException {
+ return GlobalTransactionContext.reload(xid);
+ }
+
+ @Override
+ public void reportTransaction(GlobalTransaction tx, GlobalStatus globalStatus)
+ throws TransactionalExecutor.ExecutionException {
try {
tx.globalReport(globalStatus);
triggerAfterCompletion();
} catch (TransactionException txe) {
- throw new TransactionalExecutor.ExecutionException(tx, txe,
- TransactionalExecutor.Code.ReportFailure);
+ throw new TransactionalExecutor.ExecutionException(tx, txe, TransactionalExecutor.Code.ReportFailure);
}
}
@Override
public long branchRegister(String resourceId, String clientId, String xid, String applicationData, String lockKeys)
- throws TransactionException {
- return DefaultResourceManager.get().branchRegister(BranchType.SAGA, resourceId, clientId, xid, applicationData, lockKeys);
+ throws TransactionException {
+ return DefaultResourceManager.get().branchRegister(BranchType.SAGA, resourceId, clientId, xid, applicationData,
+ lockKeys);
}
+ @Override
public void branchReport(String xid, long branchId, BranchStatus status, String applicationData)
- throws TransactionException{
+ throws TransactionException {
DefaultResourceManager.get().branchReport(BranchType.SAGA, xid, branchId, status, applicationData);
}
@@ -123,7 +131,7 @@ public class DefaultSagaTransactionalTemplate implements SagaTransactionalTempla
try {
hook.beforeBegin();
} catch (Exception e) {
- LOGGER.error("Failed execute beforeBegin in hook " + e.getMessage());
+ LOGGER.error("Failed execute beforeBegin in hook {}", e.getMessage(), e);
}
}
}
@@ -133,7 +141,7 @@ public class DefaultSagaTransactionalTemplate implements SagaTransactionalTempla
try {
hook.afterBegin();
} catch (Exception e) {
- LOGGER.error("Failed execute afterBegin in hook " + e.getMessage());
+ LOGGER.error("Failed execute afterBegin in hook {} ", e.getMessage(), e);
}
}
}
@@ -143,7 +151,7 @@ public class DefaultSagaTransactionalTemplate implements SagaTransactionalTempla
try {
hook.beforeRollback();
} catch (Exception e) {
- LOGGER.error("Failed execute beforeRollback in hook " + e.getMessage());
+ LOGGER.error("Failed execute beforeRollback in hook {} ", e.getMessage(), e);
}
}
}
@@ -153,7 +161,7 @@ public class DefaultSagaTransactionalTemplate implements SagaTransactionalTempla
try {
hook.afterRollback();
} catch (Exception e) {
- LOGGER.error("Failed execute afterRollback in hook " + e.getMessage());
+ LOGGER.error("Failed execute afterRollback in hook {}", e.getMessage(), e);
}
}
}
@@ -163,7 +171,7 @@ public class DefaultSagaTransactionalTemplate implements SagaTransactionalTempla
try {
hook.beforeCommit();
} catch (Exception e) {
- LOGGER.error("Failed execute beforeCommit in hook " + e.getMessage());
+ LOGGER.error("Failed execute beforeCommit in hook {}", e.getMessage(), e);
}
}
}
@@ -173,7 +181,7 @@ public class DefaultSagaTransactionalTemplate implements SagaTransactionalTempla
try {
hook.afterCommit();
} catch (Exception e) {
- LOGGER.error("Failed execute afterCommit in hook " + e.getMessage());
+ LOGGER.error("Failed execute afterCommit in hook {}", e.getMessage(), e);
}
}
}
@@ -184,7 +192,7 @@ public class DefaultSagaTransactionalTemplate implements SagaTransactionalTempla
try {
hook.afterCompletion();
} catch (Exception e) {
- LOGGER.error("Failed execute afterCompletion in hook " + e.getMessage());
+ LOGGER.error("Failed execute afterCompletion in hook {}", e.getMessage(), e);
}
}
}
@@ -203,23 +211,24 @@ public class DefaultSagaTransactionalTemplate implements SagaTransactionalTempla
if (LOGGER.isInfoEnabled()) {
LOGGER.info("Initializing Global Transaction Clients ... ");
}
- if (io.seata.common.util.StringUtils.isNullOrEmpty(applicationId) || io.seata.common.util.StringUtils.isNullOrEmpty(txServiceGroup)) {
+ if (io.seata.common.util.StringUtils.isNullOrEmpty(applicationId) || io.seata.common.util.StringUtils
+ .isNullOrEmpty(txServiceGroup)) {
throw new IllegalArgumentException(
- "applicationId: " + applicationId + ", txServiceGroup: " + txServiceGroup);
+ "applicationId: " + applicationId + ", txServiceGroup: " + txServiceGroup);
}
//init TM
TMClient.init(applicationId, txServiceGroup);
if (LOGGER.isInfoEnabled()) {
LOGGER.info(
- "Transaction Manager Client is initialized. applicationId[" + applicationId + "] txServiceGroup["
- + txServiceGroup + "]");
+ "Transaction Manager Client is initialized. applicationId[" + applicationId + "] txServiceGroup["
+ + txServiceGroup + "]");
}
//init RM
RMClient.init(applicationId, txServiceGroup);
if (LOGGER.isInfoEnabled()) {
LOGGER.info(
- "Resource Manager is initialized. applicationId[" + applicationId + "] txServiceGroup[" + txServiceGroup
- + "]");
+ "Resource Manager is initialized. applicationId[" + applicationId + "] txServiceGroup[" + txServiceGroup
+ + "]");
}
// Only register application as a saga resource
@@ -282,4 +291,4 @@ public class DefaultSagaTransactionalTemplate implements SagaTransactionalTempla
public void setTxServiceGroup(String txServiceGroup) {
this.txServiceGroup = txServiceGroup;
}
-}
\ No newline at end of file
+}
diff --git a/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/SagaTransactionalTemplate.java b/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/SagaTransactionalTemplate.java
index ae09b7134b9309ce55c4c14aec66146289ad3b32..51bef0a033873e6e3e838a49bfa31486da737c15 100644
--- a/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/SagaTransactionalTemplate.java
+++ b/saga/seata-saga-tm/src/main/java/io/seata/saga/tm/SagaTransactionalTemplate.java
@@ -31,17 +31,22 @@ public interface SagaTransactionalTemplate {
void commitTransaction(GlobalTransaction tx) throws TransactionalExecutor.ExecutionException;
- void rollbackTransaction(GlobalTransaction tx, Throwable ex) throws TransactionException, TransactionalExecutor.ExecutionException;
+ void rollbackTransaction(GlobalTransaction tx, Throwable ex)
+ throws TransactionException, TransactionalExecutor.ExecutionException;
GlobalTransaction beginTransaction(TransactionInfo txInfo) throws TransactionalExecutor.ExecutionException;
- void reportTransaction(GlobalTransaction tx, GlobalStatus globalStatus) throws TransactionalExecutor.ExecutionException;
+ GlobalTransaction reloadTransaction(String xid)
+ throws TransactionalExecutor.ExecutionException, TransactionException;
+
+ void reportTransaction(GlobalTransaction tx, GlobalStatus globalStatus)
+ throws TransactionalExecutor.ExecutionException;
long branchRegister(String resourceId, String clientId, String xid, String applicationData, String lockKeys)
- throws TransactionException;
+ throws TransactionException;
void branchReport(String xid, long branchId, BranchStatus status, String applicationData)
- throws TransactionException;
+ throws TransactionException;
int getTimeout();
diff --git a/script/client/at/db/mysql.sql b/script/client/at/db/mysql.sql
new file mode 100644
index 0000000000000000000000000000000000000000..6dac3a096de870cc888c06b9b3271cf5f7dac355
--- /dev/null
+++ b/script/client/at/db/mysql.sql
@@ -0,0 +1,16 @@
+-- for AT mode you must to init this sql for you business database. the seata server not need it.
+CREATE TABLE IF NOT EXISTS `undo_log`
+(
+ `id` BIGINT(20) NOT NULL AUTO_INCREMENT COMMENT 'increment id',
+ `branch_id` BIGINT(20) NOT NULL COMMENT 'branch transaction id',
+ `xid` VARCHAR(100) NOT NULL COMMENT 'global transaction id',
+ `context` VARCHAR(128) NOT NULL COMMENT 'undo_log context,such as serialization',
+ `rollback_info` LONGBLOB NOT NULL COMMENT 'rollback info',
+ `log_status` INT(11) NOT NULL COMMENT '0:normal status,1:defense status',
+ `log_created` DATETIME NOT NULL COMMENT 'create datetime',
+ `log_modified` DATETIME NOT NULL COMMENT 'modify datetime',
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `ux_undo_log` (`xid`, `branch_id`)
+) ENGINE = InnoDB
+ AUTO_INCREMENT = 1
+ DEFAULT CHARSET = utf8 COMMENT ='AT transaction mode undo table';
\ No newline at end of file
diff --git a/script/client/at/db/oracle.sql b/script/client/at/db/oracle.sql
new file mode 100644
index 0000000000000000000000000000000000000000..41a7e5d4a016f058403c468f661ca13dc87fd988
--- /dev/null
+++ b/script/client/at/db/oracle.sql
@@ -0,0 +1,19 @@
+-- for AT mode you must to init this sql for you business database. the seata server not need it.
+CREATE TABLE undo_log
+(
+ id NUMBER(19) NOT NULL,
+ branch_id NUMBER(19) NOT NULL,
+ xid VARCHAR2(100) NOT NULL,
+ context VARCHAR2(128) NOT NULL,
+ rollback_info BLOB NOT NULL,
+ log_status NUMBER(10) NOT NULL,
+ log_created TIMESTAMP(0) NOT NULL,
+ log_modified TIMESTAMP(0) NOT NULL,
+ PRIMARY KEY (id),
+ CONSTRAINT ux_undo_log UNIQUE (xid, branch_id)
+);
+
+COMMENT ON TABLE undo_log IS 'AT transaction mode undo table';
+
+-- Generate ID using sequence and trigger
+CREATE SEQUENCE UNDO_LOG_SEQ START WITH 1 INCREMENT BY 1;
\ No newline at end of file
diff --git a/script/client/at/db/postgresql.sql b/script/client/at/db/postgresql.sql
new file mode 100644
index 0000000000000000000000000000000000000000..c2c86390319eba1cd62ee34b4eb7818bcad8e958
--- /dev/null
+++ b/script/client/at/db/postgresql.sql
@@ -0,0 +1,14 @@
+-- for AT mode you must to init this sql for you business database. the seata server not need it.
+CREATE TABLE IF NOT EXISTS public.undo_log
+(
+ id SERIAL NOT NULL,
+ branch_id BIGINT NOT NULL,
+ xid VARCHAR(100) NOT NULL,
+ context VARCHAR(128) NOT NULL,
+ rollback_info BYTEA NOT NULL,
+ log_status INT NOT NULL,
+ log_created TIMESTAMP(0) NOT NULL,
+ log_modified TIMESTAMP(0) NOT NULL,
+ CONSTRAINT pk_undo_log PRIMARY KEY (id),
+ CONSTRAINT ux_undo_log UNIQUE (xid, branch_id)
+);
\ No newline at end of file
diff --git a/script/client/conf/file.conf b/script/client/conf/file.conf
new file mode 100644
index 0000000000000000000000000000000000000000..032e29919c557c369929b934860b0d0d273ec8ad
--- /dev/null
+++ b/script/client/conf/file.conf
@@ -0,0 +1,70 @@
+transport {
+ # tcp udt unix-domain-socket
+ type = "TCP"
+ #NIO NATIVE
+ server = "NIO"
+ #enable heartbeat
+ heartbeat = true
+ # the client batch send request enable
+ enable-client-batch-send-request = true
+ #thread factory for netty
+ thread-factory {
+ boss-thread-prefix = "NettyBoss"
+ worker-thread-prefix = "NettyServerNIOWorker"
+ server-executor-thread-prefix = "NettyServerBizHandler"
+ share-boss-worker = false
+ client-selector-thread-prefix = "NettyClientSelector"
+ client-selector-thread-size = 1
+ client-worker-thread-prefix = "NettyClientWorkerThread"
+ # netty boss thread size,will not be used for UDT
+ boss-thread-size = 1
+ #auto default pin or 8
+ worker-thread-size = 8
+ }
+ shutdown {
+ # when destroy server, wait seconds
+ wait = 3
+ }
+ serialization = "seata"
+ compressor = "none"
+}
+service {
+ #transaction service group mapping
+ vgroup_mapping.my_test_tx_group = "default"
+ #only support when registry.type=file, please don't set multiple addresses
+ default.grouplist = "127.0.0.1:8091"
+ #degrade, current not support
+ enableDegrade = false
+ #disable seata
+ disableGlobalTransaction = false
+}
+
+client {
+ rm {
+ async.commit.buffer.limit = 10000
+ lock {
+ retry.internal = 10
+ retry.times = 30
+ retry.policy.branch-rollback-on-conflict = true
+ }
+ report.retry.count = 5
+ table.meta.check.enable = false
+ report.success.enable = true
+ }
+ tm {
+ commit.retry.count = 5
+ rollback.retry.count = 5
+ }
+ undo {
+ data.validation = true
+ log.serialization = "jackson"
+ log.table = "undo_log"
+ }
+ log {
+ exceptionRate = 100
+ }
+ support {
+ # auto proxy the DataSource bean
+ spring.datasource.autoproxy = false
+ }
+}
\ No newline at end of file
diff --git a/script/client/conf/registry.conf b/script/client/conf/registry.conf
new file mode 100644
index 0000000000000000000000000000000000000000..b98f5704acf2cb8511813df3585f5e5347476553
--- /dev/null
+++ b/script/client/conf/registry.conf
@@ -0,0 +1,73 @@
+registry {
+ # file 、nacos 、eureka、redis、zk、consul、etcd3、sofa
+ type = "file"
+
+ nacos {
+ serverAddr = "localhost"
+ namespace = ""
+ cluster = "default"
+ }
+ eureka {
+ serviceUrl = "http://localhost:8761/eureka"
+ application = "default"
+ weight = "1"
+ }
+ redis {
+ serverAddr = "localhost:6379"
+ db = "0"
+ }
+ zk {
+ cluster = "default"
+ serverAddr = "127.0.0.1:2181"
+ session.timeout = 6000
+ connect.timeout = 2000
+ }
+ consul {
+ cluster = "default"
+ serverAddr = "127.0.0.1:8500"
+ }
+ etcd3 {
+ cluster = "default"
+ serverAddr = "http://localhost:2379"
+ }
+ sofa {
+ serverAddr = "127.0.0.1:9603"
+ application = "default"
+ region = "DEFAULT_ZONE"
+ datacenter = "DefaultDataCenter"
+ cluster = "default"
+ group = "SEATA_GROUP"
+ addressWaitTime = "3000"
+ }
+ file {
+ name = "file.conf"
+ }
+}
+
+config {
+ # file、nacos 、apollo、zk、consul、etcd3
+ type = "file"
+
+ nacos {
+ serverAddr = "localhost"
+ namespace = ""
+ }
+ consul {
+ serverAddr = "127.0.0.1:8500"
+ }
+ apollo {
+ app.id = "seata-server"
+ apollo.meta = "http://192.168.1.204:8801"
+ }
+ zk {
+ serverAddr = "127.0.0.1:2181"
+ session.timeout = 6000
+ connect.timeout = 2000
+ }
+ etcd3 {
+ serverAddr = "http://localhost:2379"
+ }
+ file {
+ name = "file.conf"
+ }
+}
diff --git a/saga/seata-saga-engine-store/src/main/resources/sql/db2_init.sql b/script/client/saga/db/db2.sql
similarity index 96%
rename from saga/seata-saga-engine-store/src/main/resources/sql/db2_init.sql
rename to script/client/saga/db/db2.sql
index 33fd52a88b116bc97a90494330512bd18241da7d..cd50a6267e4b17ccd40c815fdf56ddcd408ff212 100644
--- a/saga/seata-saga-engine-store/src/main/resources/sql/db2_init.sql
+++ b/script/client/saga/db/db2.sql
@@ -16,7 +16,7 @@ create table seata_state_machine_def
create table seata_state_machine_inst
(
- id varchar(32) not null,
+ id varchar(46) not null,
machine_id varchar(32) not null,
tenant_id varchar(32) not null,
parent_id varchar(46),
@@ -43,7 +43,7 @@ create unique index state_machine_inst_unibuzkey on seata_state_machine_inst(uni
create table seata_state_inst
(
id varchar(32) not null,
- machine_inst_id varchar(32) not null,
+ machine_inst_id varchar(46) not null,
name varchar(255) not null,
type varchar(20),
service_name varchar(255),
diff --git a/script/client/saga/db/h2.sql b/script/client/saga/db/h2.sql
new file mode 100644
index 0000000000000000000000000000000000000000..0f69c964940f19228a0f45a5a1e2996bbb3f6961
--- /dev/null
+++ b/script/client/saga/db/h2.sql
@@ -0,0 +1,57 @@
+create table if not exists seata_state_machine_def
+(
+ id varchar(32) not null comment 'id',
+ name varchar(255) not null comment 'name',
+ tenant_id varchar(32) not null comment 'tenant id',
+ app_name varchar(32) not null comment 'application name',
+ type varchar(20) comment 'state language type',
+ comment_ varchar(255) comment 'comment',
+ ver varchar(16) not null comment 'version',
+ gmt_create timestamp not null comment 'create time',
+ status varchar(2) not null comment 'status(AC:active|IN:inactive)',
+ content clob comment 'content',
+ recover_strategy varchar(16) comment 'transaction recover strategy(compensate|retry)',
+ primary key (id)
+);
+
+create table if not exists seata_state_machine_inst
+(
+ id varchar(46) not null comment 'id',
+ machine_id varchar(32) not null comment 'state machine definition id',
+ tenant_id varchar(32) not null comment 'tenant id',
+ parent_id varchar(46) comment 'parent id',
+ gmt_started timestamp not null comment 'start time',
+ business_key varchar(48) comment 'business key',
+ start_params clob comment 'start parameters',
+ gmt_end timestamp comment 'end time',
+ excep blob comment 'exception',
+ end_params clob comment 'end parameters',
+ status varchar(2) comment 'status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
+ compensation_status varchar(2) comment 'compensation status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
+ is_running tinyint(1) comment 'is running(0 no|1 yes)',
+ gmt_updated timestamp not null,
+ primary key (id),
+ unique key unikey_buz_tenant (business_key, tenant_id)
+);
+
+create table if not exists seata_state_inst
+(
+ id varchar(32) not null comment 'id',
+ machine_inst_id varchar(46) not null comment 'state machine instance id',
+ name varchar(255) not null comment 'state name',
+ type varchar(20) comment 'state type',
+ service_name varchar(255) comment 'service name',
+ service_method varchar(255) comment 'method name',
+ service_type varchar(16) comment 'service type',
+ business_key varchar(48) comment 'business key',
+ state_id_compensated_for varchar(32) comment 'state compensated for',
+ state_id_retried_for varchar(32) comment 'state retried for',
+ gmt_started timestamp not null comment 'start time',
+ is_for_update tinyint(1) comment 'is service for update',
+ input_params clob comment 'input parameters',
+ output_params clob comment 'output parameters',
+ status varchar(2) not null comment 'status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
+ excep blob comment 'exception',
+ gmt_end timestamp comment 'end time',
+ primary key (id, machine_inst_id)
+);
\ No newline at end of file
diff --git a/script/client/saga/db/mysql.sql b/script/client/saga/db/mysql.sql
new file mode 100644
index 0000000000000000000000000000000000000000..46669f29c34cbfe72c3411d5f3e653777a691e5e
--- /dev/null
+++ b/script/client/saga/db/mysql.sql
@@ -0,0 +1,61 @@
+-- -------------------------------- The script used for sage --------------------------------
+CREATE TABLE IF NOT EXISTS `seata_state_machine_def`
+(
+ `id` VARCHAR(32) NOT NULL COMMENT 'id',
+ `name` VARCHAR(255) NOT NULL COMMENT 'name',
+ `tenant_id` VARCHAR(32) NOT NULL COMMENT 'tenant id',
+ `app_name` VARCHAR(32) NOT NULL COMMENT 'application name',
+ `type` VARCHAR(20) COMMENT 'state language type',
+ `comment_` VARCHAR(255) COMMENT 'comment',
+ `ver` VARCHAR(16) NOT NULL COMMENT 'version',
+ `gmt_create` TIMESTAMP NOT NULL COMMENT 'create time',
+ `status` VARCHAR(2) NOT NULL COMMENT 'status(AC:active|IN:inactive)',
+ `content` TEXT COMMENT 'content',
+ `recover_strategy` VARCHAR(16) COMMENT 'transaction recover strategy(compensate|retry)',
+ PRIMARY KEY (`id`)
+) ENGINE = InnoDB
+ DEFAULT CHARSET = utf8;
+
+CREATE TABLE IF NOT EXISTS `seata_state_machine_inst`
+(
+ `id` VARCHAR(46) NOT NULL COMMENT 'id',
+ `machine_id` VARCHAR(32) NOT NULL COMMENT 'state machine definition id',
+ `tenant_id` VARCHAR(32) NOT NULL COMMENT 'tenant id',
+ `parent_id` VARCHAR(46) COMMENT 'parent id',
+ `gmt_started` TIMESTAMP NOT NULL COMMENT 'start time',
+ `business_key` VARCHAR(48) COMMENT 'business key',
+ `start_params` TEXT COMMENT 'start parameters',
+ `gmt_end` TIMESTAMP DEFAULT now() COMMENT 'end time',
+ `excep` BLOB COMMENT 'exception',
+ `end_params` TEXT COMMENT 'end parameters',
+ `status` VARCHAR(2) COMMENT 'status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
+ `compensation_status` VARCHAR(2) COMMENT 'compensation status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
+ `is_running` TINYINT(1) COMMENT 'is running(0 no|1 yes)',
+ `gmt_updated` TIMESTAMP DEFAULT now() NOT NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `unikey_buz_tenant` (`business_key`, `tenant_id`)
+) ENGINE = InnoDB
+ DEFAULT CHARSET = utf8;
+
+CREATE TABLE IF NOT EXISTS `seata_state_inst`
+(
+ `id` VARCHAR(32) NOT NULL COMMENT 'id',
+ `machine_inst_id` VARCHAR(46) NOT NULL COMMENT 'state machine instance id',
+ `name` VARCHAR(255) NOT NULL COMMENT 'state name',
+ `type` VARCHAR(20) COMMENT 'state type',
+ `service_name` VARCHAR(255) COMMENT 'service name',
+ `service_method` VARCHAR(255) COMMENT 'method name',
+ `service_type` VARCHAR(16) COMMENT 'service type',
+ `business_key` VARCHAR(48) COMMENT 'business key',
+ `state_id_compensated_for` VARCHAR(32) COMMENT 'state compensated for',
+ `state_id_retried_for` VARCHAR(32) COMMENT 'state retried for',
+ `gmt_started` TIMESTAMP NOT NULL COMMENT 'start time',
+ `is_for_update` TINYINT(1) COMMENT 'is service for update',
+ `input_params` TEXT COMMENT 'input parameters',
+ `output_params` TEXT COMMENT 'output parameters',
+ `status` VARCHAR(2) NOT NULL COMMENT 'status(SU succeed|FA failed|UN unknown|SK skipped|RU running)',
+ `excep` BLOB COMMENT 'exception',
+ `gmt_end` TIMESTAMP DEFAULT now() COMMENT 'end time',
+ PRIMARY KEY (`id`, `machine_inst_id`)
+) ENGINE = InnoDB
+ DEFAULT CHARSET = utf8;
\ No newline at end of file
diff --git a/script/client/saga/db/oracle.sql b/script/client/saga/db/oracle.sql
new file mode 100644
index 0000000000000000000000000000000000000000..32d9e4c03974307799cd9380386953abe90e478b
--- /dev/null
+++ b/script/client/saga/db/oracle.sql
@@ -0,0 +1,63 @@
+CREATE TABLE seata_state_machine_def
+(
+ id VARCHAR(32) NOT NULL,
+ name VARCHAR(255) NOT NULL,
+ tenant_id VARCHAR(32) NOT NULL,
+ app_name VARCHAR(32) NOT NULL,
+ type VARCHAR(20),
+ comment_ VARCHAR(255),
+ ver VARCHAR(16) NOT NULL,
+ gmt_create TIMESTAMP NOT NULL,
+ status VARCHAR(2) NOT NULL,
+ content CLOB,
+ recover_strategy VARCHAR(16),
+ PRIMARY KEY (id)
+);
+
+CREATE TABLE seata_state_machine_inst
+(
+ id VARCHAR(46) NOT NULL,
+ machine_id VARCHAR(32) NOT NULL,
+ tenant_id VARCHAR(32) NOT NULL,
+ parent_id VARCHAR(46),
+ gmt_started TIMESTAMP NOT NULL,
+ business_key VARCHAR(48),
+ uni_business_key VARCHAR(48) GENERATED ALWAYS AS (
+ CASE
+ WHEN "BUSINESS_KEY" IS NULL
+ THEN "ID"
+ ELSE "BUSINESS_KEY"
+ END),
+ start_params CLOB,
+ gmt_end TIMESTAMP,
+ excep BLOB,
+ end_params CLOB,
+ status VARCHAR(2),
+ compensation_status VARCHAR(2),
+ is_running SMALLINT,
+ gmt_updated TIMESTAMP NOT NULL,
+ PRIMARY KEY (id)
+);
+CREATE UNIQUE INDEX state_machine_inst_unibuzkey ON seata_state_machine_inst (uni_business_key, tenant_id);
+
+CREATE TABLE seata_state_inst
+(
+ id VARCHAR(32) NOT NULL,
+ machine_inst_id VARCHAR(46) NOT NULL,
+ name VARCHAR(255) NOT NULL,
+ type VARCHAR(20),
+ service_name VARCHAR(255),
+ service_method VARCHAR(255),
+ service_type VARCHAR(16),
+ business_key VARCHAR(48),
+ state_id_compensated_for VARCHAR(32),
+ state_id_retried_for VARCHAR(32),
+ gmt_started TIMESTAMP NOT NULL,
+ is_for_update SMALLINT,
+ input_params CLOB,
+ output_params CLOB,
+ status VARCHAR(2) NOT NULL,
+ excep BLOB,
+ gmt_end TIMESTAMP,
+ PRIMARY KEY (id, machine_inst_id)
+);
diff --git a/script/client/saga/db/postgresql.sql b/script/client/saga/db/postgresql.sql
new file mode 100644
index 0000000000000000000000000000000000000000..8bd5fa1f8a582af0293c6685a4d070d2f9c2da04
--- /dev/null
+++ b/script/client/saga/db/postgresql.sql
@@ -0,0 +1,58 @@
+-- -------------------------------- The script used for sage --------------------------------
+CREATE TABLE IF NOT EXISTS public.seata_state_machine_def
+(
+ id VARCHAR(32) NOT NULL,
+ name VARCHAR(255) NOT NULL,
+ tenant_id VARCHAR(32) NOT NULL,
+ app_name VARCHAR(32) NOT NULL,
+ type VARCHAR(20),
+ comment_ VARCHAR(255),
+ ver VARCHAR(16) NOT NULL,
+ gmt_create TIMESTAMP(0) NOT NULL,
+ status VARCHAR(2) NOT NULL,
+ content TEXT,
+ recover_strategy VARCHAR(16),
+ CONSTRAINT pk_seata_state_machine_def PRIMARY KEY (id)
+);
+
+CREATE TABLE IF NOT EXISTS public.seata_state_machine_inst
+(
+ id VARCHAR(46) NOT NULL,
+ machine_id VARCHAR(32) NOT NULL,
+ tenant_id VARCHAR(32) NOT NULL,
+ parent_id VARCHAR(46),
+ gmt_started TIMESTAMP(0) NOT NULL,
+ business_key VARCHAR(48),
+ start_params TEXT,
+ gmt_end TIMESTAMP(0) DEFAULT now(),
+ excep BYTEA,
+ end_params TEXT,
+ status VARCHAR(2),
+ compensation_status VARCHAR(2),
+ is_running BOOLEAN,
+ gmt_updated TIMESTAMP(0) DEFAULT now() NOT NULL,
+ CONSTRAINT pk_seata_state_machine_inst PRIMARY KEY (id),
+ CONSTRAINT unikey_buz_tenant UNIQUE (business_key, tenant_id)
+)
+;
+CREATE TABLE IF NOT EXISTS public.seata_state_inst
+(
+ id VARCHAR(32) NOT NULL,
+ machine_inst_id VARCHAR(46) NOT NULL,
+ name VARCHAR(255) NOT NULL,
+ type VARCHAR(20),
+ service_name VARCHAR(255),
+ service_method VARCHAR(255),
+ service_type VARCHAR(16),
+ business_key VARCHAR(48),
+ state_id_compensated_for VARCHAR(32),
+ state_id_retried_for VARCHAR(32),
+ gmt_started TIMESTAMP(0) NOT NULL,
+ is_for_update BOOLEAN,
+ input_params TEXT,
+ output_params TEXT,
+ status VARCHAR(2) NOT NULL,
+ excep BYTEA,
+ gmt_end TIMESTAMP(0) DEFAULT now(),
+ CONSTRAINT pk_seata_state_inst PRIMARY KEY (id, machine_inst_id)
+);
diff --git a/script/client/spring/application.properties b/script/client/spring/application.properties
new file mode 100755
index 0000000000000000000000000000000000000000..063a727c619cc85163ccd6c863e3037480e78c3e
--- /dev/null
+++ b/script/client/spring/application.properties
@@ -0,0 +1,103 @@
+#
+# Copyright 1999-2019 Seata.io Group.
+#
+# Licensed 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.
+#
+
+seata.enabled=true
+seata.application-id=test
+seata.tx-service-group=my_test_tx_group
+seata.client.rm-async-commit-buffer-limit=1000
+seata.client.rm-report-retry-count=5
+seata.client.rm-table-meta-check-enable=false
+seata.client.rm-report-success-enable=true
+seata.client.rm.lock.lock-retry-interval=10
+seata.client.rm.lock.lock-retry-times=30
+seata.client.rm.lock.lock-retry-policy-branch-rollback-on-conflict=true
+seata.client.tm-commit-retry-count=5
+seata.client.tm-rollback-retry-count=5
+seata.client.support.spring.datasource-autoproxy=true
+seata.client.undo.undo-data-validation=true
+seata.client.undo.undo-log-serialization=jackson
+seata.client.undo.undo-log-table=undo_log
+seata.client.log.exceptionRate=100
+seata.service.vgroup-mapping=default
+seata.service.grouplist=127.0.0.1:8091
+seata.service.enable-degrade=false
+seata.service.disable-global-transaction=false
+seata.transport.shutdown.wait=3
+seata.transport.thread-factory.boss-thread-prefix=NettyBoss
+seata.transport.thread-factory.worker-thread-prefix=NettyServerNIOWorker
+seata.transport.thread-factory.server-executor-thread-prefix=NettyServerBizHandler
+seata.transport.thread-factory.share-boss-worker=false
+seata.transport.thread-factory.client-selector-thread-prefix=NettyClientSelector
+seata.transport.thread-factory.client-selector-thread-size=1
+seata.transport.thread-factory.client-worker-thread-prefix=NettyClientWorkerThread
+seata.transport.type=TCP
+seata.transport.server=NIO
+seata.transport.heartbeat=true
+seata.transport.serialization=seata
+seata.transport.compressor=none
+seata.transport.enable-client-batch-send-request=true
+
+seata.config.type=file
+
+seata.config.file.name=file.conf
+
+seata.config.consul.server-addr=127.0.0.1:8500
+
+seata.config.apollo.apollo-meta=http://192.168.1.204:8801
+seata.config.apollo.app-id=seata-server
+
+seata.config.etcd3.server-addr=http://localhost:2379
+
+seata.config.nacos.namespace=
+seata.config.nacos.serverAddr=localhost
+
+seata.config.zk.server-addr=127.0.0.1:2181
+seata.config.zk.session-timeout=6000
+seata.config.zk.connect-timeout=2000
+
+seata.registry.type=file
+
+seata.registry.file.name=file.conf
+
+seata.registry.consul.cluster=default
+seata.registry.consul.server-addr=127.0.0.1:8500
+
+seata.registry.etcd3.cluster=default
+seata.registry.etcd3.serverAddr=http://localhost:2379
+
+seata.registry.eureka.application=default
+seata.registry.eureka.weight=1
+seata.registry.eureka.service-url=http://localhost:8761/eureka
+
+seata.registry.nacos.cluster=default
+seata.registry.nacos.server-addr=localhost
+seata.registry.nacos.namespace=
+
+seata.registry.redis.server-addr=localhost:6379
+seata.registry.redis.db=0
+
+seata.registry.sofa.server-addr=127.0.0.1:9603
+seata.registry.sofa.application=default
+seata.registry.sofa.region=DEFAULT_ZONE
+seata.registry.sofa.datacenter=DefaultDataCenter
+seata.registry.sofa.cluster=default
+seata.registry.sofa.group=SEATA_GROUP
+seata.registry.sofa.addressWaitTime=3000
+
+seata.registry.zk.cluster=default
+seata.registry.zk.server-addr=127.0.0.1:2181
+seata.registry.zk.session-timeout=6000
+seata.registry.zk.connect-timeout=2000
diff --git a/script/client/spring/application.yml b/script/client/spring/application.yml
new file mode 100755
index 0000000000000000000000000000000000000000..7287b257a01758ce139e0e8bad27529c40ced15d
--- /dev/null
+++ b/script/client/spring/application.yml
@@ -0,0 +1,100 @@
+seata:
+ enabled: true
+ application-id: test
+ tx-service-group: my_test_tx_group
+ client:
+ rm-async-commit-buffer-limit: 1000
+ rm-report-retry-count: 5
+ rm-table-meta-check-enable: false
+ rm-report-success-enable: true
+ rm:
+ lock:
+ lock-retry-interval: 10
+ lock-retry-times: 30
+ lock-retry-policy-branch-rollback-on-conflict: true
+ tm-commit-retry-count: 5
+ tm-rollback-retry-count: 5
+ support:
+ spring:
+ datasource-autoproxy: true
+ undo:
+ undo-data-validation: true
+ undo-log-serialization: jackson
+ undo-log-table: undo_log
+ client:
+ log:
+ exceptionRate: 100
+ service:
+ vgroup-mapping: default
+ grouplist: 127.0.0.1:8091
+ enable-degrade: false
+ disable-global-transaction: false
+ transport:
+ shutdown:
+ wait: 3
+ thread-factory:
+ boss-thread-prefix: NettyBoss
+ worker-thread-prefix: NettyServerNIOWorker
+ server-executor-thread-prefix: NettyServerBizHandler
+ share-boss-worker: false
+ client-selector-thread-prefix: NettyClientSelector
+ client-selector-thread-size: 1
+ client-worker-thread-prefix: NettyClientWorkerThread
+ type: TCP
+ server: NIO
+ heartbeat: true
+ serialization: seata
+ compressor: none
+ enable-client-batch-send-request: true
+ config:
+ type: file
+ file:
+ name: file.conf
+ consul:
+ server-addr: 127.0.0.1:8500
+ apollo:
+ apollo-meta: http://192.168.1.204:8801
+ app-id: seata-server
+ etcd3:
+ server-addr: http://localhost:2379
+ nacos:
+ namespace:
+ serverAddr: localhost
+ zk:
+ server-addr: 127.0.0.1:2181
+ session-timeout: 6000
+ connect-timeout: 2000
+ registry:
+ type: file
+ file:
+ name: file.conf
+ consul:
+ cluster: default
+ server-addr: 127.0.0.1:8500
+ etcd3:
+ cluster: default
+ serverAddr: http://localhost:2379
+ eureka:
+ application: default
+ weight: 1
+ service-url: http://localhost:8761/eureka
+ nacos:
+ cluster: default
+ server-addr: localhost
+ namespace:
+ redis:
+ server-addr: localhost:6379
+ db: 0
+ sofa:
+ server-addr: 127.0.0.1:9603
+ application: default
+ region: DEFAULT_ZONE
+ datacenter: DefaultDataCenter
+ cluster: default
+ group: SEATA_GROUP
+ addressWaitTime: 3000
+ zk:
+ cluster: default
+ server-addr: 127.0.0.1:2181
+ session-timeout: 6000
+ connect-timeout: 2000
\ No newline at end of file
diff --git a/script/config-center/apollo/apollo-config.sh b/script/config-center/apollo/apollo-config.sh
new file mode 100755
index 0000000000000000000000000000000000000000..03efe7e8739d71f49332effde9334d663013b188
--- /dev/null
+++ b/script/config-center/apollo/apollo-config.sh
@@ -0,0 +1,130 @@
+#!/usr/bin/env bash
+# Copyright 1999-2019 Seata.io Group.
+#
+# Licensed 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.
+
+
+# apollo open api, click on the link for details:
+# https://github.com/ctripcorp/apollo/wiki/Apollo%E5%BC%80%E6%94%BE%E5%B9%B3%E5%8F%B0
+
+# add config: http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/items
+# publish config: http://{portal_address}/openapi/v1/envs/{env}/apps/{appId}/clusters/{clusterName}/namespaces/{namespaceName}/releases
+
+
+for line in $(cat apollo-params.txt); do
+ key=${line%%=*}
+ value=${line#*=}
+ case ${key} in
+ portalAddr)
+ portalAddr=${value}
+ ;;
+ env)
+ env=${value}
+ ;;
+ appId)
+ appId=${value}
+ ;;
+ clusterName)
+ clusterName=${value}
+ ;;
+ namespaceName)
+ namespaceName=${value}
+ ;;
+ dataChangeCreatedBy)
+ dataChangeCreatedBy=${value}
+ ;;
+ releasedBy)
+ releasedBy=${value}
+ ;;
+ token)
+ token=${value}
+ ;;
+ *)
+ echo "\033[31m Invalid parameter，please refer to apollo-params.txt \033[0m"
+ exit 1
+ ;;
+ esac
+done
+
+if [[ -z ${portalAddr} || -z ${env} || -z ${appId} || -z ${clusterName} || -z ${namespaceName}
+ || -z ${dataChangeCreatedBy} || -z ${releasedBy} || -z ${token} ]]; then
+ echo "\033[31m Incomplete parameters, please fill in the complete parameters: portalAddr:$portalAddr,
+ env:$env, appId:$appId, clusterName:$clusterName, namespaceName:$namespaceName,
+ dataChangeCreatedBy:$dataChangeCreatedBy, releasedBy:$releasedBy, token:$token \033[0m"
+ exit 1
+fi
+
+contentType="content-type:application/json;charset=UTF-8"
+authorization="Authorization:$token"
+publishBody="{\"releaseTitle\":\"$(date +%Y%m%d%H%M%S)\",\"releaseComment\":\"\",\"releasedBy\":\"${releasedBy}\"}"
+
+echo "Portal address is ${portalAddr}"
+echo "Env is ${env}"
+echo "AppId is ${appId}"
+echo "ClusterName is ${clusterName}"
+echo "NamespaceName is ${namespaceName}"
+echo "DataChangeCreatedBy is ${dataChangeCreatedBy}"
+echo "ReleasedBy is ${releasedBy}"
+echo "Token is ${token}"
+
+failCount=0
+tempLog=$(mktemp -t apollo-config.log)
+function addConfig() {
+ curl -X POST -H ${1} -H ${2} -d ${3} "http://${4}/openapi/v1/envs/${5}/apps/${6}/clusters/${7}/namespaces/${8}/items" >${tempLog} 2>/dev/null
+ log=$(cat ${tempLog})
+ if [[ ${log} =~ ":401" || ${log} =~ ":403"
+ || ${log} =~ ":404" || ${log} =~ ":405"
+ || ${log} =~ ":500" || ! ${log} =~ "{" ]]; then
+ echo "set $9=${10}\033[31m failure \033[0m"
+ (( failCount++ ))
+ else
+ echo "set $9=${10}\033[32m successfully \033[0m"
+ fi
+}
+
+function publishConfig() {
+ curl -X POST -H ${1} -H ${2} -d ${3} "http://${4}/openapi/v1/envs/${5}/apps/${6}/clusters/${7}/namespaces/${8}/releases" >${tempLog} 2>/dev/null
+ log=$(cat ${tempLog})
+ if [[ ${log} =~ ":401" || ${log} =~ ":403"
+ || ${log} =~ ":404" || ${log} =~ ":405"
+ || ${log} =~ ":500" || ! ${log} =~ "{" ]]; then
+ echo "\033[31m Publish fail \033[0m"
+ exit 1
+ else
+ echo "\033[32m Publish successfully, please start seata-server. \033[0m"
+ fi
+}
+
+count=0
+for line in $(cat $(dirname "$PWD")/config.txt); do
+ (( count++ ))
+ key=${line%%=*}
+ value=${line#*=}
+ body="{\"key\":\"${key}\",\"value\":\"${value}\",\"comment\":\"\",\"dataChangeCreatedBy\":\"${dataChangeCreatedBy}\"}"
+ addConfig ${contentType} ${authorization} ${body} ${portalAddr} ${env} ${appId} ${clusterName} ${namespaceName} ${key} ${value}
+done
+
+echo "========================================================================="
+echo " Complete initialization parameters, \033[32m total-count:$count \033[0m, \033[31m failure-count:$failCount \033[0m"
+echo "========================================================================="
+
+if [[ $failCount -eq 0 ]]; then
+ read -p "Publish now, y/n: " result
+ if [[ ${result} == "y" ]]; then
+ publishConfig ${contentType} ${authorization} ${publishBody} ${portalAddr} ${env} ${appId} ${clusterName} ${namespaceName}
+ else
+ echo "Remember to publish later..."
+ fi
+else
+ echo "\033[31m init apollo config fail. \033[0m"
+fi
diff --git a/script/config-center/apollo/apollo-params.txt b/script/config-center/apollo/apollo-params.txt
new file mode 100644
index 0000000000000000000000000000000000000000..1cbe73d867aaa41ee99725532b660df5f2ec1057
--- /dev/null
+++ b/script/config-center/apollo/apollo-params.txt
@@ -0,0 +1,8 @@
+portalAddr=localhost:8070
+env=DEV
+appId=seata-server
+clusterName=default
+namespaceName=application
+dataChangeCreatedBy=apollo
+releasedBy=apollo
+token=3aa026fc8435d0fc4505b345b8fa4578fb646a2c
\ No newline at end of file
diff --git a/server/src/main/resources/nacos-config.txt b/script/config-center/config.txt
similarity index 60%
rename from server/src/main/resources/nacos-config.txt
rename to script/config-center/config.txt
index 18dac9167b67c3eeeb190ee88851153f92642e70..e702ae947d69dfea306eae14955fbd8b6ac24da9 100644
--- a/server/src/main/resources/nacos-config.txt
+++ b/script/config-center/config.txt
@@ -1,6 +1,7 @@
transport.type=TCP
transport.server=NIO
transport.heartbeat=true
+transport.enable-client-batch-send-request=false
transport.thread-factory.boss-thread-prefix=NettyBoss
transport.thread-factory.worker-thread-prefix=NettyServerNIOWorker
transport.thread-factory.server-executor-thread-prefix=NettyServerBizHandler
@@ -12,18 +13,18 @@ transport.thread-factory.boss-thread-size=1
transport.thread-factory.worker-thread-size=8
transport.shutdown.wait=3
service.vgroup_mapping.my_test_tx_group=default
+service.default.grouplist=127.0.0.1:8091
service.enableDegrade=false
-service.disable=false
-service.max.commit.retry.timeout=-1
-service.max.rollback.retry.timeout=-1
-client.async.commit.buffer.limit=10000
-client.lock.retry.internal=10
-client.lock.retry.times=30
-client.lock.retry.policy.branch-rollback-on-conflict=true
-client.table.meta.check.enable=true
-client.report.retry.count=5
-client.tm.commit.retry.count=1
-client.tm.rollback.retry.count=1
+service.disableGlobalTransaction=false
+client.rm.async.commit.buffer.limit=10000
+client.rm.lock.retry.internal=10
+client.rm.lock.retry.times=30
+client.rm.report.retry.count=5
+client.rm.lock.retry.policy.branch-rollback-on-conflict=true
+client.rm.table.meta.check.enable=false
+client.rm.report.success.enable=true
+client.tm.commit.retry.count=5
+client.tm.rollback.retry.count=5
store.mode=file
store.file.dir=file_store/data
store.file.max-branch-session-size=16384
@@ -43,19 +44,22 @@ store.db.global.table=global_table
store.db.branch.table=branch_table
store.db.query-limit=100
store.db.lock-table=lock_table
-recovery.committing-retry-period=1000
-recovery.asyn-committing-retry-period=1000
-recovery.rollbacking-retry-period=1000
-recovery.timeout-retry-period=1000
-transaction.undo.data.validation=true
-transaction.undo.log.serialization=jackson
-transaction.undo.log.save.days=7
-transaction.undo.log.delete.period=86400000
-transaction.undo.log.table=undo_log
+server.recovery.committing-retry-period=1000
+server.recovery.asyn-committing-retry-period=1000
+server.recovery.rollbacking-retry-period=1000
+server.recovery.timeout-retry-period=1000
+server.max.commit.retry.timeout=-1
+server.max.rollback.retry.timeout=-1
+client.undo.data.validation=true
+client.undo.log.serialization=jackson
+server.undo.log.save.days=7
+server.undo.log.delete.period=86400000
+client.undo.log.table=undo_log
+client.log.exceptionRate=100
transport.serialization=seata
transport.compressor=none
metrics.enabled=false
metrics.registry-type=compact
metrics.exporter-list=prometheus
metrics.exporter-prometheus-port=9898
-support.spring.datasource.autoproxy=false
+client.support.spring.datasource.autoproxy=false
diff --git a/script/config-center/consul/consul-config.sh b/script/config-center/consul/consul-config.sh
new file mode 100755
index 0000000000000000000000000000000000000000..8b74cb9f8a2725525094119538cdc103d49a4135
--- /dev/null
+++ b/script/config-center/consul/consul-config.sh
@@ -0,0 +1,56 @@
+#!/usr/bin/env bash
+# Copyright 1999-2019 Seata.io Group.
+#
+# Licensed 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.
+
+if [[ $# != 1 ]]; then
+ echo "USAGE: $0 consulAddr"
+ exit 1
+fi
+consulAddr=$1
+contentType="content-type:application/json;charset=UTF-8"
+echo "Set consulAddr=$consulAddr"
+
+failCount=0
+tempLog=$(mktemp -t consul-config.log)
+function addConfig() {
+ curl -X PUT -H ${1} -d ${2} "http://$3/v1/kv/$4" >${tempLog} 2>/dev/null
+ if [[ -z $(cat ${tempLog}) ]]; then
+ echo "\033[31m Please check the cluster status. \033[0m"
+ exit 1
+ fi
+ if [[ $(cat ${tempLog}) =~ "true" ]]; then
+ echo "Set $4=$2\033[32m successfully \033[0m"
+ else
+ echo "Set $4=$2\033[31m failure \033[0m"
+ (( failCount++ ))
+ fi
+}
+
+count=0
+for line in $(cat $(dirname "$PWD")/config.txt); do
+ (( count++ ))
+ key=${line%%=*}
+ value=${line#*=}
+ addConfig ${contentType} ${value} ${consulAddr} ${key}
+done
+
+echo "========================================================================="
+echo " Complete initialization parameters, \033[32m total-count:$count \033[0m, \033[31m failure-count:$failCount \033[0m"
+echo "========================================================================="
+
+if [[ ${failCount} -eq 0 ]]; then
+ echo "\033[32m Init consul config finished, please start seata-server. \033[0m"
+else
+ echo "\033[31m Init consul config fail. \033[0m"
+fi
diff --git a/script/config-center/etcd3/etcd3-config.sh b/script/config-center/etcd3/etcd3-config.sh
new file mode 100755
index 0000000000000000000000000000000000000000..da2ff13b1d84f7b3ba1ee685fe318179a81742ad
--- /dev/null
+++ b/script/config-center/etcd3/etcd3-config.sh
@@ -0,0 +1,60 @@
+#!/usr/bin/env bash
+# Copyright 1999-2019 Seata.io Group.
+#
+# Licensed 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.
+
+# etcd REST API v3.
+
+if [[ $# != 1 ]]; then
+ echo "USAGE: $0 etcd3Addr"
+ exit 1
+fi
+etcd3Addr=$1
+contentType="content-type:application/json;charset=UTF-8"
+echo "Set etcd3Addr=$etcd3Addr"
+
+failCount=0
+tempLog=$(mktemp -t etcd-config.log)
+function addConfig() {
+ keyBase64=$(printf "%s""$2" | base64)
+ valueBase64=$(printf "%s""$3" | base64)
+ curl -X POST -H ${1} -d "{\"key\": \"$keyBase64\", \"value\": \"$valueBase64\"}" "http://$4/v3/kv/put" >${tempLog} 2>/dev/null
+ if [[ -z $(cat ${tempLog}) ]]; then
+ echo "\033[31m Please check the cluster status. \033[0m"
+ exit 1
+ fi
+ if [[ $(cat ${tempLog}) =~ "error" || $(cat ${tempLog}) =~ "code" ]]; then
+ echo "Set $2=$3\033[31m failure \033[0m"
+ (( failCount++ ))
+ else
+ echo "Set $2=$3\033[32m successfully \033[0m"
+ fi
+}
+
+count=0
+for line in $(cat $(dirname "$PWD")/config.txt); do
+ (( count++ ))
+ key=${line%%=*}
+ value=${line#*=}
+ addConfig ${contentType} ${key} ${value} ${etcd3Addr}
+done
+
+echo "========================================================================="
+echo " Complete initialization parameters, \033[32m total-count:$count \033[0m, \033[31m failure-count:$failCount \033[0m"
+echo "========================================================================="
+
+if [[ ${failCount} -eq 0 ]]; then
+ echo "\033[32m Init etcd3 config finished, please start seata-server. \033[0m"
+else
+ echo "\033[31m Init etcd3 config fail. \033[0m"
+fi
diff --git a/server/src/main/resources/nacos-config.py b/script/config-center/nacos/nacos-config.py
old mode 100755
new mode 100644
similarity index 56%
rename from server/src/main/resources/nacos-config.py
rename to script/config-center/nacos/nacos-config.py
index a6233ee690973b1c4a79a08ec8c113bd604567f9..656b40fc39548fa679e010ab79beb1f8b8508e7f
--- a/server/src/main/resources/nacos-config.py
+++ b/script/config-center/nacos/nacos-config.py
@@ -5,7 +5,7 @@ import http.client
import sys
if len(sys.argv) != 2:
- print ('python nacos-config.py nacosIp')
+ print ('python nacos-config.py nacosAddr')
exit()
headers = {
@@ -13,14 +13,18 @@ headers = {
}
hasError = False
-for line in open('nacos-config.txt'):
+for line in open('../config.txt'):
pair = line.split('=')
if len(pair) < 2:
continue
print (line),
- url_prefix = sys.argv[1] + ':8848'
+ url_prefix = sys.argv[1]
conn = http.client.HTTPConnection(url_prefix)
- url_postfix = '/nacos/v1/cs/configs?dataId={}&group=SEATA_GROUP&content={}'.format(str(pair[0]),str(line[line.index('=')+1:])).strip()
+ if len(sys.argv) == 3:
+ namespace=sys.argv[2]
+ url_postfix = '/nacos/v1/cs/configs?dataId={0}&group=SEATA_GROUP&content={1}&tenant={2}'.format(str(pair[0]),str(line[line.index('=')+1:]).strip(),namespace)
+ else:
+ url_postfix = '/nacos/v1/cs/configs?dataId={}&group=SEATA_GROUP&content={}'.format(str(pair[0]),str(line[line.index('=')+1:])).strip()
conn.request("POST", url_postfix, headers=headers)
res = conn.getresponse()
data = res.read()
diff --git a/script/config-center/nacos/nacos-config.sh b/script/config-center/nacos/nacos-config.sh
new file mode 100644
index 0000000000000000000000000000000000000000..cbf9122dc8674bedaced3409820cb74425e6106e
--- /dev/null
+++ b/script/config-center/nacos/nacos-config.sh
@@ -0,0 +1,57 @@
+#!/usr/bin/env bash
+# Copyright 1999-2019 Seata.io Group.
+#
+# Licensed 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.
+
+if [[ $# != 1 ]]; then
+ echo "USAGE: $0 nacosAddr"
+ exit 1
+fi
+
+nacosAddr=$1
+echo "set nacosAddr=$nacosAddr"
+contentType="content-type:application/json;charset=UTF-8"
+
+failCount=0
+tempLog=$(mktemp -t nacos-config.log)
+function addConfig() {
+ curl -X POST -H ${1} "http://$2/nacos/v1/cs/configs?dataId=$3&group=SEATA_GROUP&content=$4" >${tempLog} 2>/dev/null
+ if [[ -z $(cat ${tempLog}) ]]; then
+ echo "\033[31m Please check the cluster status. \033[0m"
+ exit 1
+ fi
+ if [[ $(cat ${tempLog}) =~ "true" ]]; then
+ echo "Set $3=$4\033[32m successfully \033[0m"
+ else
+ echo "Set $3=$4\033[31m failure \033[0m"
+ (( failCount++ ))
+ fi
+}
+
+count=0
+for line in $(cat $(dirname "$PWD")/config.txt); do
+ (( count++ ))
+ key=${line%%=*}
+ value=${line#*=}
+ addConfig ${contentType} ${nacosAddr} ${key} ${value}
+done
+
+echo "========================================================================="
+echo " Complete initialization parameters, \033[32m total-count:$count \033[0m, \033[31m failure-count:$failCount \033[0m"
+echo "========================================================================="
+
+if [[ ${failCount} -eq 0 ]]; then
+ echo "\033[32m Init nacos config finished, please start seata-server. \033[0m"
+else
+ echo "\033[31m init nacos config fail. \033[0m"
+fi
\ No newline at end of file
diff --git a/script/config-center/zk/zk-config.sh b/script/config-center/zk/zk-config.sh
new file mode 100755
index 0000000000000000000000000000000000000000..c66681edc97a212ae70c117b5e1dd2e085b41c72
--- /dev/null
+++ b/script/config-center/zk/zk-config.sh
@@ -0,0 +1,92 @@
+#!/usr/bin/env bash
+# Copyright 1999-2019 Seata.io Group.
+#
+# Licensed 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.
+
+
+# The purpose is to sync the local configuration(config.txt) to zk.
+# This script need to rely on zk.
+
+
+for line in $(cat zk-params.txt); do
+ key=${line%%=*}
+ value=${line#*=}
+ case ${key} in
+ zkAddr)
+ zkAddr=${value}
+ ;;
+ zkHome)
+ zkHome=${value}
+ ;;
+ *)
+ echo "Invalid parameter，please refer to zk-params.txt"
+ exit 1
+ ;;
+ esac
+done
+
+if [[ -z ${zkAddr} || -z ${zkHome} ]]; then
+ echo " \033[31m Incomplete parameters, please fill in the complete parameters: zkAddr:$zkAddr, zkHome:$zkHome \033[0m"
+ exit 1
+fi
+
+root="/seata"
+tempLog=$(mktemp -t zk-config.log)
+
+echo "ZK address is $zkAddr"
+echo "ZK home is $zkHome"
+echo "ZK config root node is $root"
+
+function check_node() {
+ $2/bin/zkCli.sh -server $1 ls ${root} >/dev/null 2>${tempLog}
+}
+
+function create_node() {
+ $2/bin/zkCli.sh -server $1 create ${root} "" >/dev/null
+}
+
+function create_subNode() {
+ $2/bin/zkCli.sh -server $1 create "${root}/$3" "$4" >/dev/null
+}
+
+function delete_node() {
+ $2/bin/zkCli.sh -server $1 rmr ${root} "" >/dev/null
+}
+
+check_node ${zkAddr} ${zkHome}
+
+if [[ $(cat ${tempLog}) =~ "No such file or directory" ]]; then
+ echo "\033[31m ZK home is error, please enter correct zk home! \033[0m"
+ exit 1
+elif [[ $(cat ${tempLog}) =~ "Exception" ]]; then
+ echo "\033[31m Exception error, please check zk cluster status or if the zk address is entered correctly! \033[0m"
+ exit 1
+elif [[ $(cat ${tempLog}) =~ "Node does not exist" ]]; then
+ create_node ${zkAddr} ${zkHome}
+else
+ read -p "${root} node already exists, now delete ${root} node in zk, y/n: " result
+ if [[ ${result} == "y" ]]; then
+ echo "Delete ${root} node..."
+ delete_node ${zkAddr} ${zkHome}
+ create_node ${zkAddr} ${zkHome}
+ else
+ exit 0
+ fi
+fi
+
+for line in $(cat $(dirname "$PWD")/config.txt); do
+ key=${line%%=*}
+ value=${line#*=}
+ echo "Set" "${key}" "=" "${value}"
+ create_subNode ${zkAddr} ${zkHome} ${key} ${value}
+done
diff --git a/script/config-center/zk/zk-params.txt b/script/config-center/zk/zk-params.txt
new file mode 100644
index 0000000000000000000000000000000000000000..8d65858ff8f30bd5a9372086e88d45c37f613c37
--- /dev/null
+++ b/script/config-center/zk/zk-params.txt
@@ -0,0 +1,2 @@
+zkAddr=localhost:2181
+zkHome=/Users/zookeeper-3.4.14
\ No newline at end of file
diff --git a/script/server/db/mysql.sql b/script/server/db/mysql.sql
new file mode 100644
index 0000000000000000000000000000000000000000..c1ae80400d00c58e78557fe780519d7b89d0b56a
--- /dev/null
+++ b/script/server/db/mysql.sql
@@ -0,0 +1,56 @@
+-- -------------------------------- The script used when storeMode is 'db' --------------------------------
+-- the table to store GlobalSession data
+CREATE TABLE IF NOT EXISTS `global_table`
+(
+ `xid` VARCHAR(128) NOT NULL,
+ `transaction_id` BIGINT,
+ `status` TINYINT NOT NULL,
+ `application_id` VARCHAR(32),
+ `transaction_service_group` VARCHAR(32),
+ `transaction_name` VARCHAR(128),
+ `timeout` INT,
+ `begin_time` BIGINT,
+ `application_data` VARCHAR(2000),
+ `gmt_create` DATETIME,
+ `gmt_modified` DATETIME,
+ PRIMARY KEY (`xid`),
+ KEY `idx_gmt_modified_status` (`gmt_modified`, `status`),
+ KEY `idx_transaction_id` (`transaction_id`)
+) ENGINE = InnoDB
+ DEFAULT CHARSET = utf8;
+
+-- the table to store BranchSession data
+CREATE TABLE IF NOT EXISTS `branch_table`
+(
+ `branch_id` BIGINT NOT NULL,
+ `xid` VARCHAR(128) NOT NULL,
+ `transaction_id` BIGINT,
+ `resource_group_id` VARCHAR(32),
+ `resource_id` VARCHAR(256),
+ `branch_type` VARCHAR(8),
+ `status` TINYINT,
+ `client_id` VARCHAR(64),
+ `application_data` VARCHAR(2000),
+ `gmt_create` DATETIME,
+ `gmt_modified` DATETIME,
+ PRIMARY KEY (`branch_id`),
+ KEY `idx_xid` (`xid`)
+) ENGINE = InnoDB
+ DEFAULT CHARSET = utf8;
+
+-- the table to store lock data
+CREATE TABLE IF NOT EXISTS `lock_table`
+(
+ `row_key` VARCHAR(128) NOT NULL,
+ `xid` VARCHAR(96),
+ `transaction_id` BIGINT,
+ `branch_id` BIGINT NOT NULL,
+ `resource_id` VARCHAR(256),
+ `table_name` VARCHAR(32),
+ `pk` VARCHAR(36),
+ `gmt_create` DATETIME,
+ `gmt_modified` DATETIME,
+ PRIMARY KEY (`row_key`),
+ KEY `idx_branch_id` (`branch_id`)
+) ENGINE = InnoDB
+ DEFAULT CHARSET = utf8;
diff --git a/script/server/db/oracle.sql b/script/server/db/oracle.sql
new file mode 100644
index 0000000000000000000000000000000000000000..16b755d6f60fa897ccb8f759c998753db0f526a8
--- /dev/null
+++ b/script/server/db/oracle.sql
@@ -0,0 +1,56 @@
+-- -------------------------------- The script used when storeMode is 'db' --------------------------------
+-- the table to store GlobalSession data
+CREATE TABLE global_table
+(
+ xid VARCHAR2(128) NOT NULL,
+ transaction_id NUMBER(19),
+ status NUMBER(3) NOT NULL,
+ application_id VARCHAR2(32),
+ transaction_service_group VARCHAR2(32),
+ transaction_name VARCHAR2(128),
+ timeout NUMBER(10),
+ begin_time NUMBER(19),
+ application_data VARCHAR2(2000),
+ gmt_create TIMESTAMP(0),
+ gmt_modified TIMESTAMP(0),
+ PRIMARY KEY (xid)
+);
+
+CREATE INDEX idx_gmt_modified_status ON global_table (gmt_modified, status);
+CREATE INDEX idx_transaction_id ON global_table (transaction_id);
+
+-- the table to store BranchSession data
+CREATE TABLE branch_table
+(
+ branch_id NUMBER(19) NOT NULL,
+ xid VARCHAR2(128) NOT NULL,
+ transaction_id NUMBER(19),
+ resource_group_id VARCHAR2(32),
+ resource_id VARCHAR2(256),
+ branch_type VARCHAR2(8),
+ status NUMBER(3),
+ client_id VARCHAR2(64),
+ application_data VARCHAR2(2000),
+ gmt_create TIMESTAMP(0),
+ gmt_modified TIMESTAMP(0),
+ PRIMARY KEY (branch_id)
+);
+
+CREATE INDEX idx_xid ON branch_table (xid);
+
+-- the table to store lock data
+CREATE TABLE lock_table
+(
+ row_key VARCHAR2(128) NOT NULL,
+ xid VARCHAR2(96),
+ transaction_id NUMBER(19),
+ branch_id NUMBER(19) NOT NULL,
+ resource_id VARCHAR2(256),
+ table_name VARCHAR2(32),
+ pk VARCHAR2(36),
+ gmt_create TIMESTAMP(0),
+ gmt_modified TIMESTAMP(0),
+ PRIMARY KEY (row_key)
+);
+
+CREATE INDEX idx_branch_id ON lock_table (branch_id);
\ No newline at end of file
diff --git a/script/server/db/postgresql.sql b/script/server/db/postgresql.sql
new file mode 100644
index 0000000000000000000000000000000000000000..03de27c4f643da9b8f97b6f3fdbd716021119b55
--- /dev/null
+++ b/script/server/db/postgresql.sql
@@ -0,0 +1,56 @@
+-- -------------------------------- The script used when storeMode is 'db' --------------------------------
+-- the table to store GlobalSession data
+CREATE TABLE IF NOT EXISTS public.global_table
+(
+ xid VARCHAR(128) NOT NULL,
+ transaction_id BIGINT,
+ status SMALLINT NOT NULL,
+ application_id VARCHAR(32),
+ transaction_service_group VARCHAR(32),
+ transaction_name VARCHAR(128),
+ timeout INT,
+ begin_time BIGINT,
+ application_data VARCHAR(2000),
+ gmt_create TIMESTAMP(0),
+ gmt_modified TIMESTAMP(0),
+ CONSTRAINT pk_global_table PRIMARY KEY (xid)
+);
+
+CREATE INDEX idx_gmt_modified_status ON public.global_table (gmt_modified, status);
+CREATE INDEX idx_transaction_id ON public.global_table (transaction_id);
+
+-- the table to store BranchSession data
+CREATE TABLE IF NOT EXISTS public.branch_table
+(
+ branch_id BIGINT NOT NULL,
+ xid VARCHAR(128) NOT NULL,
+ transaction_id BIGINT,
+ resource_group_id VARCHAR(32),
+ resource_id VARCHAR(256),
+ branch_type VARCHAR(8),
+ status SMALLINT,
+ client_id VARCHAR(64),
+ application_data VARCHAR(2000),
+ gmt_create TIMESTAMP(0),
+ gmt_modified TIMESTAMP(0),
+ CONSTRAINT pk_branch_table PRIMARY KEY (branch_id)
+);
+
+CREATE INDEX idx_xid ON public.branch_table (xid);
+
+-- the table to store lock data
+CREATE TABLE IF NOT EXISTS public.lock_table
+(
+ row_key VARCHAR(128) NOT NULL,
+ xid VARCHAR(96),
+ transaction_id BIGINT,
+ branch_id BIGINT NOT NULL,
+ resource_id VARCHAR(256),
+ table_name VARCHAR(32),
+ pk VARCHAR(36),
+ gmt_create TIMESTAMP(0),
+ gmt_modified TIMESTAMP(0),
+ CONSTRAINT pk_lock_table PRIMARY KEY (row_key)
+);
+
+CREATE INDEX idx_branch_id ON public.lock_table (branch_id);
diff --git a/script/server/docker-compose/docker-compose.yaml b/script/server/docker-compose/docker-compose.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..e1791293cc48c254cf157efc3e56ac4180a4b230
--- /dev/null
+++ b/script/server/docker-compose/docker-compose.yaml
@@ -0,0 +1,10 @@
+version: "3"
+services:
+ seata-server:
+ image: seataio/seata-server
+ hostname: seata-server
+ ports:
+ - "8091:8091"
+ environment:
+ - SEATA_PORT=8091
+ - STORE_MODE=file
\ No newline at end of file
diff --git a/script/server/helm/seata-server/.helmignore b/script/server/helm/seata-server/.helmignore
new file mode 100644
index 0000000000000000000000000000000000000000..50af0317254197a5a019f4ac2f8ecc223f93f5a7
--- /dev/null
+++ b/script/server/helm/seata-server/.helmignore
@@ -0,0 +1,22 @@
+# Patterns to ignore when building packages.
+# This supports shell glob matching, relative path matching, and
+# negation (prefixed with !). Only one pattern per line.
+.DS_Store
+# Common VCS dirs
+.git/
+.gitignore
+.bzr/
+.bzrignore
+.hg/
+.hgignore
+.svn/
+# Common backup files
+*.swp
+*.bak
+*.tmp
+*~
+# Various IDEs
+.project
+.idea/
+*.tmproj
+.vscode/
diff --git a/script/server/helm/seata-server/Chart.yaml b/script/server/helm/seata-server/Chart.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..f282fc461d9fcd6b13a57f98e98566ec032b67af
--- /dev/null
+++ b/script/server/helm/seata-server/Chart.yaml
@@ -0,0 +1,5 @@
+apiVersion: v1
+appVersion: "1.0"
+description: Seata Server
+name: seata-server
+version: 1.0.0
diff --git a/script/server/helm/seata-server/templates/NOTES.txt b/script/server/helm/seata-server/templates/NOTES.txt
new file mode 100644
index 0000000000000000000000000000000000000000..ddc7f2eb9532c5cc1b7c494c01803ae69be08e01
--- /dev/null
+++ b/script/server/helm/seata-server/templates/NOTES.txt
@@ -0,0 +1,15 @@
+1. Get the application URL by running these commands:
+{{- if contains "NodePort" .Values.service.type }}
+ export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "seata-server.fullname" . }})
+ export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
+ echo http://$NODE_IP:$NODE_PORT
+{{- else if contains "LoadBalancer" .Values.service.type }}
+ NOTE: It may take a few minutes for the LoadBalancer IP to be available.
+ You can watch the status of by running 'kubectl get --namespace {{ .Release.Namespace }} svc -w {{ include "seata-server.fullname" . }}'
+ export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ include "seata-server.fullname" . }} --template "{{"{{ range (index .status.loadBalancer.ingress 0) }}{{.}}{{ end }}"}}")
+ echo http://$SERVICE_IP:{{ .Values.service.port }}
+{{- else if contains "ClusterIP" .Values.service.type }}
+ export POD_NAME=$(kubectl get pods --namespace {{ .Release.Namespace }} -l "app.kubernetes.io/name={{ include "seata-server.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
+ echo "Visit http://127.0.0.1:8080 to use your application"
+ kubectl port-forward $POD_NAME 8080:80
+{{- end }}
diff --git a/script/server/helm/seata-server/templates/_helpers.tpl b/script/server/helm/seata-server/templates/_helpers.tpl
new file mode 100644
index 0000000000000000000000000000000000000000..7158c2c09ce284e9e3906ba3fc236efbbe513d02
--- /dev/null
+++ b/script/server/helm/seata-server/templates/_helpers.tpl
@@ -0,0 +1,56 @@
+{{/* vim: set filetype=mustache: */}}
+{{/*
+Expand the name of the chart.
+*/}}
+{{- define "seata-server.name" -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Create a default fully qualified app name.
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+If release name contains chart name it will be used as a full name.
+*/}}
+{{- define "seata-server.fullname" -}}
+{{- if .Values.fullnameOverride -}}
+{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- $name := default .Chart.Name .Values.nameOverride -}}
+{{- if contains $name .Release.Name -}}
+{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
+{{- else -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}
+
+{{/*
+Create chart name and version as used by the chart label.
+*/}}
+{{- define "seata-server.chart" -}}
+{{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" -}}
+{{- end -}}
+
+{{/*
+Common labels
+*/}}
+{{- define "seata-server.labels" -}}
+app.kubernetes.io/name: {{ include "seata-server.name" . }}
+helm.sh/chart: {{ include "seata-server.chart" . }}
+app.kubernetes.io/instance: {{ .Release.Name }}
+{{- if .Chart.AppVersion }}
+app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
+{{- end }}
+app.kubernetes.io/managed-by: {{ .Release.Service }}
+{{- end -}}
+
+{{/*
+Create the name of the service account to use
+*/}}
+{{- define "seata-server.serviceAccountName" -}}
+{{- if .Values.serviceAccount.create -}}
+ {{ default (include "seata-server.fullname" .) .Values.serviceAccount.name }}
+{{- else -}}
+ {{ default "default" .Values.serviceAccount.name }}
+{{- end -}}
+{{- end -}}
diff --git a/script/server/helm/seata-server/templates/deployment.yaml b/script/server/helm/seata-server/templates/deployment.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..71af7c2965b88cee76072091431e6ed768f02d4c
--- /dev/null
+++ b/script/server/helm/seata-server/templates/deployment.yaml
@@ -0,0 +1,71 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+{{- if .Values.namespace }}
+ namespace: {{ .Values.namespace }}
+{{- end}}
+ name: {{ include "seata-server.name" . }}
+ labels:
+{{ include "seata-server.labels" . | indent 4 }}
+spec:
+ replicas: {{ .Values.replicaCount }}
+ selector:
+ matchLabels:
+ app.kubernetes.io/name: {{ include "seata-server.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ template:
+ metadata:
+ labels:
+ app.kubernetes.io/name: {{ include "seata-server.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
+ spec:
+ containers:
+ - name: {{ .Chart.Name }}
+ image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+ imagePullPolicy: {{ .Values.image.pullPolicy }}
+ ports:
+ - name: http
+ containerPort: 8091
+ protocol: TCP
+ {{- if .Values.volume }}
+ volumeMounts:
+ {{- range .Values.volume }}
+ - name: {{ .name }}
+ mountPath: {{ .mountPath }}
+ {{- end}}
+ {{- end}}
+ {{- if .Values.env }}
+ env:
+ {{- if .Values.env.seataIp }}
+ - name: SEATA_IP
+ value: {{ .Values.env.seataIp | quote }}
+ {{- end }}
+ {{- if .Values.env.seataPort }}
+ - name: SEATA_PORT
+ value: {{ .Values.env.seataPort | quote }}
+ {{- end }}
+ {{- if .Values.env.seataEnv }}
+ - name: SEATA_ENV
+ value: {{ .Values.env.seataEnv }}
+ {{- end }}
+ {{- if .Values.env.seataConfigName }}
+ - name: SEATA_CONFIG_NAME
+ value: {{ .Values.env.seataConfigName }}
+ {{- end }}
+ {{- if .Values.env.serverNode }}
+ - name: SERVER_NODE
+ value: {{ .Values.env.serverNode | quote }}
+ {{- end }}
+ {{- if .Values.env.storeMode }}
+ - name: STORE_MODE
+ value: {{ .Values.env.storeMode }}
+ {{- end }}
+ {{- end }}
+ {{- if .Values.volume }}
+ volumes:
+ {{- range .Values.volume }}
+ - name: {{ .name }}
+ hostPath:
+ path: {{ .hostPath}}
+ {{- end}}
+ {{- end}}
\ No newline at end of file
diff --git a/script/server/helm/seata-server/templates/service.yaml b/script/server/helm/seata-server/templates/service.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..812415b233702082b828b0ac41768a075ec47afd
--- /dev/null
+++ b/script/server/helm/seata-server/templates/service.yaml
@@ -0,0 +1,16 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: {{ include "seata-server.fullname" . }}
+ labels:
+{{ include "seata-server.labels" . | indent 4 }}
+spec:
+ type: {{ .Values.service.type }}
+ ports:
+ - port: {{ .Values.service.port }}
+ targetPort: http
+ protocol: TCP
+ name: http
+ selector:
+ app.kubernetes.io/name: {{ include "seata-server.name" . }}
+ app.kubernetes.io/instance: {{ .Release.Name }}
diff --git a/script/server/helm/seata-server/templates/tests/test-connection.yaml b/script/server/helm/seata-server/templates/tests/test-connection.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..97d699037529ee945a4ae1cd6f4b0b649cd87a58
--- /dev/null
+++ b/script/server/helm/seata-server/templates/tests/test-connection.yaml
@@ -0,0 +1,15 @@
+apiVersion: v1
+kind: Pod
+metadata:
+ name: "{{ include "seata-server.fullname" . }}-test-connection"
+ labels:
+{{ include "seata-server.labels" . | indent 4 }}
+ annotations:
+ "helm.sh/hook": test-success
+spec:
+ containers:
+ - name: wget
+ image: busybox
+ command: ['wget']
+ args: ['{{ include "seata-server.fullname" . }}:{{ .Values.service.port }}']
+ restartPolicy: Never
diff --git a/script/server/helm/seata-server/values.yaml b/script/server/helm/seata-server/values.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..9e88f9af0372771e34c720e2b97b4b69dca859d4
--- /dev/null
+++ b/script/server/helm/seata-server/values.yaml
@@ -0,0 +1,17 @@
+replicaCount: 1
+
+namespace: default
+
+image:
+ repository: seataio/seata-server
+ tag: latest
+ pullPolicy: IfNotPresent
+
+service:
+ type: NodePort
+ port: 30091
+
+env:
+ seataPort: "8091"
+ storeMode: "file"
+ serverNode: "1"
\ No newline at end of file
diff --git a/script/server/kubernetes/seata-server.yaml b/script/server/kubernetes/seata-server.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..a5548ed1e0261e88aa678e733e4480fae3dd4940
--- /dev/null
+++ b/script/server/kubernetes/seata-server.yaml
@@ -0,0 +1,49 @@
+apiVersion: v1
+kind: Service
+metadata:
+ name: seata-server
+ namespace: default
+ labels:
+ k8s-app: seata-server
+spec:
+ type: NodePort
+ ports:
+ - port: 8091
+ nodePort: 30091
+ protocol: TCP
+ name: http
+ selector:
+ k8s-app: seata-server
+
+---
+
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+ name: seata-server
+ namespace: default
+ labels:
+ k8s-app: seata-server
+spec:
+ replicas: 1
+ selector:
+ matchLabels:
+ k8s-app: seata-server
+ template:
+ metadata:
+ labels:
+ k8s-app: seata-server
+ spec:
+ containers:
+ - name: seata-server
+ image: docker.io/seataio/seata-server:latest
+ imagePullPolicy: IfNotPresent
+ env:
+ - name: SEATA_PORT
+ value: "8091"
+ - name: STORE_MODE
+ value: file
+ ports:
+ - name: http
+ containerPort: 8091
+ protocol: TCP
\ No newline at end of file
diff --git a/seata-spring-boot-starter/pom.xml b/seata-spring-boot-starter/pom.xml
new file mode 100644
index 0000000000000000000000000000000000000000..d55a10ffb8f54a0e7aebd4fb14cb8faf4fb2fd9f
--- /dev/null
+++ b/seata-spring-boot-starter/pom.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 1999-2019 Seata.io Group.
+ ~
+ ~ Licensed 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.
+ -->
+<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>
+ <groupId>io.seata</groupId>
+ <artifactId>seata-parent</artifactId>
+ <version>${revision}</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>seata-spring-boot-starter</artifactId>
+ <packaging>jar</packaging>
+ <name>seata-spring-boot-starter ${project.version}</name>
+
+ <properties>
+ <spring-boot.version>1.5.22.RELEASE</spring-boot.version>
+ </properties>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>${spring-boot.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <dependencies>
+ <!--seata-->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>seata-all</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <!--spring-->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-autoconfigure</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
+ </dependency>
+ </dependencies>
+
+</project>
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/SeataAutoConfiguration.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/SeataAutoConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..9af4d71fe1fc7d9358d276119c5a3e379aa71597
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/SeataAutoConfiguration.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure;
+
+import io.seata.spring.annotation.GlobalTransactionScanner;
+import io.seata.spring.boot.autoconfigure.properties.SeataProperties;
+import io.seata.spring.boot.autoconfigure.util.SpringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.DependsOn;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@ComponentScan(basePackages = "io.seata.spring.boot.autoconfigure.properties")
+@ConditionalOnProperty(prefix = StarterConstants.SEATA_PREFIX, name = "enabled", havingValue = "true", matchIfMissing = true)
+@Configuration
+@EnableConfigurationProperties({SeataProperties.class})
+public class SeataAutoConfiguration {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SeataAutoConfiguration.class);
+ @Autowired
+ private SeataProperties seataProperties;
+
+ @Bean
+ public SpringUtils springUtils() {
+ return new SpringUtils();
+ }
+
+ @Bean
+ @DependsOn({"springUtils"})
+ @ConditionalOnMissingBean(GlobalTransactionScanner.class)
+ public GlobalTransactionScanner globalTransactionScanner() {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("Automatically configure Seata");
+ }
+ return new GlobalTransactionScanner(seataProperties.getApplicationId(), seataProperties.getTxServiceGroup());
+ }
+
+
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/StarterConstants.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/StarterConstants.java
new file mode 100644
index 0000000000000000000000000000000000000000..c6a5f7341619793638e6bf0b21eccf3e1f7dfb67
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/StarterConstants.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure;
+
+import io.seata.spring.boot.autoconfigure.properties.file.ClientProperties;
+import io.seata.spring.boot.autoconfigure.properties.file.LockProperties;
+import io.seata.spring.boot.autoconfigure.properties.file.LogProperties;
+import io.seata.spring.boot.autoconfigure.properties.file.ServiceProperties;
+import io.seata.spring.boot.autoconfigure.properties.file.ShutdownProperties;
+import io.seata.spring.boot.autoconfigure.properties.file.SpringProperties;
+import io.seata.spring.boot.autoconfigure.properties.file.SupportProperties;
+import io.seata.spring.boot.autoconfigure.properties.file.ThreadFactoryProperties;
+import io.seata.spring.boot.autoconfigure.properties.file.TransportProperties;
+import io.seata.spring.boot.autoconfigure.properties.file.UndoProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.ConfigApolloProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.ConfigConsulProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.ConfigEtcd3Properties;
+import io.seata.spring.boot.autoconfigure.properties.registry.ConfigFileProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.ConfigNacosProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.ConfigProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.ConfigZooKeeperProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.RegistryConsulProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.RegistryEtcd3Properties;
+import io.seata.spring.boot.autoconfigure.properties.registry.RegistryEurekaProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.RegistryFileProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.RegistryNacosProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.RegistryProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.RegistryRedisProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.RegistrySofaProperties;
+import io.seata.spring.boot.autoconfigure.properties.registry.RegistryZooKeeperProperties;
+
+import java.util.HashMap;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+public class StarterConstants {
+ private static final int MAP_CAPACITY = 64;
+ public static final String SEATA_PREFIX = "seata";
+ public static final String SEATA_SPRING_CLOUD_ALIBABA_PREFIX = "spring.cloud.alibaba.seata";
+ public static final String TRANSPORT_PREFIX = SEATA_PREFIX + ".transport";
+ public static final String THREAD_FACTORY_PREFIX = TRANSPORT_PREFIX + ".thread-factory";
+ public static final String SHUTDOWN_PREFIX = TRANSPORT_PREFIX + ".shutdown";
+ public static final String SERVICE_PREFIX = SEATA_PREFIX + ".service";
+ public static final String CLIENT_PREFIX = SEATA_PREFIX + ".client";
+ public static final String CLIENT_RM_PREFIX = CLIENT_PREFIX + ".rm";
+ public static final String LOCK_PREFIX = CLIENT_RM_PREFIX + ".lock";
+ public static final String UNDO_PREFIX = CLIENT_PREFIX + ".undo";
+ public static final String LOG_PREFIX = CLIENT_PREFIX + ".log";
+ public static final String SUPPORT_PREFIX = CLIENT_PREFIX + ".support";
+ public static final String SPRING_PREFIX = SUPPORT_PREFIX + ".spring";
+
+ public static final String REGISTRY_PREFIX = SEATA_PREFIX + ".registry";
+ public static final String REGISTRY_NACOS_PREFIX = REGISTRY_PREFIX + ".nacos";
+ public static final String REGISTRY_EUREKA_PREFIX = REGISTRY_PREFIX + ".eureka";
+ public static final String REGISTRY_REDIS_PREFIX = REGISTRY_PREFIX + ".redis";
+ public static final String REGISTRY_ZK_PREFIX = REGISTRY_PREFIX + ".zk";
+ public static final String REGISTRY_CONSUL_PREFIX = REGISTRY_PREFIX + ".consul";
+ public static final String REGISTRY_ETCD3_PREFIX = REGISTRY_PREFIX + ".etcd3";
+ public static final String REGISTRY_SOFA_PREFIX = REGISTRY_PREFIX + ".sofa";
+ public static final String REGISTRY_FILE_PREFIX = REGISTRY_PREFIX + ".file";
+
+ public static final String CONFIG_PREFIX = SEATA_PREFIX + ".config";
+ public static final String CONFIG_NACOS_PREFIX = CONFIG_PREFIX + ".nacos";
+ public static final String CONFIG_CONSUL_PREFIX = CONFIG_PREFIX + ".consul";
+ public static final String CONFIG_ETCD3_PREFIX = CONFIG_PREFIX + ".etcd3";
+ public static final String CONFIG_APOLLO_PREFIX = CONFIG_PREFIX + ".apollo";
+ public static final String CONFIG_ZK_PREFIX = CONFIG_PREFIX + ".zk";
+ public static final String CONFIG_FILE_PREFIX = CONFIG_PREFIX + ".file";
+
+ public static final HashMap<String, Class> PROPERTY_MAP = new HashMap<String, Class>(MAP_CAPACITY) {
+ private static final long serialVersionUID = -8902807645596274597L;
+
+ {
+ put(CLIENT_PREFIX, ClientProperties.class);
+ put(LOCK_PREFIX, LockProperties.class);
+ put(SERVICE_PREFIX, ServiceProperties.class);
+ put(SHUTDOWN_PREFIX, ShutdownProperties.class);
+ put(SPRING_PREFIX, SpringProperties.class);
+ put(SUPPORT_PREFIX, SupportProperties.class);
+ put(THREAD_FACTORY_PREFIX, ThreadFactoryProperties.class);
+ put(UNDO_PREFIX, UndoProperties.class);
+ put(LOG_PREFIX, LogProperties.class);
+ put(TRANSPORT_PREFIX, TransportProperties.class);
+ put(CONFIG_PREFIX, ConfigProperties.class);
+ put(CONFIG_FILE_PREFIX, ConfigFileProperties.class);
+ put(REGISTRY_PREFIX, RegistryProperties.class);
+ put(REGISTRY_FILE_PREFIX, RegistryFileProperties.class);
+
+ put(CONFIG_NACOS_PREFIX, ConfigNacosProperties.class);
+ put(CONFIG_CONSUL_PREFIX, ConfigConsulProperties.class);
+ put(CONFIG_ZK_PREFIX, ConfigZooKeeperProperties.class);
+ put(CONFIG_APOLLO_PREFIX, ConfigApolloProperties.class);
+ put(CONFIG_ETCD3_PREFIX, ConfigEtcd3Properties.class);
+
+ put(REGISTRY_CONSUL_PREFIX, RegistryConsulProperties.class);
+ put(REGISTRY_ETCD3_PREFIX, RegistryEtcd3Properties.class);
+ put(REGISTRY_EUREKA_PREFIX, RegistryEurekaProperties.class);
+ put(REGISTRY_NACOS_PREFIX, RegistryNacosProperties.class);
+ put(REGISTRY_REDIS_PREFIX, RegistryRedisProperties.class);
+ put(REGISTRY_SOFA_PREFIX, RegistrySofaProperties.class);
+ put(REGISTRY_ZK_PREFIX, RegistryZooKeeperProperties.class);
+ }
+
+ };
+
+
+ /**
+ * The following special keys need to be normalized.
+ */
+ public static String SPECIAL_KEY_VGROUP_MAPPING = "service.vgroup_mapping";
+ public static String NORMALIZED_KEY_VGROUP_MAPPING = "vgroupMapping";
+ public static String SPECIAL_KEY_GROUPLIST = "grouplist";
+ public static String NORMALIZED_KEY_GROUPLIST = "grouplist";
+ public static String SPECIAL_KEY_DATASOURCE_AUTOPROXY = "datasource.autoproxy";
+ public static String NORMALIZED_KEY_DATASOURCE_AUTOPROXY = "datasourceAutoproxy";
+ public static String SPECIAL_KEY_UNDO = "client.undo.";
+ public static String NORMALIZED_KEY_UNDO = "client.undo.";
+ public static String SPECIAL_KEY_CLIENT = "client.";
+ public static String NORMALIZED_KEY_CLIENT = "client.";
+ public static String SPECIAL_KEY_CLIENT_LOCK = "client.rm.lock.";
+ public static String NORMALIZED_KEY_CLIENT_LOCK = "client.rm.lock.";
+ public static String SPECIAL_KEY_TRANSPORT_THREAD_FACTORY = "transport.thread-factory.";
+ public static String NORMALIZED_KEY_TRANSPORT_THREAD_FACTORY = "transport.thread-factory.";
+
+ public static String SPECIAL_KEY_REGISTRY_ZK = "registry.zk.";
+ public static String NORMALIZED_KEY_REGISTRY_ZK = "registry.zk.";
+ public static String SPECIAL_KEY_CONFIG_ZK = "config.zk.";
+ public static String NORMALIZED_KEY_CONFIG_ZK = "config.zk.";
+ public static String SPECIAL_KEY_CONFIG_APOLLO = "config.apollo.";
+ public static String NORMALIZED_KEY_CONFIG_APOLLO = "config.apollo.";
+
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/SeataProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/SeataProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..c4d1159dfedbfcdb6918dce3b9bf8bfe9f02ddbd
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/SeataProperties.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SEATA_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = SEATA_PREFIX)
+@EnableConfigurationProperties(SpringCloudAlibabaConfiguration.class)
+public class SeataProperties {
+ /**
+ * whether enable auto configuration
+ */
+ private boolean enabled = true;
+ /**
+ * application id
+ */
+ private String applicationId;
+ /**
+ * transaction service group
+ */
+ private String txServiceGroup;
+
+ @Autowired
+ private SpringCloudAlibabaConfiguration springCloudAlibabaConfiguration;
+
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ public SeataProperties setEnabled(boolean enabled) {
+ this.enabled = enabled;
+ return this;
+ }
+
+ public String getApplicationId() {
+ if (null == applicationId) {
+ applicationId = springCloudAlibabaConfiguration.getApplicationId();
+ }
+ return applicationId;
+ }
+
+ public SeataProperties setApplicationId(String applicationId) {
+ this.applicationId = applicationId;
+ return this;
+ }
+
+ public String getTxServiceGroup() {
+ if (null == txServiceGroup) {
+ txServiceGroup = springCloudAlibabaConfiguration.getTxServiceGroup();
+ }
+ return txServiceGroup;
+ }
+
+ public SeataProperties setTxServiceGroup(String txServiceGroup) {
+ this.txServiceGroup = txServiceGroup;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/SpringCloudAlibabaConfiguration.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/SpringCloudAlibabaConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..7669121831c3c5944705a52e9fca8e56739e0ce4
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/SpringCloudAlibabaConfiguration.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties;
+
+import io.seata.spring.boot.autoconfigure.StarterConstants;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeansException;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+/**
+ * The type Spring cloud alibaba configuration.
+ *
+ * @author slievrly
+ */
+@ConfigurationProperties(prefix = StarterConstants.SEATA_SPRING_CLOUD_ALIBABA_PREFIX)
+public class SpringCloudAlibabaConfiguration implements ApplicationContextAware {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(SpringCloudAlibabaConfiguration.class);
+ private static final String SPRING_APPLICATION_NAME_KEY = "spring.application.name";
+ private static final String DEFAULT_SPRING_CLOUD_SERVICE_GROUP_POSTFIX = "-seata-service-group";
+ private String applicationId;
+ private String txServiceGroup;
+ private ApplicationContext applicationContext;
+
+ /**
+ * Gets application id.
+ *
+ * @return the application id
+ */
+ public String getApplicationId() {
+ if (null == applicationId) {
+ applicationId = applicationContext.getEnvironment().getProperty(SPRING_APPLICATION_NAME_KEY);
+ }
+ return applicationId;
+ }
+
+ /**
+ * Gets tx service group.
+ *
+ * @return the tx service group
+ */
+ public String getTxServiceGroup() {
+ if (null == txServiceGroup) {
+ String applicationId = getApplicationId();
+ if (null == applicationId) {
+ LOGGER.warn("{} is null, please set its value", SPRING_APPLICATION_NAME_KEY);
+ }
+ txServiceGroup = applicationId + DEFAULT_SPRING_CLOUD_SERVICE_GROUP_POSTFIX;
+ }
+ return txServiceGroup;
+ }
+
+ /**
+ * Sets tx service group.
+ *
+ * @param txServiceGroup the tx service group
+ */
+ public void setTxServiceGroup(String txServiceGroup) {
+ this.txServiceGroup = txServiceGroup;
+ }
+
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ this.applicationContext = applicationContext;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ClientProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ClientProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..422e9e4bd76a93a9d17bbf2081606e44c4354aa5
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ClientProperties.java
@@ -0,0 +1,88 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.file;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.CLIENT_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = CLIENT_PREFIX)
+public class ClientProperties {
+ private int rmAsyncCommitBufferLimit = 10000;
+ private int rmReportRetryCount = 5;
+ private int tmCommitRetryCount = 5;
+ private int tmRollbackRetryCount = 5;
+ private boolean rmTableMetaCheckEnable = false;
+ private boolean rmReportSuccessEnable = true;
+
+ public int getRmAsyncCommitBufferLimit() {
+ return rmAsyncCommitBufferLimit;
+ }
+
+ public ClientProperties setRmAsyncCommitBufferLimit(int rmAsyncCommitBufferLimit) {
+ this.rmAsyncCommitBufferLimit = rmAsyncCommitBufferLimit;
+ return this;
+ }
+
+ public int getRmReportRetryCount() {
+ return rmReportRetryCount;
+ }
+
+ public ClientProperties setRmReportRetryCount(int rmReportRetryCount) {
+ this.rmReportRetryCount = rmReportRetryCount;
+ return this;
+ }
+
+ public int getTmCommitRetryCount() {
+ return tmCommitRetryCount;
+ }
+
+ public ClientProperties setTmCommitRetryCount(int tmCommitRetryCount) {
+ this.tmCommitRetryCount = tmCommitRetryCount;
+ return this;
+ }
+
+ public int getTmRollbackRetryCount() {
+ return tmRollbackRetryCount;
+ }
+
+ public ClientProperties setTmRollbackRetryCount(int tmRollbackRetryCount) {
+ this.tmRollbackRetryCount = tmRollbackRetryCount;
+ return this;
+ }
+
+ public boolean isRmTableMetaCheckEnable() {
+ return rmTableMetaCheckEnable;
+ }
+
+ public ClientProperties setRmTableMetaCheckEnable(boolean rmTableMetaCheckEnable) {
+ this.rmTableMetaCheckEnable = rmTableMetaCheckEnable;
+ return this;
+ }
+
+ public boolean isRmReportSuccessEnable() {
+ return rmReportSuccessEnable;
+ }
+
+ public void setRmReportSuccessEnable(boolean rmReportSuccessEnable) {
+ this.rmReportSuccessEnable = rmReportSuccessEnable;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/LockProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/LockProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..ca35eecbe222e5c7cd931795e2808e42e45b1ecb
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/LockProperties.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.file;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.LOCK_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = LOCK_PREFIX)
+public class LockProperties {
+ private int lockRetryInterval = 10;
+ private int lockRetryTimes = 30;
+ private boolean lockRetryPolicyBranchRollbackOnConflict = true;
+
+ public int getLockRetryInterval() {
+ return lockRetryInterval;
+ }
+
+ public LockProperties setLockRetryInterval(int lockRetryInterval) {
+ this.lockRetryInterval = lockRetryInterval;
+ return this;
+ }
+
+ public int getLockRetryTimes() {
+ return lockRetryTimes;
+ }
+
+ public LockProperties setLockRetryTimes(int lockRetryTimes) {
+ this.lockRetryTimes = lockRetryTimes;
+ return this;
+ }
+
+ public boolean isLockRetryPolicyBranchRollbackOnConflict() {
+ return lockRetryPolicyBranchRollbackOnConflict;
+ }
+
+ public LockProperties setLockRetryPolicyBranchRollbackOnConflict(boolean lockRetryPolicyBranchRollbackOnConflict) {
+ this.lockRetryPolicyBranchRollbackOnConflict = lockRetryPolicyBranchRollbackOnConflict;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/LogProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/LogProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..ea68eb330703579377230d1d1730c0ac5bc646d4
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/LogProperties.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.file;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.LOG_PREFIX;
+
+/**
+ * @author jsbxyyx
+ */
+@Component
+@ConfigurationProperties(prefix = LOG_PREFIX)
+public class LogProperties {
+
+ private int exceptionRate = 100;
+
+ public int getExceptionRate() {
+ return exceptionRate;
+ }
+
+ public LogProperties setExceptionRate(int exceptionRate) {
+ this.exceptionRate = exceptionRate;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ServiceProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ServiceProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..84a7bf19629b9c4f6893ff8bd681ff82ba2b6874
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ServiceProperties.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.file;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SERVICE_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = SERVICE_PREFIX)
+public class ServiceProperties {
+ /**
+ * vgroup->rgroup
+ */
+ private String vgroupMapping = "default";
+ /**
+ * only support single node
+ */
+ private String grouplist = "127.0.0.1:8091";
+ /**
+ * degrade current not support
+ */
+ private boolean enableDegrade = false;
+ /**
+ * disable globalTransaction
+ */
+ private boolean disableGlobalTransaction = false;
+
+ public String getVgroupMapping() {
+ return vgroupMapping;
+ }
+
+ public ServiceProperties setVgroupMapping(String vgroupMapping) {
+ this.vgroupMapping = vgroupMapping;
+ return this;
+ }
+
+ public String getGrouplist() {
+ return grouplist;
+ }
+
+ public ServiceProperties setGrouplist(String grouplist) {
+ this.grouplist = grouplist;
+ return this;
+ }
+
+ public boolean isEnableDegrade() {
+ return enableDegrade;
+ }
+
+ public ServiceProperties setEnableDegrade(boolean enableDegrade) {
+ this.enableDegrade = enableDegrade;
+ return this;
+ }
+
+ public boolean isDisableGlobalTransaction() {
+ return disableGlobalTransaction;
+ }
+
+ public ServiceProperties setDisableGlobalTransaction(boolean disableGlobalTransaction) {
+ this.disableGlobalTransaction = disableGlobalTransaction;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ShutdownProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ShutdownProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..4829bb92e13ace7c1b54f26c6a7e6f942d9003d2
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ShutdownProperties.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.file;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SHUTDOWN_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = SHUTDOWN_PREFIX)
+public class ShutdownProperties {
+ /**
+ * when destroy server, wait seconds
+ */
+ private long wait = 3L;
+
+ public long getWait() {
+ return wait;
+ }
+
+ public ShutdownProperties setWait(long wait) {
+ this.wait = wait;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/SpringProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/SpringProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..777091a0dcdc738a5dc7bf4aa65a4b5f0266ffd6
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/SpringProperties.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.file;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SPRING_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = SPRING_PREFIX)
+public class SpringProperties {
+ /**
+ * auto proxy the DataSource bean
+ */
+ private boolean datasourceAutoproxy = true;
+
+ public boolean isDatasourceAutoproxy() {
+ return datasourceAutoproxy;
+ }
+
+ public SpringProperties setDatasourceAutoproxy(boolean datasourceAutoproxy) {
+ this.datasourceAutoproxy = datasourceAutoproxy;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/SupportProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/SupportProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..ad9a3d22274ff16bbb8480fa362354e145986947
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/SupportProperties.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.file;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SUPPORT_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = SUPPORT_PREFIX)
+public class SupportProperties {
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ThreadFactoryProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ThreadFactoryProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..a7c952b49d14403470878a8b68263f60e0930491
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/ThreadFactoryProperties.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.file;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.THREAD_FACTORY_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = THREAD_FACTORY_PREFIX)
+public class ThreadFactoryProperties {
+ private String bossThreadPrefix = "NettyBoss";
+ private String workerThreadPrefix = "NettyServerNIOWorker";
+ private String serverExecutorThreadPrefix = "NettyServerBizHandler";
+ private boolean shareBossWorker = false;
+ private String clientSelectorThreadPrefix = "NettyClientSelector";
+ private int clientSelectorThreadSize = 1;
+ private String clientWorkerThreadPrefix = "NettyClientWorkerThread";
+ /**
+ * netty boss thread size,will not be used for UDT
+ */
+ private int bossThreadSize = 1;
+ /**
+ * auto default pin or 8
+ */
+ private int workerThreadSize = 8;
+
+ public String getBossThreadPrefix() {
+ return bossThreadPrefix;
+ }
+
+ public ThreadFactoryProperties setBossThreadPrefix(String bossThreadPrefix) {
+ this.bossThreadPrefix = bossThreadPrefix;
+ return this;
+ }
+
+ public String getWorkerThreadPrefix() {
+ return workerThreadPrefix;
+ }
+
+ public ThreadFactoryProperties setWorkerThreadPrefix(String workerThreadPrefix) {
+ this.workerThreadPrefix = workerThreadPrefix;
+ return this;
+ }
+
+ public String getServerExecutorThreadPrefix() {
+ return serverExecutorThreadPrefix;
+ }
+
+ public ThreadFactoryProperties setServerExecutorThreadPrefix(String serverExecutorThreadPrefix) {
+ this.serverExecutorThreadPrefix = serverExecutorThreadPrefix;
+ return this;
+ }
+
+ public boolean isShareBossWorker() {
+ return shareBossWorker;
+ }
+
+ public ThreadFactoryProperties setShareBossWorker(boolean shareBossWorker) {
+ this.shareBossWorker = shareBossWorker;
+ return this;
+ }
+
+ public String getClientSelectorThreadPrefix() {
+ return clientSelectorThreadPrefix;
+ }
+
+ public ThreadFactoryProperties setClientSelectorThreadPrefix(String clientSelectorThreadPrefix) {
+ this.clientSelectorThreadPrefix = clientSelectorThreadPrefix;
+ return this;
+ }
+
+ public String getClientWorkerThreadPrefix() {
+ return clientWorkerThreadPrefix;
+ }
+
+ public ThreadFactoryProperties setClientWorkerThreadPrefix(String clientWorkerThreadPrefix) {
+ this.clientWorkerThreadPrefix = clientWorkerThreadPrefix;
+ return this;
+ }
+
+ public int getClientSelectorThreadSize() {
+ return clientSelectorThreadSize;
+ }
+
+ public ThreadFactoryProperties setClientSelectorThreadSize(int clientSelectorThreadSize) {
+ this.clientSelectorThreadSize = clientSelectorThreadSize;
+ return this;
+ }
+
+ public int getBossThreadSize() {
+ return bossThreadSize;
+ }
+
+ public ThreadFactoryProperties setBossThreadSize(int bossThreadSize) {
+ this.bossThreadSize = bossThreadSize;
+ return this;
+ }
+
+ public int getWorkerThreadSize() {
+ return workerThreadSize;
+ }
+
+ public ThreadFactoryProperties setWorkerThreadSize(int workerThreadSize) {
+ this.workerThreadSize = workerThreadSize;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/TransportProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/TransportProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..5cf962f61692c28df0ca8e4cdae017dca7c4b0a2
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/TransportProperties.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.file;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.TRANSPORT_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = TRANSPORT_PREFIX)
+public class TransportProperties {
+ /**
+ * tcp udt unix-domain-socket
+ */
+ private String type = "TCP";
+ /**
+ * NIO NATIVE
+ */
+ private String server = "NIO";
+ /**
+ * enable heartbeat
+ */
+ private boolean heartbeat = true;
+ /**
+ * serialization
+ */
+ private String serialization = "seata";
+ /**
+ * compressor
+ */
+ private String compressor = "none";
+
+ /**
+ * enable client batch send request
+ */
+ private boolean enableClientBatchSendRequest = true;
+
+ public String getType() {
+ return type;
+ }
+
+ public TransportProperties setType(String type) {
+ this.type = type;
+ return this;
+ }
+
+ public String getServer() {
+ return server;
+ }
+
+ public TransportProperties setServer(String server) {
+ this.server = server;
+ return this;
+ }
+
+ public boolean isHeartbeat() {
+ return heartbeat;
+ }
+
+ public TransportProperties setHeartbeat(boolean heartbeat) {
+ this.heartbeat = heartbeat;
+ return this;
+ }
+
+ public String getSerialization() {
+ return serialization;
+ }
+
+ public TransportProperties setSerialization(String serialization) {
+ this.serialization = serialization;
+ return this;
+ }
+
+ public String getCompressor() {
+ return compressor;
+ }
+
+ public TransportProperties setCompressor(String compressor) {
+ this.compressor = compressor;
+ return this;
+ }
+
+ public boolean isEnableClientBatchSendRequest() {
+ return enableClientBatchSendRequest;
+ }
+
+ public TransportProperties setEnableClientBatchSendRequest(boolean enableClientBatchSendRequest) {
+ this.enableClientBatchSendRequest = enableClientBatchSendRequest;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/UndoProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/UndoProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..891114ec7606344bdcb7b239036ac8b506a51f01
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/file/UndoProperties.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.file;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.core.constants.ConfigurationKeys.TRANSACTION_UNDO_LOG_DEFAULT_TABLE;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.UNDO_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = UNDO_PREFIX)
+public class UndoProperties {
+ private boolean undoDataValidation = true;
+ private String undoLogSerialization = "jackson";
+ private String undoLogTable = TRANSACTION_UNDO_LOG_DEFAULT_TABLE;
+
+ public boolean isUndoDataValidation() {
+ return undoDataValidation;
+ }
+
+ public UndoProperties setUndoDataValidation(boolean undoDataValidation) {
+ this.undoDataValidation = undoDataValidation;
+ return this;
+ }
+
+ public String getUndoLogSerialization() {
+ return undoLogSerialization;
+ }
+
+ public UndoProperties setUndoLogSerialization(String undoLogSerialization) {
+ this.undoLogSerialization = undoLogSerialization;
+ return this;
+ }
+
+ public String getUndoLogTable() {
+ return undoLogTable;
+ }
+
+ public UndoProperties setUndoLogTable(String undoLogTable) {
+ this.undoLogTable = undoLogTable;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigApolloProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigApolloProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..463bbab7e983b531890f6baa43cbacb4ce664262
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigApolloProperties.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.CONFIG_APOLLO_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = CONFIG_APOLLO_PREFIX)
+public class ConfigApolloProperties {
+ private String appId = "seata-server";
+ private String apolloMeta = "http://192.168.1.204:8801";
+
+ public String getAppId() {
+ return appId;
+ }
+
+ public ConfigApolloProperties setAppId(String appId) {
+ this.appId = appId;
+ return this;
+ }
+
+ public String getApolloMeta() {
+ return apolloMeta;
+ }
+
+ public ConfigApolloProperties setApolloMeta(String apolloMeta) {
+ this.apolloMeta = apolloMeta;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigConsulProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigConsulProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..50b8dc3b07fdce758187000d4958e0c056d4731c
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigConsulProperties.java
@@ -0,0 +1,40 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.CONFIG_CONSUL_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = CONFIG_CONSUL_PREFIX)
+public class ConfigConsulProperties {
+ private String serverAddr = "127.0.0.1:8500";
+
+ public String getServerAddr() {
+ return serverAddr;
+ }
+
+ public ConfigConsulProperties setServerAddr(String serverAddr) {
+ this.serverAddr = serverAddr;
+ return this;
+ }
+
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigEtcd3Properties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigEtcd3Properties.java
new file mode 100644
index 0000000000000000000000000000000000000000..5c72bbbfd90f846b572d1fe8a7c97d214100f27a
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigEtcd3Properties.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.CONFIG_ETCD3_PREFIX;
+
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = CONFIG_ETCD3_PREFIX)
+public class ConfigEtcd3Properties {
+ private String serverAddr = "http://localhost:2379";
+
+ public String getServerAddr() {
+ return serverAddr;
+ }
+
+ public ConfigEtcd3Properties setServerAddr(String serverAddr) {
+ this.serverAddr = serverAddr;
+ return this;
+ }
+
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigFileProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigFileProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..fd741a3e295632f635c1ed028e5b8afd88f993e6
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigFileProperties.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.CONFIG_FILE_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = CONFIG_FILE_PREFIX)
+public class ConfigFileProperties {
+ private String name = "file.conf";
+
+ public String getName() {
+ return name;
+ }
+
+ public ConfigFileProperties setName(String name) {
+ this.name = name;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigNacosProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigNacosProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..9d43ee8dfea47074ae1415eff74c49377231e6fd
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigNacosProperties.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.CONFIG_NACOS_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = CONFIG_NACOS_PREFIX)
+public class ConfigNacosProperties {
+ private String serverAddr = "localhost";
+ private String namespace = "";
+
+ public String getServerAddr() {
+ return serverAddr;
+ }
+
+ public ConfigNacosProperties setServerAddr(String serverAddr) {
+ this.serverAddr = serverAddr;
+ return this;
+ }
+
+ public String getNamespace() {
+ return namespace;
+ }
+
+ public ConfigNacosProperties setNamespace(String namespace) {
+ this.namespace = namespace;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..6ebae709584f27a468f3c8c40cef37102a1f14cc
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigProperties.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.CONFIG_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = CONFIG_PREFIX)
+public class ConfigProperties {
+ /**
+ * file, nacos, apollo, zk, consul, etcd3
+ */
+ private String type = "file";
+
+ public String getType() {
+ return type;
+ }
+
+ public ConfigProperties setType(String type) {
+ this.type = type;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigZooKeeperProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigZooKeeperProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b898d3f4fc906b26a8267e6f4ec144657892d5a
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/ConfigZooKeeperProperties.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.CONFIG_ZK_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = CONFIG_ZK_PREFIX)
+public class ConfigZooKeeperProperties {
+ private String serverAddr = "127.0.0.1:2181";
+ private long sessionTimeout = 6000L;
+ private long connectTimeout = 2000L;
+
+ public String getServerAddr() {
+ return serverAddr;
+ }
+
+ public ConfigZooKeeperProperties setServerAddr(String serverAddr) {
+ this.serverAddr = serverAddr;
+ return this;
+ }
+
+ public long getSessionTimeout() {
+ return sessionTimeout;
+ }
+
+ public ConfigZooKeeperProperties setSessionTimeout(long sessionTimeout) {
+ this.sessionTimeout = sessionTimeout;
+ return this;
+ }
+
+ public long getConnectTimeout() {
+ return connectTimeout;
+ }
+
+ public ConfigZooKeeperProperties setConnectTimeout(long connectTimeout) {
+ this.connectTimeout = connectTimeout;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryConsulProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryConsulProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..86fbe40c35c3648d81ce07d8888af929154a73fd
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryConsulProperties.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.REGISTRY_CONSUL_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = REGISTRY_CONSUL_PREFIX)
+public class RegistryConsulProperties {
+ private String cluster = "default";
+ private String serverAddr = "127.0.0.1:8500";
+
+ public String getCluster() {
+ return cluster;
+ }
+
+ public RegistryConsulProperties setCluster(String cluster) {
+ this.cluster = cluster;
+ return this;
+ }
+
+ public String getServerAddr() {
+ return serverAddr;
+ }
+
+ public RegistryConsulProperties setServerAddr(String serverAddr) {
+ this.serverAddr = serverAddr;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryEtcd3Properties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryEtcd3Properties.java
new file mode 100644
index 0000000000000000000000000000000000000000..c014c0df8aa231c389f5ef9ddebcc0a162dbfaf6
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryEtcd3Properties.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.REGISTRY_ETCD3_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = REGISTRY_ETCD3_PREFIX)
+public class RegistryEtcd3Properties {
+ private String cluster = "default";
+ private String serverAddr = "http://localhost:2379";
+
+ public String getCluster() {
+ return cluster;
+ }
+
+ public RegistryEtcd3Properties setCluster(String cluster) {
+ this.cluster = cluster;
+ return this;
+ }
+
+ public String getServerAddr() {
+ return serverAddr;
+ }
+
+ public RegistryEtcd3Properties setServerAddr(String serverAddr) {
+ this.serverAddr = serverAddr;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryEurekaProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryEurekaProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..0a500abcca5315b82787859ce5f1fb90141dbcdd
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryEurekaProperties.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.REGISTRY_EUREKA_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = REGISTRY_EUREKA_PREFIX)
+public class RegistryEurekaProperties {
+ private String serviceUrl = "http://localhost:8761/eureka";
+ private String application = "default";
+ private String weight = "1";
+
+ public String getServiceUrl() {
+ return serviceUrl;
+ }
+
+ public RegistryEurekaProperties setServiceUrl(String serviceUrl) {
+ this.serviceUrl = serviceUrl;
+ return this;
+ }
+
+ public String getApplication() {
+ return application;
+ }
+
+ public RegistryEurekaProperties setApplication(String application) {
+ this.application = application;
+ return this;
+ }
+
+ public String getWeight() {
+ return weight;
+ }
+
+ public RegistryEurekaProperties setWeight(String weight) {
+ this.weight = weight;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryFileProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryFileProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..67b799c9e4d655e4c2529fefabd2a369324744fa
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryFileProperties.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.REGISTRY_FILE_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = REGISTRY_FILE_PREFIX)
+public class RegistryFileProperties {
+ private String name = "file.conf";
+
+ public String getName() {
+ return name;
+ }
+
+ public RegistryFileProperties setName(String name) {
+ this.name = name;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryNacosProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryNacosProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..55b94bc096c3cd1745af25eabd112143d7511a91
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryNacosProperties.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.REGISTRY_NACOS_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = REGISTRY_NACOS_PREFIX)
+public class RegistryNacosProperties {
+ private String serverAddr = "localhost";
+ private String namespace = "";
+ private String cluster = "default";
+
+ public String getServerAddr() {
+ return serverAddr;
+ }
+
+ public RegistryNacosProperties setServerAddr(String serverAddr) {
+ this.serverAddr = serverAddr;
+ return this;
+ }
+
+ public String getNamespace() {
+ return namespace;
+ }
+
+ public RegistryNacosProperties setNamespace(String namespace) {
+ this.namespace = namespace;
+ return this;
+ }
+
+ public String getCluster() {
+ return cluster;
+ }
+
+ public RegistryNacosProperties setCluster(String cluster) {
+ this.cluster = cluster;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..a756b7bb59be097f004ca0752f58e12e48ca0133
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryProperties.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.REGISTRY_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = REGISTRY_PREFIX)
+public class RegistryProperties {
+ /**
+ * file, nacos, eureka, redis, zk, consul, etcd3, sofa
+ */
+ private String type = "file";
+
+ public String getType() {
+ return type;
+ }
+
+ public RegistryProperties setType(String type) {
+ this.type = type;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryRedisProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryRedisProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..16ba756cc3f60464c22b5b311d61afa9e054eb71
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryRedisProperties.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.REGISTRY_REDIS_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = REGISTRY_REDIS_PREFIX)
+public class RegistryRedisProperties {
+ private String serverAddr = "localhost:6379";
+ private String db = "0";
+
+ public String getServerAddr() {
+ return serverAddr;
+ }
+
+ public RegistryRedisProperties setServerAddr(String serverAddr) {
+ this.serverAddr = serverAddr;
+ return this;
+ }
+
+ public String getDb() {
+ return db;
+ }
+
+ public RegistryRedisProperties setDb(String db) {
+ this.db = db;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistrySofaProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistrySofaProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..11a07936ca664ddc0c977576518b7f6a75e962ee
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistrySofaProperties.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.REGISTRY_SOFA_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = REGISTRY_SOFA_PREFIX)
+public class RegistrySofaProperties {
+ private String serverAddr = "127.0.0.1:9603";
+ private String application = "default";
+ private String region = "DEFAULT_ZONE";
+ private String datacenter = "DefaultDataCenter";
+ private String cluster = "default";
+ private String group = "SEATA_GROUP";
+ private String addressWaitTime = "3000";
+
+ public String getServerAddr() {
+ return serverAddr;
+ }
+
+ public RegistrySofaProperties setServerAddr(String serverAddr) {
+ this.serverAddr = serverAddr;
+ return this;
+ }
+
+ public String getApplication() {
+ return application;
+ }
+
+ public RegistrySofaProperties setApplication(String application) {
+ this.application = application;
+ return this;
+ }
+
+ public String getRegion() {
+ return region;
+ }
+
+ public RegistrySofaProperties setRegion(String region) {
+ this.region = region;
+ return this;
+ }
+
+ public String getDatacenter() {
+ return datacenter;
+ }
+
+ public RegistrySofaProperties setDatacenter(String datacenter) {
+ this.datacenter = datacenter;
+ return this;
+ }
+
+ public String getCluster() {
+ return cluster;
+ }
+
+ public RegistrySofaProperties setCluster(String cluster) {
+ this.cluster = cluster;
+ return this;
+ }
+
+ public String getGroup() {
+ return group;
+ }
+
+ public RegistrySofaProperties setGroup(String group) {
+ this.group = group;
+ return this;
+ }
+
+ public String getAddressWaitTime() {
+ return addressWaitTime;
+ }
+
+ public RegistrySofaProperties setAddressWaitTime(String addressWaitTime) {
+ this.addressWaitTime = addressWaitTime;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryZooKeeperProperties.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryZooKeeperProperties.java
new file mode 100644
index 0000000000000000000000000000000000000000..22ca0d3d89b05dc61a14c3c671e53528d87c1acb
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/properties/registry/RegistryZooKeeperProperties.java
@@ -0,0 +1,69 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.properties.registry;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.REGISTRY_ZK_PREFIX;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+@Component
+@ConfigurationProperties(prefix = REGISTRY_ZK_PREFIX)
+public class RegistryZooKeeperProperties {
+ private String cluster = "default";
+ private String serverAddr = "127.0.0.1:2181";
+ private long sessionTimeout = 6000L;
+ private long connectTimeout = 2000L;
+
+ public String getCluster() {
+ return cluster;
+ }
+
+ public RegistryZooKeeperProperties setCluster(String cluster) {
+ this.cluster = cluster;
+ return this;
+ }
+
+ public String getServerAddr() {
+ return serverAddr;
+ }
+
+ public RegistryZooKeeperProperties setServerAddr(String serverAddr) {
+ this.serverAddr = serverAddr;
+ return this;
+ }
+
+ public long getSessionTimeout() {
+ return sessionTimeout;
+ }
+
+ public RegistryZooKeeperProperties setSessionTimeout(long sessionTimeout) {
+ this.sessionTimeout = sessionTimeout;
+ return this;
+ }
+
+ public long getConnectTimeout() {
+ return connectTimeout;
+ }
+
+ public RegistryZooKeeperProperties setConnectTimeout(long connectTimeout) {
+ this.connectTimeout = connectTimeout;
+ return this;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
new file mode 100644
index 0000000000000000000000000000000000000000..22445beebbe1f6d3872f73de02c2743f5a314870
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/provider/SpringBootConfigurationProvider.java
@@ -0,0 +1,199 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.provider;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Stream;
+
+import io.seata.config.Configuration;
+import io.seata.config.ExtConfigurationProvider;
+import io.seata.spring.boot.autoconfigure.StarterConstants;
+import io.seata.spring.boot.autoconfigure.util.SpringUtils;
+import io.seata.spring.boot.autoconfigure.util.StringFormatUtils;
+import org.apache.commons.lang.StringUtils;
+import org.springframework.cglib.proxy.Enhancer;
+import org.springframework.cglib.proxy.MethodInterceptor;
+import org.springframework.cglib.proxy.MethodProxy;
+
+import static io.seata.spring.boot.autoconfigure.StarterConstants.NORMALIZED_KEY_CLIENT;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.NORMALIZED_KEY_CLIENT_LOCK;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.NORMALIZED_KEY_CONFIG_APOLLO;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.NORMALIZED_KEY_CONFIG_ZK;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.NORMALIZED_KEY_DATASOURCE_AUTOPROXY;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.NORMALIZED_KEY_GROUPLIST;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.NORMALIZED_KEY_REGISTRY_ZK;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.NORMALIZED_KEY_UNDO;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.NORMALIZED_KEY_TRANSPORT_THREAD_FACTORY;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.NORMALIZED_KEY_VGROUP_MAPPING;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.PROPERTY_MAP;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SPECIAL_KEY_CLIENT;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SPECIAL_KEY_CLIENT_LOCK;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SPECIAL_KEY_CONFIG_APOLLO;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SPECIAL_KEY_CONFIG_ZK;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SPECIAL_KEY_DATASOURCE_AUTOPROXY;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SPECIAL_KEY_GROUPLIST;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SPECIAL_KEY_REGISTRY_ZK;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SPECIAL_KEY_UNDO;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SPECIAL_KEY_TRANSPORT_THREAD_FACTORY;
+import static io.seata.spring.boot.autoconfigure.StarterConstants.SPECIAL_KEY_VGROUP_MAPPING;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+public class SpringBootConfigurationProvider implements ExtConfigurationProvider {
+ private static final String INTERCEPT_METHOD_PREFIX = "get";
+
+ @Override
+ public Configuration provide(Configuration originalConfiguration) {
+ return (Configuration)Enhancer.create(originalConfiguration.getClass(), new MethodInterceptor() {
+ @Override
+ public Object intercept(Object proxy, Method method, Object[] args, MethodProxy methodProxy)
+ throws Throwable {
+ if (method.getName().startsWith(INTERCEPT_METHOD_PREFIX) && args.length > 0) {
+ Object result = null;
+ String rawDataId = (String)args[0];
+ if (args.length == 1) {
+ result = get(convertDataId(rawDataId));
+ } else if (args.length == 2) {
+ result = get(convertDataId(rawDataId), args[1]);
+ } else if (args.length == 3) {
+ result = get(convertDataId(rawDataId), args[1], (Long)args[2]);
+ }
+ if (null != result) {
+ return result;
+ }
+
+ }
+
+ return method.invoke(originalConfiguration, args);
+ }
+ });
+ }
+
+ private Object get(String dataId, Object defaultValue, long timeoutMills) throws IllegalAccessException {
+ return get(dataId, defaultValue);
+
+ }
+
+ private Object get(String dataId, Object defaultValue) throws IllegalAccessException {
+ Object result = get(dataId);
+ if (null == result) {
+ return defaultValue;
+ }
+ return result;
+ }
+
+ private Object get(String dataId) throws IllegalAccessException {
+ String propertySuffix = getPropertySuffix(dataId);
+ Class propertyClass = getPropertyClass(getPropertyPrefix(dataId));
+ if (null != propertyClass) {
+ Object propertyObject = SpringUtils.getBean(propertyClass);
+ Optional<Field> fieldOptional = Stream.of(propertyObject.getClass().getDeclaredFields()).filter(
+ f -> f.getName().equalsIgnoreCase(propertySuffix)).findAny();
+ if (fieldOptional.isPresent()) {
+ Field field = fieldOptional.get();
+ field.setAccessible(true);
+ return field.get(propertyObject);
+ }
+ }
+ return null;
+ }
+
+ /**
+ * convert data id
+ *
+ * @param rawDataId
+ * @return dataId
+ */
+ private String convertDataId(String rawDataId) {
+ if (rawDataId.startsWith(SPECIAL_KEY_VGROUP_MAPPING)) {
+ return StarterConstants.SERVICE_PREFIX + "." + NORMALIZED_KEY_VGROUP_MAPPING;
+ }
+ if (rawDataId.endsWith(SPECIAL_KEY_GROUPLIST)) {
+ return StarterConstants.SERVICE_PREFIX + "." + NORMALIZED_KEY_GROUPLIST;
+ }
+ if (rawDataId.endsWith(SPECIAL_KEY_DATASOURCE_AUTOPROXY)) {
+ return StarterConstants.SPRING_PREFIX + "." + NORMALIZED_KEY_DATASOURCE_AUTOPROXY;
+ }
+ if (rawDataId.startsWith(SPECIAL_KEY_UNDO)) {
+ String suffix = StringUtils.removeStart(rawDataId, NORMALIZED_KEY_UNDO);
+ return StarterConstants.UNDO_PREFIX + "." + StringFormatUtils.dotToCamel(suffix);
+ }
+ if (rawDataId.startsWith(SPECIAL_KEY_CLIENT_LOCK)) {
+ String suffix = StringUtils.removeStart(rawDataId, NORMALIZED_KEY_CLIENT_LOCK);
+ return StarterConstants.LOCK_PREFIX + "." + StringFormatUtils.minusToCamel(
+ StringFormatUtils.dotToCamel(suffix));
+ }
+ if (rawDataId.startsWith(SPECIAL_KEY_CLIENT)) {
+ String suffix = StringUtils.removeStart(rawDataId, NORMALIZED_KEY_CLIENT);
+ return StarterConstants.CLIENT_PREFIX + "." + StringFormatUtils.dotToCamel(suffix);
+ }
+ if (rawDataId.startsWith(SPECIAL_KEY_TRANSPORT_THREAD_FACTORY)) {
+ String suffix = StringUtils.removeStart(rawDataId, NORMALIZED_KEY_TRANSPORT_THREAD_FACTORY);
+ return StarterConstants.THREAD_FACTORY_PREFIX + "." + StringFormatUtils.minusToCamel(suffix);
+ }
+ if (rawDataId.startsWith(SPECIAL_KEY_REGISTRY_ZK)) {
+ String suffix = StringUtils.removeStart(rawDataId, NORMALIZED_KEY_REGISTRY_ZK);
+ return StarterConstants.REGISTRY_ZK_PREFIX + "." + StringFormatUtils.dotToCamel(suffix);
+ }
+ if (rawDataId.startsWith(SPECIAL_KEY_CONFIG_ZK)) {
+ String suffix = StringUtils.removeStart(rawDataId, NORMALIZED_KEY_CONFIG_ZK);
+ return StarterConstants.CONFIG_ZK_PREFIX + "." + StringFormatUtils.dotToCamel(suffix);
+ }
+ if (rawDataId.startsWith(SPECIAL_KEY_CONFIG_APOLLO)) {
+ String suffix = StringUtils.removeStart(rawDataId, NORMALIZED_KEY_CONFIG_APOLLO);
+ return StarterConstants.CONFIG_APOLLO_PREFIX + "." + StringFormatUtils.dotToCamel(suffix);
+ }
+
+ return StarterConstants.SEATA_PREFIX + "." + rawDataId;
+ }
+
+ /**
+ * Get property prefix
+ *
+ * @param dataId
+ * @return propertyPrefix
+ */
+ private String getPropertyPrefix(String dataId) {
+ return StringFormatUtils.underlineToCamel(
+ StringFormatUtils.minusToCamel(StringUtils.substringBeforeLast(dataId, ".")));
+ }
+
+ /**
+ * Get property suffix
+ *
+ * @param dataId
+ * @return propertySuffix
+ */
+ private String getPropertySuffix(String dataId) {
+ return StringUtils.substringAfterLast(dataId, ".");
+ }
+
+ /**
+ * Get property class
+ *
+ * @param propertyPrefix
+ * @return propertyClass
+ */
+ private Class getPropertyClass(String propertyPrefix) {
+ Optional<Map.Entry<String, Class>> entry = PROPERTY_MAP.entrySet().stream().filter(
+ e -> propertyPrefix.equals(e.getKey())).findAny();
+ return entry.map(Map.Entry::getValue).orElse(null);
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/util/SpringUtils.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/util/SpringUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..e5a543010205f920494593aac26d4d74df1edffb
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/util/SpringUtils.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.util;
+
+import org.springframework.beans.BeansException;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+public class SpringUtils implements ApplicationContextAware {
+
+ private static ApplicationContext applicationContext;
+
+ /**
+ * get applicationContext
+ *
+ * @return applicationContext
+ */
+ public static ApplicationContext getApplicationContext() {
+ return applicationContext;
+ }
+
+ /**
+ * get by name
+ *
+ * @param name
+ * @return bean
+ */
+ public static Object getBean(String name) {
+ return getApplicationContext().getBean(name);
+ }
+
+ /**
+ * get by class
+ *
+ * @param clazz
+ * @param <T>
+ * @return bean
+ */
+ public static <T> T getBean(Class<T> clazz) {
+ return getApplicationContext().getBean(clazz);
+ }
+
+ /**
+ * get by name & class
+ *
+ * @param name
+ * @param clazz
+ * @param <T>
+ * @return bean
+ */
+ public static <T> T getBean(String name, Class<T> clazz) {
+ return getApplicationContext().getBean(name, clazz);
+ }
+
+ @Override
+ public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
+ SpringUtils.applicationContext = applicationContext;
+ }
+}
diff --git a/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/util/StringFormatUtils.java b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/util/StringFormatUtils.java
new file mode 100644
index 0000000000000000000000000000000000000000..aa096ce00e75f6578e972afdf3328a19140600cc
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/java/io/seata/spring/boot/autoconfigure/util/StringFormatUtils.java
@@ -0,0 +1,107 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.spring.boot.autoconfigure.util;
+
+/**
+ * @author xingfudeshi@gmail.com
+ */
+public class StringFormatUtils {
+ private static final char MINUS = '-';
+ private static final char UNDERLINE = '_';
+ private static final char DOT = '.';
+
+ /**
+ * camelTo underline format
+ *
+ * @param param
+ * @return formatted string
+ */
+ public static String camelToUnderline(String param) {
+ if (param == null || "".equals(param.trim())) {
+ return "";
+ }
+ int len = param.length();
+ StringBuilder sb = new StringBuilder(len);
+ for (int i = 0; i < len; i++) {
+ char c = param.charAt(i);
+ if (Character.isUpperCase(c)) {
+ sb.append(UNDERLINE);
+ sb.append(Character.toLowerCase(c));
+ } else {
+ sb.append(c);
+ }
+ }
+ return sb.toString();
+ }
+
+ /**
+ * underline to camel
+ *
+ * @param param
+ * @return formatted string
+ */
+ public static String underlineToCamel(String param) {
+ return formatCamel(param, UNDERLINE);
+ }
+
+ /**
+ * minus to camel
+ *
+ * @param param
+ * @return formatted string
+ */
+ public static String minusToCamel(String param) {
+ return formatCamel(param, MINUS);
+ }
+
+ /**
+ * dot to camel
+ *
+ * @param param
+ * @return formatted string
+ */
+ public static String dotToCamel(String param) {
+ return formatCamel(param, DOT);
+ }
+
+ /**
+ * format camel
+ *
+ * @param param
+ * @param sign
+ * @return formatted string
+ */
+ private static String formatCamel(String param, char sign) {
+ if (param == null || "".equals(param.trim())) {
+ return "";
+ }
+ int len = param.length();
+ StringBuilder sb = new StringBuilder(len);
+ for (int i = 0; i < len; i++) {
+ char c = param.charAt(i);
+ if (c == sign) {
+ if (++i < len) {
+ sb.append(Character.toUpperCase(param.charAt(i)));
+ }
+ } else {
+ sb.append(c);
+ }
+ }
+ return sb.toString();
+ }
+
+
+}
diff --git a/seata-spring-boot-starter/src/main/resources/META-INF/services/io.seata.config.ExtConfigurationProvider b/seata-spring-boot-starter/src/main/resources/META-INF/services/io.seata.config.ExtConfigurationProvider
new file mode 100644
index 0000000000000000000000000000000000000000..8ee3b2b4f45cc7b5fbba80b127ebeae8c8a95013
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/resources/META-INF/services/io.seata.config.ExtConfigurationProvider
@@ -0,0 +1 @@
+io.seata.spring.boot.autoconfigure.provider.SpringBootConfigurationProvider
\ No newline at end of file
diff --git a/seata-spring-boot-starter/src/main/resources/META-INF/spring.factories b/seata-spring-boot-starter/src/main/resources/META-INF/spring.factories
new file mode 100644
index 0000000000000000000000000000000000000000..f38b1880a78f1d182c5b858edc819c4e9840589d
--- /dev/null
+++ b/seata-spring-boot-starter/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+# Auto Configure
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=io.seata.spring.boot.autoconfigure.SeataAutoConfiguration
diff --git a/server/pom.xml b/server/pom.xml
index 936f7c9faf6721bdc36f67eebbb616dfb6e80a95..f1082106f044e7439c830993600b62903befd628 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -49,6 +49,11 @@
<artifactId>seata-codec-all</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>seata-compressor-all</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>${project.groupId}</groupId>
@@ -109,6 +114,7 @@
<windows>.bat</windows>
</binFileExtensions>
<assembleDirectory>../distribution</assembleDirectory>
+ <logsDirectory>logs</logsDirectory>
<programs>
<program>
<mainClass>io.seata.server.Server</mainClass>
@@ -125,27 +131,16 @@
<extraArgument>-XX:MaxMetaspaceSize=256m</extraArgument>
<extraArgument>-XX:MaxDirectMemorySize=1024m</extraArgument>
<extraArgument>-XX:-OmitStackTraceInFastThrow</extraArgument>
- <extraArgument>-XX:+AggressiveOpts</extraArgument>
- <extraArgument>-XX:+UseFastAccessorMethods</extraArgument>
<extraArgument>-XX:-UseAdaptiveSizePolicy</extraArgument>
<extraArgument>-XX:+HeapDumpOnOutOfMemoryError</extraArgument>
- <extraArgument>-XX:HeapDumpPath=${BASEDIR}/logs/java_heapdump.hprof</extraArgument>
+ <extraArgument>-XX:HeapDumpPath=@BASEDIR@/logs/java_heapdump.hprof</extraArgument>
<!--gc-->
<extraArgument>-XX:+DisableExplicitGC</extraArgument>
- <extraArgument>-XX:+UseParNewGC</extraArgument>
- <extraArgument>-XX:+UseConcMarkSweepGC</extraArgument>
<extraArgument>-XX:+CMSParallelRemarkEnabled</extraArgument>
- <extraArgument>-XX:+UseCMSCompactAtFullCollection</extraArgument>
<extraArgument>-XX:+UseCMSInitiatingOccupancyOnly</extraArgument>
<extraArgument>-XX:CMSInitiatingOccupancyFraction=75</extraArgument>
- <extraArgument>-Xloggc:${BASEDIR}/logs/seata_gc.log</extraArgument>
+ <extraArgument>-Xloggc:@BASEDIR@/logs/seata_gc.log</extraArgument>
<extraArgument>-verbose:gc</extraArgument>
- <extraArgument>-XX:+PrintGCDetails</extraArgument>
- <extraArgument>-XX:+PrintGCDateStamps</extraArgument>
- <extraArgument>-XX:+PrintGCTimeStamps</extraArgument>
- <extraArgument>-XX:+UseGCLogFileRotation</extraArgument>
- <extraArgument>-XX:NumberOfGCLogFiles=10</extraArgument>
- <extraArgument>-XX:GCLogFileSize=100M</extraArgument>
<!--netty-->
<extraArgument>-Dio.netty.leakDetectionLevel=advanced</extraArgument>
</extraArguments>
@@ -158,6 +153,71 @@
</programs>
</configuration>
</plugin>
+ <plugin>
+ <groupId>com.google.cloud.tools</groupId>
+ <artifactId>jib-maven-plugin</artifactId>
+ <version>1.7.0</version>
+ <configuration>
+ <from>
+ <image>${IMAGE_NAME}</image>
+ </from>
+ <to>
+ <image>docker.io/seataio/seata-server</image>
+ <tags>
+ ${image.tags}
+ </tags>
+ <auth>
+ <username>${REGISTRY_USERNAME}</username>
+ <password>${REGISTRY_PASSWORD}</password>
+ </auth>
+ </to>
+ <container>
+ <appRoot>/seata-server</appRoot>
+ <workingDirectory>/seata-server</workingDirectory>
+ <mainClass>io.seata.server.Server</mainClass>
+ <ports>
+ <port>8091</port>
+ </ports>
+ <jvmFlags>
+ <jvmFlag>-Djava.security.egd=file:/dev/./urandom</jvmFlag>
+ <jvmFlag>-server</jvmFlag>
+ <jvmFlag>-Xss512k</jvmFlag>
+ <jvmFlag>-XX:+UnlockExperimentalVMOptions</jvmFlag>
+ <jvmFlag>-XX:+UseContainerSupport</jvmFlag>
+ <jvmFlag>-XX:SurvivorRatio=10</jvmFlag>
+ <jvmFlag>-XX:MetaspaceSize=128m</jvmFlag>
+ <jvmFlag>-XX:MaxMetaspaceSize=256m</jvmFlag>
+ <jvmFlag>-XX:MaxDirectMemorySize=1024m</jvmFlag>
+ <jvmFlag>-XX:-OmitStackTraceInFastThrow</jvmFlag>
+ <jvmFlag>-XX:-UseAdaptiveSizePolicy</jvmFlag>
+ <jvmFlag>-XX:+HeapDumpOnOutOfMemoryError</jvmFlag>
+ <jvmFlag>-XX:HeapDumpPath=/var/log/seata_heapdump.hprof</jvmFlag>
+ <!--gc-->
+ <jvmFlag>-XX:+DisableExplicitGC</jvmFlag>
+ <jvmFlag>-XX:+CMSParallelRemarkEnabled</jvmFlag>
+ <jvmFlag>-XX:+UseCMSInitiatingOccupancyOnly</jvmFlag>
+ <jvmFlag>-XX:CMSInitiatingOccupancyFraction=75</jvmFlag>
+ <jvmFlag>-Xloggc:/var/log/seata_gc.log</jvmFlag>
+ <jvmFlag>-verbose:gc</jvmFlag>
+ <!--netty-->
+ <jvmFlag>-Dio.netty.leakDetectionLevel=advanced</jvmFlag>
+ </jvmFlags>
+ <labels>
+ <name>seata-server</name>
+ </labels>
+ <creationTime>USE_CURRENT_TIMESTAMP</creationTime>
+ </container>
+ <skip>${image.publish.skip}</skip>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>build</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
diff --git a/server/src/main/java/io/seata/server/AbstractTCInboundHandler.java b/server/src/main/java/io/seata/server/AbstractTCInboundHandler.java
index 05b6fcb9e4af8fa80fe6dc32eeb85117fd582e03..a4275722f03473783df1001f8424d006eeee0fff 100644
--- a/server/src/main/java/io/seata/server/AbstractTCInboundHandler.java
+++ b/server/src/main/java/io/seata/server/AbstractTCInboundHandler.java
@@ -15,7 +15,6 @@
*/
package io.seata.server;
-import io.seata.common.exception.DataAccessException;
import io.seata.common.exception.StoreException;
import io.seata.core.exception.AbstractExceptionHandler;
import io.seata.core.exception.TransactionException;
@@ -59,7 +58,8 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
doGlobalBegin(request, response, rpcContext);
} catch (StoreException e) {
throw new TransactionException(TransactionExceptionCode.FailedStore,
- String.format("begin global request failed. xid=%s, msg=%s", response.getXid(), e.getMessage()));
+ String.format("begin global request failed. xid=%s, msg=%s", response.getXid(), e.getMessage()),
+ e);
}
}
}, request, response);
@@ -75,7 +75,7 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
* @throws TransactionException the transaction exception
*/
protected abstract void doGlobalBegin(GlobalBeginRequest request, GlobalBeginResponse response,
- RpcContext rpcContext) throws TransactionException;
+ RpcContext rpcContext) throws TransactionException;
@Override
public GlobalCommitResponse handle(GlobalCommitRequest request, final RpcContext rpcContext) {
@@ -88,7 +88,8 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
doGlobalCommit(request, response, rpcContext);
} catch (StoreException e) {
throw new TransactionException(TransactionExceptionCode.FailedStore,
- String.format("global commit request failed. xid=%s, msg=%s", request.getXid(), e.getMessage()));
+ String.format("global commit request failed. xid=%s, msg=%s", request.getXid(), e.getMessage()),
+ e);
}
}
}, request, response);
@@ -104,7 +105,7 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
* @throws TransactionException the transaction exception
*/
protected abstract void doGlobalCommit(GlobalCommitRequest request, GlobalCommitResponse response,
- RpcContext rpcContext) throws TransactionException;
+ RpcContext rpcContext) throws TransactionException;
@Override
public GlobalRollbackResponse handle(GlobalRollbackRequest request, final RpcContext rpcContext) {
@@ -116,17 +117,17 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
try {
doGlobalRollback(request, response, rpcContext);
} catch (StoreException e) {
- throw new TransactionException(TransactionExceptionCode.FailedStore,
- String.format("global rollback request failed. xid=%s, msg=%s", request.getXid(), e.getMessage()));
+ throw new TransactionException(TransactionExceptionCode.FailedStore, String
+ .format("global rollback request failed. xid=%s, msg=%s", request.getXid(), e.getMessage()), e);
}
}
@Override
public void onTransactionException(GlobalRollbackRequest request, GlobalRollbackResponse response,
- TransactionException tex) {
+ TransactionException tex) {
super.onTransactionException(request, response, tex);
// may be appears StoreException outer layer method catch
- GlobalSession globalSession = SessionHolder.findGlobalSession(request.getXid());
+ GlobalSession globalSession = SessionHolder.findGlobalSession(request.getXid(), false);
if (globalSession != null) {
response.setGlobalStatus(globalSession.getStatus());
} else {
@@ -138,7 +139,7 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
public void onException(GlobalRollbackRequest request, GlobalRollbackResponse response, Exception rex) {
super.onException(request, response, rex);
// may be appears StoreException outer layer method catch
- GlobalSession globalSession = SessionHolder.findGlobalSession(request.getXid());
+ GlobalSession globalSession = SessionHolder.findGlobalSession(request.getXid(), false);
if (globalSession != null) {
response.setGlobalStatus(globalSession.getStatus());
} else {
@@ -158,7 +159,7 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
* @throws TransactionException the transaction exception
*/
protected abstract void doGlobalRollback(GlobalRollbackRequest request, GlobalRollbackResponse response,
- RpcContext rpcContext) throws TransactionException;
+ RpcContext rpcContext) throws TransactionException;
@Override
public BranchRegisterResponse handle(BranchRegisterRequest request, final RpcContext rpcContext) {
@@ -170,8 +171,8 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
try {
doBranchRegister(request, response, rpcContext);
} catch (StoreException e) {
- throw new TransactionException(TransactionExceptionCode.FailedStore,
- String.format("branch register request failed. xid=%s, msg=%s", request.getXid(), e.getMessage()));
+ throw new TransactionException(TransactionExceptionCode.FailedStore, String
+ .format("branch register request failed. xid=%s, msg=%s", request.getXid(), e.getMessage()), e);
}
}
}, request, response);
@@ -187,7 +188,7 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
* @throws TransactionException the transaction exception
*/
protected abstract void doBranchRegister(BranchRegisterRequest request, BranchRegisterResponse response,
- RpcContext rpcContext) throws TransactionException;
+ RpcContext rpcContext) throws TransactionException;
@Override
public BranchReportResponse handle(BranchReportRequest request, final RpcContext rpcContext) {
@@ -199,9 +200,9 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
try {
doBranchReport(request, response, rpcContext);
} catch (StoreException e) {
- throw new TransactionException(TransactionExceptionCode.FailedStore,
- String.format("branch report request failed. xid=%s, branchId=%s, msg=%s",
- request.getXid(), request.getBranchId(), e.getMessage()));
+ throw new TransactionException(TransactionExceptionCode.FailedStore, String
+ .format("branch report request failed. xid=%s, branchId=%s, msg=%s", request.getXid(),
+ request.getBranchId(), e.getMessage()), e);
}
}
}, request, response);
@@ -216,8 +217,7 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
* @throws TransactionException the transaction exception
*/
protected abstract void doBranchReport(BranchReportRequest request, BranchReportResponse response,
- RpcContext rpcContext)
- throws TransactionException;
+ RpcContext rpcContext) throws TransactionException;
@Override
public GlobalLockQueryResponse handle(GlobalLockQueryRequest request, final RpcContext rpcContext) {
@@ -229,8 +229,9 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
try {
doLockCheck(request, response, rpcContext);
} catch (StoreException e) {
- throw new TransactionException(TransactionExceptionCode.FailedStore,
- String.format("global lock query request failed. xid=%s, msg=%s", request.getXid(), e.getMessage()));
+ throw new TransactionException(TransactionExceptionCode.FailedStore, String
+ .format("global lock query request failed. xid=%s, msg=%s", request.getXid(), e.getMessage()),
+ e);
}
}
}, request, response);
@@ -246,7 +247,7 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
* @throws TransactionException the transaction exception
*/
protected abstract void doLockCheck(GlobalLockQueryRequest request, GlobalLockQueryResponse response,
- RpcContext rpcContext) throws TransactionException;
+ RpcContext rpcContext) throws TransactionException;
@Override
public GlobalStatusResponse handle(GlobalStatusRequest request, final RpcContext rpcContext) {
@@ -259,7 +260,8 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
doGlobalStatus(request, response, rpcContext);
} catch (StoreException e) {
throw new TransactionException(TransactionExceptionCode.FailedStore,
- String.format("global status request failed. xid=%s, msg=%s", request.getXid(), e.getMessage()));
+ String.format("global status request failed. xid=%s, msg=%s", request.getXid(), e.getMessage()),
+ e);
}
}
}, request, response);
@@ -275,7 +277,7 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
* @throws TransactionException the transaction exception
*/
protected abstract void doGlobalStatus(GlobalStatusRequest request, GlobalStatusResponse response,
- RpcContext rpcContext) throws TransactionException;
+ RpcContext rpcContext) throws TransactionException;
@Override
public GlobalReportResponse handle(GlobalReportRequest request, final RpcContext rpcContext) {
@@ -283,7 +285,7 @@ public abstract class AbstractTCInboundHandler extends AbstractExceptionHandler
exceptionHandleTemplate(new AbstractCallback<GlobalReportRequest, GlobalReportResponse>() {
@Override
public void execute(GlobalReportRequest request, GlobalReportResponse response)
- throws TransactionException {
+ throws TransactionException {
doGlobalReport(request, response, rpcContext);
}
}, request, response);
diff --git a/server/src/main/java/io/seata/server/ParameterParser.java b/server/src/main/java/io/seata/server/ParameterParser.java
index f92f246148bc766d0207e06119d701110e429527..b1d469e3c9ad2a219f8c7ed33ed264e6d8f98bc5 100644
--- a/server/src/main/java/io/seata/server/ParameterParser.java
+++ b/server/src/main/java/io/seata/server/ParameterParser.java
@@ -18,9 +18,18 @@ package io.seata.server;
import com.beust.jcommander.JCommander;
import com.beust.jcommander.Parameter;
import com.beust.jcommander.ParameterException;
+import io.seata.common.util.NumberUtils;
import io.seata.common.util.StringUtils;
import io.seata.config.ConfigurationFactory;
import io.seata.core.constants.ConfigurationKeys;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.stream.Stream;
import static io.seata.config.ConfigurationFactory.ENV_PROPERTY_KEY;
@@ -28,14 +37,26 @@ import static io.seata.config.ConfigurationFactory.ENV_PROPERTY_KEY;
* The type Parameter parser.
*
* @author xingfudeshi@gmail.com
- * @date 2019/05/30
*/
public class ParameterParser {
- private static final String PROGRAM_NAME = "sh seata-server.sh(for linux and mac) or cmd seata-server.bat(for windows)";
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ParameterParser.class);
+
+ private static final String PROGRAM_NAME
+ = "sh seata-server.sh(for linux and mac) or cmd seata-server.bat(for windows)";
+
private static final int SERVER_DEFAULT_PORT = 8091;
private static final String SERVER_DEFAULT_STORE_MODE = "file";
private static final int SERVER_DEFAULT_NODE = 1;
+ private static final String ENV_SYSTEM_KEY = "SEATA_ENV";
+ private static final String ENV_SEATA_IP_KEY = "SEATA_IP";
+ private static final String ENV_SERVER_NODE_KEY = "SERVER_NODE";
+ private static final String ENV_SEATA_PORT_KEY = "SEATA_PORT";
+ private static final String ENV_STORE_MODE_KEY = "STORE_MODE";
+ private static final String C_GROUP_PATH = "/proc/1/cgroup";
+ private static final String DOCKER_PATH = "/docker";
+
@Parameter(names = "--help", help = true)
private boolean help;
@Parameter(names = {"--host", "-h"}, description = "The ip to register to registry center.", order = 1)
@@ -46,7 +67,8 @@ public class ParameterParser {
private String storeMode;
@Parameter(names = {"--serverNode", "-n"}, description = "server node id, such as 1, 2, 3. default is 1", order = 4)
private int serverNode = SERVER_DEFAULT_NODE;
- @Parameter(names = {"--seataEnv", "-e"}, description = "The name used for multi-configuration isolation.", order = 5)
+ @Parameter(names = {"--seataEnv", "-e"}, description = "The name used for multi-configuration isolation.",
+ order = 5)
private String seataEnv;
/**
@@ -60,18 +82,33 @@ public class ParameterParser {
private void init(String[] args) {
try {
- JCommander jCommander = JCommander.newBuilder().addObject(this).build();
- jCommander.parse(args);
- if (help) {
- jCommander.setProgramName(PROGRAM_NAME);
- jCommander.usage();
- System.exit(0);
+ boolean inContainer = this.isRunningInContainer();
+
+ if (inContainer) {
+ if (LOGGER.isInfoEnabled()) {
+ LOGGER.info("The server is running in container.");
+ }
+
+ this.seataEnv = StringUtils.trimToNull(System.getenv(ENV_SYSTEM_KEY));
+ this.host = StringUtils.trimToNull(System.getenv(ENV_SEATA_IP_KEY));
+ this.serverNode = NumberUtils.toInt(System.getenv(ENV_SERVER_NODE_KEY), SERVER_DEFAULT_NODE);
+ this.port = NumberUtils.toInt(System.getenv(ENV_SEATA_PORT_KEY), SERVER_DEFAULT_PORT);
+ this.storeMode = StringUtils.trimToNull(System.getenv(ENV_STORE_MODE_KEY));
+ } else {
+ JCommander jCommander = JCommander.newBuilder().addObject(this).build();
+ jCommander.parse(args);
+ if (help) {
+ jCommander.setProgramName(PROGRAM_NAME);
+ jCommander.usage();
+ System.exit(0);
+ }
}
if (StringUtils.isNotBlank(seataEnv)) {
System.setProperty(ENV_PROPERTY_KEY, seataEnv);
}
- if(StringUtils.isBlank(storeMode)){
- storeMode= ConfigurationFactory.getInstance().getConfig(ConfigurationKeys.STORE_MODE, SERVER_DEFAULT_STORE_MODE);
+ if (StringUtils.isBlank(storeMode)) {
+ storeMode = ConfigurationFactory.getInstance().getConfig(ConfigurationKeys.STORE_MODE,
+ SERVER_DEFAULT_STORE_MODE);
}
} catch (ParameterException e) {
printError(e);
@@ -86,6 +123,23 @@ public class ParameterParser {
System.exit(0);
}
+ /**
+ * Judge if application is run in container.
+ *
+ * @return If application is run in container
+ */
+ private Boolean isRunningInContainer() {
+ Path path = Paths.get(C_GROUP_PATH);
+ if (Files.exists(path)) {
+ try (Stream<String> stream = Files.lines(path)) {
+ return stream.anyMatch(line -> line.contains(DOCKER_PATH));
+ } catch (IOException e) {
+ LOGGER.error("Judge if running in container failed:{}", e.getMessage(), e);
+ }
+ }
+ return false;
+ }
+
/**
* Gets host.
*
diff --git a/server/src/main/java/io/seata/server/Server.java b/server/src/main/java/io/seata/server/Server.java
index 4f3c3dfc9ce003da3595fb773ff20405d0bc94a1..b587f137d7d3b34da4695f0edff1def704fe363e 100644
--- a/server/src/main/java/io/seata/server/Server.java
+++ b/server/src/main/java/io/seata/server/Server.java
@@ -24,6 +24,8 @@ import io.seata.core.rpc.netty.ShutdownHook;
import io.seata.server.coordinator.DefaultCoordinator;
import io.seata.server.metrics.MetricsManager;
import io.seata.server.session.SessionHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.concurrent.LinkedBlockingQueue;
@@ -33,10 +35,12 @@ import java.util.concurrent.TimeUnit;
/**
* The type Server.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class Server {
+ private static final Logger LOGGER = LoggerFactory.getLogger(Server.class);
+
private static final int MIN_SERVER_POOL_SIZE = 100;
private static final int MAX_SERVER_POOL_SIZE = 500;
private static final int MAX_TASK_QUEUE_SIZE = 20000;
@@ -67,7 +71,7 @@ public class Server {
//server port
rpcServer.setListenPort(parameterParser.getPort());
UUIDGenerator.init(parameterParser.getServerNode());
- //log store mode : file、db
+ //log store mode : file, db
SessionHolder.init(parameterParser.getStoreMode());
DefaultCoordinator coordinator = new DefaultCoordinator(rpcServer);
@@ -84,7 +88,12 @@ public class Server {
}
XID.setPort(rpcServer.getListenPort());
- rpcServer.init();
+ try {
+ rpcServer.init();
+ } catch (Throwable e) {
+ LOGGER.error("rpcServer init error:{}", e.getMessage(), e);
+ System.exit(-1);
+ }
System.exit(0);
}
diff --git a/server/src/main/java/io/seata/server/UUIDGenerator.java b/server/src/main/java/io/seata/server/UUIDGenerator.java
index efc55e555d30683dbd8c8f415709fe910863adaa..a6e11e6594c110924c2de88bfaac9805f0ecc86b 100644
--- a/server/src/main/java/io/seata/server/UUIDGenerator.java
+++ b/server/src/main/java/io/seata/server/UUIDGenerator.java
@@ -33,6 +33,7 @@ public class UUIDGenerator {
private static final AtomicLong UUID = new AtomicLong(1000);
private static int serverNodeId = 1;
private static final long UUID_INTERNAL = 2000000000;
+ private static long initUUID = 0;
/**
* Generate uuid long.
@@ -41,7 +42,7 @@ public class UUIDGenerator {
*/
public static long generateUUID() {
long id = UUID.incrementAndGet();
- if (id >= UUID_INTERNAL * (serverNodeId + 1)) {
+ if (id >= getMaxUUID()) {
synchronized (UUID) {
if (UUID.get() >= id) {
id -= UUID_INTERNAL;
@@ -73,6 +74,24 @@ public class UUIDGenerator {
}
+ /**
+ * Gets max uuid.
+ *
+ * @return the max uuid
+ */
+ public static long getMaxUUID() {
+ return UUID_INTERNAL * (serverNodeId + 1);
+ }
+
+ /**
+ * Gets init uuid.
+ *
+ * @return the init uuid
+ */
+ public static long getInitUUID() {
+ return initUUID;
+ }
+
/**
* Init.
*
@@ -89,6 +108,7 @@ public class UUIDGenerator {
long base = cal.getTimeInMillis();
long current = System.currentTimeMillis();
UUID.addAndGet((current - base) / 1000);
+ initUUID = getCurrentUUID();
} catch (ParseException e) {
throw new ShouldNeverHappenException(e);
}
diff --git a/server/src/main/java/io/seata/server/coordinator/DefaultCoordinator.java b/server/src/main/java/io/seata/server/coordinator/DefaultCoordinator.java
index 98c43da48c6559d8ef7114ded3ddc850383cb34b..0b2ac92344fc58eb950e88abe849070c0d068b8f 100644
--- a/server/src/main/java/io/seata/server/coordinator/DefaultCoordinator.java
+++ b/server/src/main/java/io/seata/server/coordinator/DefaultCoordinator.java
@@ -92,13 +92,14 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
/**
* The constant COMMITTING_RETRY_PERIOD.
*/
- protected static final long COMMITTING_RETRY_PERIOD = CONFIG.getLong(ConfigurationKeys.COMMITING_RETRY_PERIOD, 1000L);
+ protected static final long COMMITTING_RETRY_PERIOD = CONFIG.getLong(ConfigurationKeys.COMMITING_RETRY_PERIOD,
+ 1000L);
/**
* The constant ASYN_COMMITTING_RETRY_PERIOD.
*/
- protected static final long ASYN_COMMITTING_RETRY_PERIOD = CONFIG.getLong(ConfigurationKeys.ASYN_COMMITING_RETRY_PERIOD,
- 1000L);
+ protected static final long ASYN_COMMITTING_RETRY_PERIOD = CONFIG.getLong(
+ ConfigurationKeys.ASYN_COMMITING_RETRY_PERIOD, 1000L);
/**
* The constant ROLLBACKING_RETRY_PERIOD.
@@ -114,7 +115,8 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
/**
* The Transaction undolog delete period.
*/
- protected static final long UNDOLOG_DELETE_PERIOD = CONFIG.getLong(ConfigurationKeys.TRANSACTION_UNDO_LOG_DELETE_PERIOD, 24 * 60 * 60 * 1000);
+ protected static final long UNDOLOG_DELETE_PERIOD = CONFIG.getLong(
+ ConfigurationKeys.TRANSACTION_UNDO_LOG_DELETE_PERIOD, 24 * 60 * 60 * 1000);
/**
* The Transaction undolog delay delete period
@@ -124,10 +126,10 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
private static final int ALWAYS_RETRY_BOUNDARY = 0;
private static final Duration MAX_COMMIT_RETRY_TIMEOUT = ConfigurationFactory.getInstance().getDuration(
- ConfigurationKeys.SERVICE_PREFIX + "max.commit.retry.timeout", DurationUtil.DEFAULT_DURATION, 100);
+ ConfigurationKeys.MAX_COMMIT_RETRY_TIMEOUT, DurationUtil.DEFAULT_DURATION, 100);
private static final Duration MAX_ROLLBACK_RETRY_TIMEOUT = ConfigurationFactory.getInstance().getDuration(
- ConfigurationKeys.SERVICE_PREFIX + "max.rollback.retry.timeout", DurationUtil.DEFAULT_DURATION, 100);
+ ConfigurationKeys.MAX_ROLLBACK_RETRY_TIMEOUT, DurationUtil.DEFAULT_DURATION, 100);
private ScheduledThreadPoolExecutor retryRollbacking = new ScheduledThreadPoolExecutor(1,
new NamedThreadFactory("RetryRollbacking", 1));
@@ -189,7 +191,7 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
@Override
protected void doGlobalReport(GlobalReportRequest request, GlobalReportResponse response, RpcContext rpcContext)
- throws TransactionException {
+ throws TransactionException {
response.setGlobalStatus(core.globalReport(request.getXid(), request.getGlobalStatus()));
}
@@ -206,8 +208,7 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
@Override
protected void doBranchReport(BranchReportRequest request, BranchReportResponse response, RpcContext rpcContext)
throws TransactionException {
- core.branchReport(request.getBranchType(), request.getXid(), request.getBranchId(),
- request.getStatus(),
+ core.branchReport(request.getBranchType(), request.getXid(), request.getBranchId(), request.getStatus(),
request.getApplicationData());
}
@@ -215,14 +216,13 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
@Override
protected void doLockCheck(GlobalLockQueryRequest request, GlobalLockQueryResponse response, RpcContext rpcContext)
throws TransactionException {
- response.setLockable(core.lockQuery(request.getBranchType(), request.getResourceId(),
- request.getXid(), request.getLockKey()));
+ response.setLockable(
+ core.lockQuery(request.getBranchType(), request.getResourceId(), request.getXid(), request.getLockKey()));
}
@Override
public BranchStatus branchCommit(BranchType branchType, String xid, long branchId, String resourceId,
- String applicationData)
- throws TransactionException {
+ String applicationData) throws TransactionException {
try {
BranchCommitRequest request = new BranchCommitRequest();
request.setXid(xid);
@@ -236,42 +236,45 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
return BranchStatus.PhaseTwo_Committed;
}
- if(BranchType.SAGA.equals(branchType)){
+ if (BranchType.SAGA.equals(branchType)) {
- Map<String,Channel> channels = ChannelManager.getRmChannels();
- if(channels == null || channels.size() == 0){
+ Map<String, Channel> channels = ChannelManager.getRmChannels();
+ if (channels == null || channels.size() == 0) {
LOGGER.error("Failed to commit SAGA global[" + globalSession.getXid() + ", RM channels is empty.");
return BranchStatus.PhaseTwo_CommitFailed_Retryable;
}
- String sagaResourceId = globalSession.getApplicationId() + "#" + globalSession.getTransactionServiceGroup();
+ String sagaResourceId = globalSession.getApplicationId() + "#" + globalSession
+ .getTransactionServiceGroup();
Channel sagaChannel = channels.get(sagaResourceId);
- if(sagaChannel == null){
- LOGGER.error("Failed to commit SAGA global[" + globalSession.getXid() + ", cannot find channel by resourceId["+sagaResourceId+"]");
+ if (sagaChannel == null) {
+ LOGGER.error("Failed to commit SAGA global[" + globalSession.getXid()
+ + ", cannot find channel by resourceId[" + sagaResourceId + "]");
return BranchStatus.PhaseTwo_CommitFailed_Retryable;
}
- BranchCommitResponse response = (BranchCommitResponse)messageSender.sendSyncRequest(sagaChannel, request);
+ BranchCommitResponse response = (BranchCommitResponse)messageSender.sendSyncRequest(sagaChannel,
+ request);
return response.getBranchStatus();
- }
- else{
-
+ } else {
BranchSession branchSession = globalSession.getBranch(branchId);
-
- BranchCommitResponse response = (BranchCommitResponse)messageSender.sendSyncRequest(resourceId,
+ if (null != branchSession) {
+ BranchCommitResponse response = (BranchCommitResponse)messageSender.sendSyncRequest(resourceId,
branchSession.getClientId(), request);
- return response.getBranchStatus();
+ return response.getBranchStatus();
+ } else {
+ return BranchStatus.PhaseTwo_Committed;
+ }
}
} catch (IOException | TimeoutException e) {
- throw new BranchTransactionException(FailedToSendBranchCommitRequest, String.format("Send branch commit failed, xid = %s branchId = %s", xid, branchId), e);
+ throw new BranchTransactionException(FailedToSendBranchCommitRequest,
+ String.format("Send branch commit failed, xid = %s branchId = %s", xid, branchId), e);
}
}
@Override
public BranchStatus branchRollback(BranchType branchType, String xid, long branchId, String resourceId,
- String applicationData)
- throws TransactionException {
+ String applicationData) throws TransactionException {
try {
- BranchRollbackRequest
- request = new BranchRollbackRequest();
+ BranchRollbackRequest request = new BranchRollbackRequest();
request.setXid(xid);
request.setBranchId(branchId);
request.setResourceId(resourceId);
@@ -283,33 +286,37 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
return BranchStatus.PhaseTwo_Rollbacked;
}
- if(BranchType.SAGA.equals(branchType)){
+ if (BranchType.SAGA.equals(branchType)) {
- Map<String,Channel> channels = ChannelManager.getRmChannels();
- if(channels == null || channels.size() == 0){
- LOGGER.error("Failed to rollback SAGA global[" + globalSession.getXid() + ", RM channels is empty.");
+ Map<String, Channel> channels = ChannelManager.getRmChannels();
+ if (channels == null || channels.size() == 0) {
+ LOGGER.error(
+ "Failed to rollback SAGA global[" + globalSession.getXid() + ", RM channels is empty.");
return BranchStatus.PhaseTwo_RollbackFailed_Retryable;
}
- String sagaResourceId = globalSession.getApplicationId() + "#" + globalSession.getTransactionServiceGroup();
+ String sagaResourceId = globalSession.getApplicationId() + "#" + globalSession
+ .getTransactionServiceGroup();
Channel sagaChannel = channels.get(sagaResourceId);
- if(sagaChannel == null){
- LOGGER.error("Failed to rollback SAGA global[" + globalSession.getXid() + ", cannot find channel by resourceId["+sagaResourceId+"]");
+ if (sagaChannel == null) {
+ LOGGER.error("Failed to rollback SAGA global[" + globalSession.getXid()
+ + ", cannot find channel by resourceId[" + sagaResourceId + "]");
return BranchStatus.PhaseTwo_RollbackFailed_Retryable;
}
- BranchRollbackResponse response = (BranchRollbackResponse)messageSender.sendSyncRequest(sagaChannel, request);
+ BranchRollbackResponse response = (BranchRollbackResponse)messageSender.sendSyncRequest(sagaChannel,
+ request);
return response.getBranchStatus();
- }
- else{
+ } else {
BranchSession branchSession = globalSession.getBranch(branchId);
BranchRollbackResponse response = (BranchRollbackResponse)messageSender.sendSyncRequest(resourceId,
- branchSession.getClientId(), request);
+ branchSession.getClientId(), request);
return response.getBranchStatus();
}
} catch (IOException | TimeoutException e) {
- throw new BranchTransactionException(FailedToSendBranchRollbackRequest, String.format("Send branch rollback failed, xid = %s branchId = %s", xid, branchId), e);
+ throw new BranchTransactionException(FailedToSendBranchRollbackRequest,
+ String.format("Send branch rollback failed, xid = %s branchId = %s", xid, branchId), e);
}
}
@@ -328,8 +335,9 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
}
for (GlobalSession globalSession : allSessions) {
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug(globalSession.getXid() + " " + globalSession.getStatus() + " " +
- globalSession.getBeginTime() + " " + globalSession.getTimeout());
+ LOGGER.debug(
+ globalSession.getXid() + " " + globalSession.getStatus() + " " + globalSession.getBeginTime() + " "
+ + globalSession.getTimeout());
}
boolean shouldTimeout = globalSession.lockAndExcute(() -> {
if (globalSession.getStatus() != GlobalStatus.Begin || !globalSession.isTimeout()) {
@@ -350,8 +358,7 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
if (!shouldTimeout) {
continue;
}
- LOGGER.info(
- "Global transaction[" + globalSession.getXid() + "] is timeout and will be rolled back.");
+ LOGGER.info("Global transaction[" + globalSession.getXid() + "] is timeout and will be rolled back.");
globalSession.addSessionLifecycleListener(SessionHolder.getRetryRollbackingSessionManager());
SessionHolder.getRetryRollbackingSessionManager().addGlobalSession(globalSession);
@@ -374,6 +381,10 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
long now = System.currentTimeMillis();
for (GlobalSession rollbackingSession : rollbackingSessions) {
try {
+ //prevent repeated rollback
+ if (rollbackingSession.getStatus().equals(GlobalStatus.Rollbacking) && !rollbackingSession.isRollbackingDead()) {
+ continue;
+ }
if (isRetryTimeout(now, MAX_ROLLBACK_RETRY_TIMEOUT.toMillis(), rollbackingSession.getBeginTime())) {
/**
* Prevent thread safety issues
@@ -385,8 +396,8 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
rollbackingSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
core.doGlobalRollback(rollbackingSession, true);
} catch (TransactionException ex) {
- LOGGER.info("Failed to retry rollbacking [{}] {} {}",
- rollbackingSession.getXid(), ex.getCode(), ex.getMessage());
+ LOGGER.info("Failed to retry rollbacking [{}] {} {}", rollbackingSession.getXid(), ex.getCode(),
+ ex.getMessage());
}
}
}
@@ -413,8 +424,8 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
committingSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
core.doGlobalCommit(committingSession, true);
} catch (TransactionException ex) {
- LOGGER.info("Failed to retry committing [{}] {} {}",
- committingSession.getXid(), ex.getCode(), ex.getMessage());
+ LOGGER.info("Failed to retry committing [{}] {} {}", committingSession.getXid(), ex.getCode(),
+ ex.getMessage());
}
}
}
@@ -423,8 +434,7 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
/**
* Start timing when the session begin
*/
- if (timeout >= ALWAYS_RETRY_BOUNDARY &&
- now - beginTime > timeout) {
+ if (timeout >= ALWAYS_RETRY_BOUNDARY && now - beginTime > timeout) {
return true;
}
return false;
@@ -443,13 +453,13 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
try {
// Instruction reordering in DefaultCore#asyncCommit may cause this situation
if (GlobalStatus.AsyncCommitting != asyncCommittingSession.getStatus()) {
- continue;
+ continue;
}
asyncCommittingSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
core.doGlobalCommit(asyncCommittingSession, true);
} catch (TransactionException ex) {
- LOGGER.info("Failed to async committing [{}] {} {}",
- asyncCommittingSession.getXid(), ex.getCode(), ex.getMessage());
+ LOGGER.error("Failed to async committing [{}] {} {}", asyncCommittingSession.getXid(), ex.getCode(),
+ ex.getMessage(), ex);
}
}
}
@@ -458,12 +468,13 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
* Undo log delete.
*/
protected void undoLogDelete() {
- Map<String,Channel> rmChannels = ChannelManager.getRmChannels();
+ Map<String, Channel> rmChannels = ChannelManager.getRmChannels();
if (rmChannels == null || rmChannels.isEmpty()) {
LOGGER.info("no active rm channels to delete undo log");
return;
}
- short saveDays = CONFIG.getShort(ConfigurationKeys.TRANSACTION_UNDO_LOG_SAVE_DAYS, UndoLogDeleteRequest.DEFAULT_SAVE_DAYS);
+ short saveDays = CONFIG.getShort(ConfigurationKeys.TRANSACTION_UNDO_LOG_SAVE_DAYS,
+ UndoLogDeleteRequest.DEFAULT_SAVE_DAYS);
for (Map.Entry<String, Channel> channelEntry : rmChannels.entrySet()) {
String resourceId = channelEntry.getKey();
UndoLogDeleteRequest deleteRequest = new UndoLogDeleteRequest();
@@ -561,6 +572,6 @@ public class DefaultCoordinator extends AbstractTCInboundHandler
((RpcServer)messageSender).destroy();
}
// 3. last destroy SessionHolder
- SessionHolder.destory();
+ SessionHolder.destroy();
}
}
diff --git a/server/src/main/java/io/seata/server/coordinator/DefaultCore.java b/server/src/main/java/io/seata/server/coordinator/DefaultCore.java
index 17a6134eaafb6e6941b66f275825e98dad558ea9..6ab35bdff33858988dc767dcda0954de04e7fba5 100644
--- a/server/src/main/java/io/seata/server/coordinator/DefaultCore.java
+++ b/server/src/main/java/io/seata/server/coordinator/DefaultCore.java
@@ -15,6 +15,8 @@
*/
package io.seata.server.coordinator;
+import java.util.ArrayList;
+
import io.seata.core.event.EventBus;
import io.seata.core.event.GlobalTransactionEvent;
import io.seata.core.exception.BranchTransactionException;
@@ -35,8 +37,6 @@ import io.seata.server.session.SessionHolder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-
import static io.seata.core.exception.TransactionExceptionCode.BranchTransactionNotExist;
import static io.seata.core.exception.TransactionExceptionCode.FailedToAddBranch;
import static io.seata.core.exception.TransactionExceptionCode.GlobalTransactionNotActive;
@@ -66,40 +66,47 @@ public class DefaultCore implements Core {
@Override
public Long branchRegister(BranchType branchType, String resourceId, String clientId, String xid,
String applicationData, String lockKeys) throws TransactionException {
- GlobalSession globalSession = assertGlobalSessionNotNull(xid);
+ GlobalSession globalSession = assertGlobalSessionNotNull(xid, false);
return globalSession.lockAndExcute(() -> {
if (!globalSession.isActive()) {
- throw new GlobalTransactionException(GlobalTransactionNotActive,
- String.format("Could not register branch into global session xid = %s status = %s", globalSession.getXid(), globalSession.getStatus()));
+ throw new GlobalTransactionException(GlobalTransactionNotActive, String
+ .format("Could not register branch into global session xid = %s status = %s",
+ globalSession.getXid(), globalSession.getStatus()));
}
//SAGA type accept forward(retry) operation, forward operation will register remaining branches
if (globalSession.getStatus() != GlobalStatus.Begin && !BranchType.SAGA.equals(branchType)) {
- throw new GlobalTransactionException(GlobalTransactionStatusInvalid,
- String.format("Could not register branch into global session xid = %s status = %s while expecting %s", globalSession.getXid(), globalSession.getStatus(), GlobalStatus.Begin));
+ throw new GlobalTransactionException(GlobalTransactionStatusInvalid, String
+ .format("Could not register branch into global session xid = %s status = %s while expecting %s",
+ globalSession.getXid(), globalSession.getStatus(), GlobalStatus.Begin));
}
globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
BranchSession branchSession = SessionHelper.newBranchByGlobal(globalSession, branchType, resourceId,
applicationData, lockKeys, clientId);
if (!branchSession.lock()) {
- throw new BranchTransactionException(LockKeyConflict,
- String.format("Global lock acquire failed xid = %s branchId = %s", globalSession.getXid(), branchSession.getBranchId()));
+ throw new BranchTransactionException(LockKeyConflict, String
+ .format("Global lock acquire failed xid = %s branchId = %s", globalSession.getXid(),
+ branchSession.getBranchId()));
}
try {
globalSession.addBranch(branchSession);
} catch (RuntimeException ex) {
branchSession.unlock();
- throw new BranchTransactionException(FailedToAddBranch,
- String.format("Failed to store branch xid = %s branchId = %s", globalSession.getXid(), branchSession.getBranchId()));
+ throw new BranchTransactionException(FailedToAddBranch, String
+ .format("Failed to store branch xid = %s branchId = %s", globalSession.getXid(),
+ branchSession.getBranchId()), ex);
}
- LOGGER.info("Successfully register branch xid = {}, branchId = {}", globalSession.getXid(), branchSession.getBranchId());
+ LOGGER.info("Successfully register branch xid = {}, branchId = {}", globalSession.getXid(),
+ branchSession.getBranchId());
return branchSession.getBranchId();
});
}
- private GlobalSession assertGlobalSessionNotNull(String xid) throws TransactionException {
- GlobalSession globalSession = SessionHolder.findGlobalSession(xid);
+ private GlobalSession assertGlobalSessionNotNull(String xid, boolean withBranchSessions)
+ throws TransactionException {
+ GlobalSession globalSession = SessionHolder.findGlobalSession(xid, withBranchSessions);
if (globalSession == null) {
- throw new GlobalTransactionException(TransactionExceptionCode.GlobalTransactionNotExist, String.format("Could not found global transaction xid = %s", xid));
+ throw new GlobalTransactionException(TransactionExceptionCode.GlobalTransactionNotExist,
+ String.format("Could not found global transaction xid = %s", xid));
}
return globalSession;
}
@@ -107,15 +114,17 @@ public class DefaultCore implements Core {
@Override
public void branchReport(BranchType branchType, String xid, long branchId, BranchStatus status,
String applicationData) throws TransactionException {
- GlobalSession globalSession = assertGlobalSessionNotNull(xid);
+ GlobalSession globalSession = assertGlobalSessionNotNull(xid, true);
BranchSession branchSession = globalSession.getBranch(branchId);
if (branchSession == null) {
- throw new BranchTransactionException(BranchTransactionNotExist, String.format("Could not found branch session xid = %s branchId = %s", xid, branchId));
+ throw new BranchTransactionException(BranchTransactionNotExist,
+ String.format("Could not found branch session xid = %s branchId = %s", xid, branchId));
}
globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
globalSession.changeBranchStatus(branchSession, status);
- LOGGER.info("Successfully branch report xid = {}, branchId = {}", globalSession.getXid(), branchSession.getBranchId());
+ LOGGER.info("Successfully branch report xid = {}, branchId = {}", globalSession.getXid(),
+ branchSession.getBranchId());
}
@Override
@@ -132,8 +141,8 @@ public class DefaultCore implements Core {
@Override
public String begin(String applicationId, String transactionServiceGroup, String name, int timeout)
throws TransactionException {
- GlobalSession session = GlobalSession.createGlobalSession(
- applicationId, transactionServiceGroup, name, timeout);
+ GlobalSession session = GlobalSession.createGlobalSession(applicationId, transactionServiceGroup, name,
+ timeout);
session.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
session.begin();
@@ -182,32 +191,39 @@ public class DefaultCore implements Core {
eventBus.post(new GlobalTransactionEvent(globalSession.getTransactionId(), GlobalTransactionEvent.ROLE_TC,
globalSession.getTransactionName(), globalSession.getBeginTime(), null, globalSession.getStatus()));
- if(isSaga(globalSession)){
+ if (isSaga(globalSession)) {
try {
- String sagaResourceId = globalSession.getApplicationId() + "#" + globalSession.getTransactionServiceGroup();
- BranchStatus branchStatus = resourceManagerInbound.branchCommit(BranchType.SAGA, globalSession.getXid(), -1, sagaResourceId, null);
+ String sagaResourceId = globalSession.getApplicationId() + "#" + globalSession
+ .getTransactionServiceGroup();
+ BranchStatus branchStatus = resourceManagerInbound.branchCommit(BranchType.SAGA, globalSession.getXid(),
+ -1, sagaResourceId, null);
switch (branchStatus) {
case PhaseTwo_Committed:
+ removeAllBranches(globalSession);
LOGGER.info("Successfully committed SAGA global[" + globalSession.getXid() + "]");
break;
case PhaseTwo_Rollbacked:
LOGGER.info("Successfully rollbacked SAGA global[" + globalSession.getXid() + "]");
+ removeAllBranches(globalSession);
SessionHelper.endRollbacked(globalSession);
return;
case PhaseTwo_RollbackFailed_Retryable:
- LOGGER.error("By [{}], failed to rollback SAGA global [{}], will retry later.", branchStatus, globalSession.getXid());
+ LOGGER.error("By [{}], failed to rollback SAGA global [{}], will retry later.", branchStatus,
+ globalSession.getXid());
SessionHolder.getRetryCommittingSessionManager().removeGlobalSession(globalSession);
queueToRetryRollback(globalSession);
return;
case PhaseOne_Failed:
LOGGER.error("By [{}], finish SAGA global [{}]", branchStatus, globalSession.getXid());
+ removeAllBranches(globalSession);
globalSession.changeStatus(GlobalStatus.Finished);
globalSession.end();
return;
case PhaseTwo_CommitFailed_Unretryable:
if (globalSession.canBeCommittedAsync()) {
- LOGGER.error("By [{}], failed to commit SAGA global [{}]", branchStatus, globalSession.getXid());
+ LOGGER.error("By [{}], failed to commit SAGA global [{}]", branchStatus,
+ globalSession.getXid());
break;
} else {
SessionHelper.endCommitFailed(globalSession);
@@ -218,8 +234,7 @@ public class DefaultCore implements Core {
if (!retrying) {
queueToRetryCommit(globalSession);
return;
- }
- else {
+ } else {
LOGGER.error("Failed to commit SAGA global[{}], will retry later.", globalSession.getXid());
return;
}
@@ -232,9 +247,7 @@ public class DefaultCore implements Core {
}
throw new TransactionException(ex);
}
- }
- else{
-
+ } else {
for (BranchSession branchSession : globalSession.getSortedBranches()) {
BranchStatus currentStatus = branchSession.getStatus();
if (currentStatus == BranchStatus.PhaseOne_Failed) {
@@ -243,8 +256,8 @@ public class DefaultCore implements Core {
}
try {
BranchStatus branchStatus = resourceManagerInbound.branchCommit(branchSession.getBranchType(),
- branchSession.getXid(), branchSession.getBranchId(),
- branchSession.getResourceId(), branchSession.getApplicationData());
+ branchSession.getXid(), branchSession.getBranchId(), branchSession.getResourceId(),
+ branchSession.getApplicationData());
switch (branchStatus) {
case PhaseTwo_Committed:
@@ -257,7 +270,7 @@ public class DefaultCore implements Core {
} else {
SessionHelper.endCommitFailed(globalSession);
LOGGER.error("Finally, failed to commit global[{}] since branch[{}] commit failed",
- globalSession.getXid(), branchSession.getBranchId());
+ globalSession.getXid(), branchSession.getBranchId());
return;
}
default:
@@ -270,8 +283,8 @@ public class DefaultCore implements Core {
continue;
} else {
LOGGER.error(
- "Failed to commit global[{}] since branch[{}] commit failed, will retry later.",
- globalSession.getXid(), branchSession.getBranchId());
+ "Failed to commit global[{}] since branch[{}] commit failed, will retry later.",
+ globalSession.getXid(), branchSession.getBranchId());
return;
}
@@ -355,39 +368,39 @@ public class DefaultCore implements Core {
public void doGlobalRollback(GlobalSession globalSession, boolean retrying) throws TransactionException {
//start rollback event
eventBus.post(new GlobalTransactionEvent(globalSession.getTransactionId(), GlobalTransactionEvent.ROLE_TC,
- globalSession.getTransactionName(), globalSession.getBeginTime(), null, globalSession.getStatus()));
-
+ globalSession.getTransactionName(), globalSession.getBeginTime(), null, globalSession.getStatus()));
- if(isSaga(globalSession)){
+ if (isSaga(globalSession)) {
try {
- String sagaResourceId = globalSession.getApplicationId() + "#" + globalSession.getTransactionServiceGroup();
- BranchStatus branchStatus = resourceManagerInbound.branchRollback(BranchType.SAGA, globalSession.getXid(), -1, sagaResourceId, null);
+ String sagaResourceId = globalSession.getApplicationId() + "#" + globalSession
+ .getTransactionServiceGroup();
+ BranchStatus branchStatus = resourceManagerInbound.branchRollback(BranchType.SAGA,
+ globalSession.getXid(), -1, sagaResourceId, null);
switch (branchStatus) {
case PhaseTwo_Rollbacked:
- LOGGER.info("Successfully rollbacked SAGA global[" + globalSession.getXid() + "]");
+ removeAllBranches(globalSession);
+ LOGGER.info("Successfully rollbacked SAGA global[{}]",globalSession.getXid());
break;
case PhaseTwo_RollbackFailed_Unretryable:
SessionHelper.endRollbackFailed(globalSession);
- LOGGER.error("Failed to rollback SAGA global[" + globalSession.getXid() + "]");
+ LOGGER.error("Failed to rollback SAGA global[{}]", globalSession.getXid());
return;
default:
- LOGGER.error("Failed to rollback SAGA global[" + globalSession.getXid() + "]");
+ LOGGER.error("Failed to rollback SAGA global[{}]", globalSession.getXid());
if (!retrying) {
queueToRetryRollback(globalSession);
}
return;
}
} catch (Exception ex) {
- LOGGER.error("Failed to rollback global[" + globalSession.getXid() + "]", ex);
+ LOGGER.error("Failed to rollback global[{}]", globalSession.getXid(), ex);
if (!retrying) {
queueToRetryRollback(globalSession);
}
throw new TransactionException(ex);
}
- }
- else{
-
+ } else {
for (BranchSession branchSession : globalSession.getReverseSortedBranches()) {
BranchStatus currentBranchStatus = branchSession.getStatus();
if (currentBranchStatus == BranchStatus.PhaseOne_Failed) {
@@ -396,20 +409,23 @@ public class DefaultCore implements Core {
}
try {
BranchStatus branchStatus = resourceManagerInbound.branchRollback(branchSession.getBranchType(),
- branchSession.getXid(), branchSession.getBranchId(),
- branchSession.getResourceId(), branchSession.getApplicationData());
+ branchSession.getXid(), branchSession.getBranchId(), branchSession.getResourceId(),
+ branchSession.getApplicationData());
switch (branchStatus) {
case PhaseTwo_Rollbacked:
globalSession.removeBranch(branchSession);
- LOGGER.info("Successfully rollback branch xid={} branchId={}", globalSession.getXid(), branchSession.getBranchId());
+ LOGGER.info("Successfully rollback branch xid={} branchId={}", globalSession.getXid(),
+ branchSession.getBranchId());
continue;
case PhaseTwo_RollbackFailed_Unretryable:
SessionHelper.endRollbackFailed(globalSession);
- LOGGER.info("Failed to rollback branch and stop retry xid={} branchId={}", globalSession.getXid(), branchSession.getBranchId());
+ LOGGER.info("Failed to rollback branch and stop retry xid={} branchId={}",
+ globalSession.getXid(), branchSession.getBranchId());
return;
default:
- LOGGER.info("Failed to rollback branch xid={} branchId={}", globalSession.getXid(), branchSession.getBranchId());
+ LOGGER.info("Failed to rollback branch xid={} branchId={}", globalSession.getXid(),
+ branchSession.getBranchId());
if (!retrying) {
queueToRetryRollback(globalSession);
}
@@ -417,13 +433,25 @@ public class DefaultCore implements Core {
}
} catch (Exception ex) {
- LOGGER.error("Exception rollbacking branch xid={} branchId={}", globalSession.getXid(), branchSession.getBranchId(), ex);
+ LOGGER.error("Exception rollbacking branch xid={} branchId={}", globalSession.getXid(),
+ branchSession.getBranchId(), ex);
if (!retrying) {
queueToRetryRollback(globalSession);
}
throw new TransactionException(ex);
}
+ }
+ //In db mode, there is a problem of inconsistent data in multiple copies, resulting in new branch
+ // transaction registration when rolling back.
+ //1. New branch transaction and rollback branch transaction have no data association
+ //2. New branch transaction has data association with rollback branch transaction
+ //The second query can solve the first problem, and if it is the second problem, it may cause a rollback
+ // failure due to data changes.
+ GlobalSession globalSessionTwice = SessionHolder.findGlobalSession(globalSession.getXid());
+ if (globalSessionTwice != null && globalSessionTwice.hasBranch()) {
+ LOGGER.info("Global[{}] rollbacking is NOT done.", globalSession.getXid());
+ return;
}
}
@@ -431,8 +459,8 @@ public class DefaultCore implements Core {
//rollbacked event
eventBus.post(new GlobalTransactionEvent(globalSession.getTransactionId(), GlobalTransactionEvent.ROLE_TC,
- globalSession.getTransactionName(), globalSession.getBeginTime(), System.currentTimeMillis(),
- globalSession.getStatus()));
+ globalSession.getTransactionName(), globalSession.getBeginTime(), System.currentTimeMillis(),
+ globalSession.getStatus()));
LOGGER.info("Successfully rollback global, xid = {}", globalSession.getXid());
}
@@ -443,17 +471,30 @@ public class DefaultCore implements Core {
* @param globalSession
* @return
*/
- private boolean isSaga(GlobalSession globalSession){
+ private boolean isSaga(GlobalSession globalSession) {
ArrayList<BranchSession> branchSessions = globalSession.getSortedBranches();
- if(branchSessions != null && branchSessions.size() > 0){
+ if (branchSessions != null && branchSessions.size() > 0) {
return BranchType.SAGA.equals(branchSessions.get(0).getBranchType());
}
return false;
}
+ /**
+ * remove all branches
+ *
+ * @param globalSession
+ * @throws TransactionException
+ */
+ protected void removeAllBranches(GlobalSession globalSession) throws TransactionException {
+ ArrayList<BranchSession> branchSessions = globalSession.getSortedBranches();
+ for (BranchSession branchSession : branchSessions) {
+ globalSession.removeBranch(branchSession);
+ }
+ }
+
@Override
public GlobalStatus getStatus(String xid) throws TransactionException {
- GlobalSession globalSession = SessionHolder.findGlobalSession(xid);
+ GlobalSession globalSession = SessionHolder.findGlobalSession(xid, false);
if (null == globalSession) {
return GlobalStatus.Finished;
} else {
@@ -470,28 +511,33 @@ public class DefaultCore implements Core {
globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
- if(GlobalStatus.Committed.equals(globalStatus)){
- SessionHelper.endCommitted(globalSession);
- LOGGER.info("Global[{}] committed", globalSession.getXid());
- }
- else if(GlobalStatus.Rollbacked.equals(globalStatus)){
- SessionHelper.endRollbacked(globalSession);
- LOGGER.info("Global[{}] rollbacked", globalSession.getXid());
- }
- else {
- globalSession.changeStatus(globalStatus);
- LOGGER.info("Global[{}] reporting is successfully done. status[{}]", globalSession.getXid(), globalSession.getStatus());
-
- if(GlobalStatus.RollbackRetrying.equals(globalStatus)
- || GlobalStatus.TimeoutRollbackRetrying.equals(globalStatus)){
- queueToRetryRollback(globalSession);
- LOGGER.info("Global[{}] will retry rollback", globalSession.getXid());
- }
- else if(GlobalStatus.CommitRetrying.equals(globalStatus)){
- queueToRetryCommit(globalSession);
- LOGGER.info("Global[{}] will retry commit", globalSession.getXid());
+ if (isSaga(globalSession)) {
+
+ if (GlobalStatus.Committed.equals(globalStatus)) {
+ removeAllBranches(globalSession);
+ SessionHelper.endCommitted(globalSession);
+ LOGGER.info("Global[{}] committed", globalSession.getXid());
+ } else if (GlobalStatus.Rollbacked.equals(globalStatus)
+ || GlobalStatus.Finished.equals(globalStatus)) {
+ removeAllBranches(globalSession);
+ SessionHelper.endRollbacked(globalSession);
+ LOGGER.info("Global[{}] rollbacked", globalSession.getXid());
+ } else {
+ globalSession.changeStatus(globalStatus);
+ LOGGER.info("Global[{}] reporting is successfully done. status[{}]", globalSession.getXid(), globalSession.getStatus());
+
+ if (GlobalStatus.RollbackRetrying.equals(globalStatus)
+ || GlobalStatus.TimeoutRollbackRetrying.equals(globalStatus)
+ || GlobalStatus.UnKnown.equals(globalStatus)) {
+ queueToRetryRollback(globalSession);
+ LOGGER.info("Global[{}] will retry rollback", globalSession.getXid());
+ } else if (GlobalStatus.CommitRetrying.equals(globalStatus)) {
+ queueToRetryCommit(globalSession);
+ LOGGER.info("Global[{}] will retry commit", globalSession.getXid());
+ }
}
}
+
return globalSession.getStatus();
}
}
diff --git a/server/src/main/java/io/seata/server/lock/AbstractLockManager.java b/server/src/main/java/io/seata/server/lock/AbstractLockManager.java
index 1208578d1f2f760d932695d1a8740d3e5d4c232a..9d0b8f848edf08f6ac98a84888034522667524ea 100644
--- a/server/src/main/java/io/seata/server/lock/AbstractLockManager.java
+++ b/server/src/main/java/io/seata/server/lock/AbstractLockManager.java
@@ -19,7 +19,10 @@ import java.util.ArrayList;
import java.util.List;
import io.seata.common.XID;
+import io.seata.common.util.CollectionUtils;
import io.seata.common.util.StringUtils;
+import io.seata.core.exception.TransactionException;
+import io.seata.core.lock.Locker;
import io.seata.core.lock.RowLock;
import io.seata.server.session.BranchSession;
import org.slf4j.Logger;
@@ -29,7 +32,6 @@ import org.slf4j.LoggerFactory;
* The type Abstract lock manager.
*
* @author zhangsen
- * @data 2019 /4/25
*/
public abstract class AbstractLockManager implements LockManager {
@@ -38,6 +40,75 @@ public abstract class AbstractLockManager implements LockManager {
*/
protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractLockManager.class);
+ @Override
+ public boolean acquireLock(BranchSession branchSession) throws TransactionException {
+ if (branchSession == null) {
+ throw new IllegalArgumentException("branchSession can't be null for memory/file locker.");
+ }
+ String lockKey = branchSession.getLockKey();
+ if (StringUtils.isNullOrEmpty(lockKey)) {
+ //no lock
+ return true;
+ }
+ //get locks of branch
+ List<RowLock> locks = collectRowLocks(branchSession);
+ if (CollectionUtils.isEmpty(locks)) {
+ //no lock
+ return true;
+ }
+ return getLocker(branchSession).acquireLock(locks);
+ }
+
+ @Override
+ public boolean releaseLock(BranchSession branchSession) throws TransactionException {
+ if (branchSession == null) {
+ throw new IllegalArgumentException("branchSession can't be null for memory/file locker.");
+ }
+ List<RowLock> locks = collectRowLocks(branchSession);
+ try {
+ return getLocker(branchSession).releaseLock(locks);
+ } catch (Exception t) {
+ LOGGER.error("unLock error, branchSession:{}", branchSession, t);
+ return false;
+ }
+ }
+
+ @Override
+ public boolean isLockable(String xid, String resourceId, String lockKey) throws TransactionException {
+ List<RowLock> locks = collectRowLocks(lockKey, resourceId, xid);
+ try {
+ return getLocker().isLockable(locks);
+ } catch (Exception t) {
+ LOGGER.error("isLockable error, xid:{} resourceId:{}, lockKey:{}", xid, resourceId, lockKey, t);
+ return false;
+ }
+ }
+
+
+ @Override
+ public void cleanAllLocks() throws TransactionException {
+ getLocker().cleanAllLocks();
+ }
+
+ /**
+ * Gets locker.
+ *
+ * @return the locker
+ */
+ protected Locker getLocker() {
+ return getLocker(null);
+ }
+
+ /**
+ * Gets locker.
+ *
+ * @param branchSession the branch session
+ * @return the locker
+ */
+ protected Locker getLocker(BranchSession branchSession) {
+ return LockerFactory.get(branchSession);
+ }
+
/**
* Collect row locks list.`
*
diff --git a/server/src/main/java/io/seata/server/lock/DefaultLockManager.java b/server/src/main/java/io/seata/server/lock/DefaultLockManager.java
index 68e1abe0a1ca128fa6301173805d64f1e79573d7..a3c89978cc769247f6f863d37c9915f070c48b0e 100644
--- a/server/src/main/java/io/seata/server/lock/DefaultLockManager.java
+++ b/server/src/main/java/io/seata/server/lock/DefaultLockManager.java
@@ -16,17 +16,8 @@
package io.seata.server.lock;
import java.util.ArrayList;
-import java.util.List;
-import io.seata.common.util.CollectionUtils;
-import io.seata.common.util.StringUtils;
-import io.seata.config.Configuration;
-import io.seata.config.ConfigurationFactory;
-import io.seata.core.constants.ConfigurationKeys;
import io.seata.core.exception.TransactionException;
-import io.seata.core.lock.Locker;
-import io.seata.core.lock.RowLock;
-import io.seata.core.store.StoreMode;
import io.seata.server.session.BranchSession;
import io.seata.server.session.GlobalSession;
@@ -34,117 +25,19 @@ import io.seata.server.session.GlobalSession;
* The type Default lock manager.
*
* @author zhangsen
- * @data 2019 -05-15
*/
public class DefaultLockManager extends AbstractLockManager {
- private static Locker locker = null;
-
- /**
- * The constant CONFIG.
- */
- protected static final Configuration CONFIG = ConfigurationFactory.getInstance();
-
- @Override
- public boolean acquireLock(BranchSession branchSession) throws TransactionException {
- if (branchSession == null) {
- throw new IllegalArgumentException("branchSession can't be null for memory/file locker.");
- }
- String lockKey = branchSession.getLockKey();
- if (StringUtils.isNullOrEmpty(lockKey)) {
- //no lock
- return true;
- }
- //get locks of branch
- List<RowLock> locks = collectRowLocks(branchSession);
- if (CollectionUtils.isEmpty(locks)) {
- //no lock
- return true;
- }
- return getLocker(branchSession).acquireLock(locks);
- }
-
- @Override
- public boolean releaseLock(BranchSession branchSession) throws TransactionException {
- if (branchSession == null) {
- throw new IllegalArgumentException("branchSession can't be null for memory/file locker.");
- }
- List<RowLock> locks = collectRowLocks(branchSession);
- try {
- return this.doReleaseLock(locks, branchSession);
- } catch (Exception t) {
- LOGGER.error("unLock error, branchSession:" + branchSession, t);
- return false;
- }
- }
-
@Override
public boolean releaseGlobalSessionLock(GlobalSession globalSession) throws TransactionException {
ArrayList<BranchSession> branchSessions = globalSession.getBranchSessions();
- String storeMode = CONFIG.getConfig(ConfigurationKeys.STORE_MODE);
- if (StoreMode.DB.name().equalsIgnoreCase(storeMode)) {
- List<RowLock> locks = new ArrayList<>();
- for (BranchSession branchSession : branchSessions) {
- locks.addAll(collectRowLocks(branchSession));
- }
- try {
- return this.doReleaseLock(locks, null);
- } catch (Exception t) {
- LOGGER.error("unLock globalSession error, xid:{}", globalSession.getXid(), t);
- return false;
- }
- } else {
- boolean releaseLockResult = true;
- for (BranchSession branchSession : branchSessions) {
- if (!this.releaseLock(branchSession)) {
- releaseLockResult = false;
- }
+ boolean releaseLockResult = true;
+ for (BranchSession branchSession : branchSessions) {
+ if (!this.releaseLock(branchSession)) {
+ releaseLockResult = false;
}
- return releaseLockResult;
}
- }
-
- private boolean doReleaseLock(List<RowLock> locks, BranchSession branchSession) {
- if (CollectionUtils.isEmpty(locks)) {
- //no lock
- return true;
- }
- return getLocker(branchSession).releaseLock(locks);
- }
-
- @Override
- public boolean isLockable(String xid, String resourceId, String lockKey) throws TransactionException {
- List<RowLock> locks = collectRowLocks(lockKey, resourceId, xid);
- try {
- return getLocker().isLockable(locks);
- } catch (Exception t) {
- LOGGER.error("isLockable error, xid:" + xid + ", resourceId:" + resourceId + ", lockKey:" + lockKey, t);
- return false;
- }
- }
-
- @Override
- public void cleanAllLocks() throws TransactionException {
- getLocker().cleanAllLocks();
- }
-
- /**
- * Gets locker.
- *
- * @return the locker
- */
- protected Locker getLocker() {
- return getLocker(null);
- }
-
- /**
- * Gets locker.
- *
- * @param branchSession the branch session
- * @return the locker
- */
- protected Locker getLocker(BranchSession branchSession) {
- return LockerFactory.get(branchSession);
+ return releaseLockResult;
}
}
diff --git a/server/src/main/java/io/seata/server/lock/LockerFactory.java b/server/src/main/java/io/seata/server/lock/LockerFactory.java
index 7e915af292fa7c0443a4517e886290a2bdd0790c..7f2592b2e403cdb038ce93577802c9f35dbd6586 100644
--- a/server/src/main/java/io/seata/server/lock/LockerFactory.java
+++ b/server/src/main/java/io/seata/server/lock/LockerFactory.java
@@ -15,21 +15,23 @@
*/
package io.seata.server.lock;
+import javax.sql.DataSource;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
import io.seata.common.loader.EnhancedServiceLoader;
+import io.seata.common.util.StringUtils;
import io.seata.config.Configuration;
import io.seata.config.ConfigurationFactory;
import io.seata.core.constants.ConfigurationKeys;
import io.seata.core.lock.Locker;
import io.seata.core.store.StoreMode;
import io.seata.core.store.db.DataSourceGenerator;
+import io.seata.server.lock.db.DataBaseLockManager;
import io.seata.server.session.BranchSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.sql.DataSource;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
/**
* The type Lock manager factory.
*
@@ -60,14 +62,21 @@ public class LockerFactory {
/**
* The constant lockManager.
*/
- protected static LockManager lockManager = new DefaultLockManager();
+ protected static LockManager lockManager;
/**
* Get lock manager.
*
* @return the lock manager
*/
- public static synchronized final LockManager getLockManager() {
+ public static final LockManager getLockManager() {
+ if (lockManager == null) {
+ if (StringUtils.equalsIgnoreCase(StoreMode.DB.name(), CONFIG.getConfig(ConfigurationKeys.STORE_MODE))) {
+ lockManager = new DataBaseLockManager();
+ } else {
+ lockManager = new DefaultLockManager();
+ }
+ }
return lockManager;
}
@@ -77,9 +86,9 @@ public class LockerFactory {
* @param branchSession the branch session
* @return the lock manager
*/
- public static synchronized final Locker get(BranchSession branchSession) {
+ public static final Locker get(BranchSession branchSession) {
String storeMode = CONFIG.getConfig(ConfigurationKeys.STORE_MODE);
- if (StoreMode.DB.name().equalsIgnoreCase(storeMode)) {
+ if (StringUtils.equalsIgnoreCase(StoreMode.DB.name(), storeMode)) {
if (lockerMap.get(storeMode) != null) {
return lockerMap.get(storeMode);
}
@@ -90,8 +99,8 @@ public class LockerFactory {
DataSource logStoreDataSource = dataSourceGenerator.generateDataSource();
locker = EnhancedServiceLoader.load(Locker.class, storeMode, new Class[] {DataSource.class},
new Object[] {logStoreDataSource});
- lockerMap.put(storeMode, locker);
- } else if (StoreMode.FILE.name().equalsIgnoreCase(storeMode)) {
+ lockerMap.putIfAbsent(storeMode, locker);
+ } else if (StringUtils.equalsIgnoreCase(StoreMode.FILE.name(), storeMode)) {
locker = EnhancedServiceLoader.load(Locker.class, storeMode,
new Class[] {BranchSession.class}, new Object[] {branchSession});
} else {
diff --git a/server/src/main/java/io/seata/server/lock/db/DataBaseLockManager.java b/server/src/main/java/io/seata/server/lock/db/DataBaseLockManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..c314f923ad0b48225a512284d5bcaeab7077af13
--- /dev/null
+++ b/server/src/main/java/io/seata/server/lock/db/DataBaseLockManager.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.server.lock.db;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+import io.seata.common.util.CollectionUtils;
+import io.seata.core.exception.TransactionException;
+import io.seata.server.lock.AbstractLockManager;
+import io.seata.server.session.BranchSession;
+import io.seata.server.session.GlobalSession;
+
+/**
+ * The type db lock manager.
+ *
+ * @author zjinlei
+ */
+public class DataBaseLockManager extends AbstractLockManager {
+
+ @Override
+ public boolean releaseLock(BranchSession branchSession) throws TransactionException {
+ try {
+ return getLocker().releaseLock(branchSession.getXid(), branchSession.getBranchId());
+ } catch (Exception t) {
+ LOGGER.error("unLock error, xid {}, branchId:{}", branchSession.getXid(), branchSession.getBranchId(), t);
+ return false;
+ }
+ }
+
+ @Override
+ public boolean releaseGlobalSessionLock(GlobalSession globalSession) throws TransactionException {
+ ArrayList<BranchSession> branchSessions = globalSession.getBranchSessions();
+ if (CollectionUtils.isEmpty(branchSessions)) {
+ return true;
+ }
+ List<Long> branchIds = branchSessions.stream().map(BranchSession::getBranchId).collect(Collectors.toList());
+ try {
+ return getLocker().releaseLock(globalSession.getXid(), branchIds);
+ } catch (Exception t) {
+ LOGGER.error("unLock globalSession error, xid:{} branchIds:{}", globalSession.getXid(),
+ CollectionUtils.toString(branchIds), t);
+ return false;
+ }
+ }
+}
diff --git a/server/src/main/java/io/seata/server/lock/db/DataBaseLocker.java b/server/src/main/java/io/seata/server/lock/db/DataBaseLocker.java
index da859ed13e7f157a8ad52548e4c49b1c2bed82ef..d3125c7143601b203a1fcda58bc3076e86f63a88 100644
--- a/server/src/main/java/io/seata/server/lock/db/DataBaseLocker.java
+++ b/server/src/main/java/io/seata/server/lock/db/DataBaseLocker.java
@@ -15,9 +15,8 @@
*/
package io.seata.server.lock.db;
-import java.util.List;
-
import javax.sql.DataSource;
+import java.util.List;
import io.seata.common.exception.DataAccessException;
import io.seata.common.exception.StoreException;
@@ -33,7 +32,6 @@ import io.seata.core.store.StoreMode;
* The type Data base locker.
*
* @author zhangsen
- * @data 2019 -05-15
*/
@LoadLevel(name = "db")
public class DataBaseLocker extends AbstractLocker {
@@ -67,7 +65,7 @@ public class DataBaseLocker extends AbstractLocker {
} catch (StoreException e) {
throw e;
} catch (Exception t) {
- LOGGER.error("AcquireLock error, locks:" + CollectionUtils.toString(locks), t);
+ LOGGER.error("AcquireLock error, locks:{}", CollectionUtils.toString(locks), t);
return false;
}
}
@@ -83,7 +81,35 @@ public class DataBaseLocker extends AbstractLocker {
} catch (StoreException e) {
throw e;
} catch (Exception t) {
- LOGGER.error("unLock error, locks:" + CollectionUtils.toString(locks), t);
+ LOGGER.error("unLock error, locks:{}", CollectionUtils.toString(locks), t);
+ return false;
+ }
+ }
+
+ @Override
+ public boolean releaseLock(String xid, Long branchId) {
+ try {
+ return lockStore.unLock(xid, branchId);
+ } catch (StoreException e) {
+ throw e;
+ } catch (Exception t) {
+ LOGGER.error("unLock by branchId error, xid {}, branchId:{}", xid, branchId, t);
+ return false;
+ }
+ }
+
+ @Override
+ public boolean releaseLock(String xid, List<Long> branchIds) {
+ if (CollectionUtils.isEmpty(branchIds)) {
+ //no lock
+ return true;
+ }
+ try {
+ return lockStore.unLock(xid, branchIds);
+ } catch (StoreException e) {
+ throw e;
+ } catch (Exception t) {
+ LOGGER.error("unLock by branchIds error, xid {}, branchIds:{}", xid, CollectionUtils.toString(branchIds), t);
return false;
}
}
@@ -95,7 +121,7 @@ public class DataBaseLocker extends AbstractLocker {
} catch (DataAccessException e) {
throw e;
} catch (Exception t) {
- LOGGER.error("isLockable error, locks:" + CollectionUtils.toString(locks), t);
+ LOGGER.error("isLockable error, locks:{}", CollectionUtils.toString(locks), t);
return false;
}
}
diff --git a/server/src/main/java/io/seata/server/lock/memory/MemoryLocker.java b/server/src/main/java/io/seata/server/lock/memory/MemoryLocker.java
index 652cdec1453e622b13cb85e6d460a422bad44dfa..36bf03d132eb1075f6d5126c9557ba166f365eaa 100644
--- a/server/src/main/java/io/seata/server/lock/memory/MemoryLocker.java
+++ b/server/src/main/java/io/seata/server/lock/memory/MemoryLocker.java
@@ -15,7 +15,6 @@
*/
package io.seata.server.lock.memory;
-import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -35,19 +34,15 @@ import io.seata.server.session.BranchSession;
* The type Memory locker.
*
* @author zhangsen
- * @data 2019 -05-15
*/
@LoadLevel(name = "file")
public class MemoryLocker extends AbstractLocker {
private static final int BUCKET_PER_TABLE = 128;
- private static final ConcurrentMap<String/* resourceId */,
- ConcurrentMap<String/* tableName */,
- ConcurrentMap<Integer/* bucketId */,
- BucketLockMap>>>
- LOCK_MAP
- = new ConcurrentHashMap<>();
+ private static final ConcurrentMap<String/* resourceId */, ConcurrentMap<String/* tableName */,
+ ConcurrentMap<Integer/* bucketId */, BucketLockMap>>>
+ LOCK_MAP = new ConcurrentHashMap<>();
/**
* The Branch session.
@@ -75,8 +70,7 @@ public class MemoryLocker extends AbstractLocker {
ConcurrentMap<BucketLockMap, Set<String>> bucketHolder = branchSession.getLockHolder();
ConcurrentMap<String, ConcurrentMap<Integer, BucketLockMap>> dbLockMap = LOCK_MAP.get(resourceId);
if (dbLockMap == null) {
- LOCK_MAP.putIfAbsent(resourceId,
- new ConcurrentHashMap<>());
+ LOCK_MAP.putIfAbsent(resourceId, new ConcurrentHashMap<>());
dbLockMap = LOCK_MAP.get(resourceId);
}
@@ -122,6 +116,10 @@ public class MemoryLocker extends AbstractLocker {
@Override
public boolean releaseLock(List<RowLock> rowLock) {
+ if (CollectionUtils.isEmpty(rowLock)) {
+ //no lock
+ return true;
+ }
ConcurrentMap<BucketLockMap, Set<String>> lockHolder = branchSession.getLockHolder();
if (lockHolder == null || lockHolder.size() == 0) {
return true;
diff --git a/server/src/main/java/io/seata/server/session/AbstractSessionManager.java b/server/src/main/java/io/seata/server/session/AbstractSessionManager.java
index 1cd7a6a2fc21967c573175f387e600edc7301ac2..d031aae4182643234e66572f81fc39c61676bb24 100644
--- a/server/src/main/java/io/seata/server/session/AbstractSessionManager.java
+++ b/server/src/main/java/io/seata/server/session/AbstractSessionManager.java
@@ -151,19 +151,26 @@ public abstract class AbstractSessionManager implements SessionManager, SessionL
private void writeSession(LogOperation logOperation, SessionStorable sessionStorable) throws TransactionException {
if (!transactionStoreManager.writeSession(logOperation, sessionStorable)) {
if (LogOperation.GLOBAL_ADD.equals(logOperation)) {
- throw new GlobalTransactionException(TransactionExceptionCode.FailedWriteSession, "Fail to store global session");
+ throw new GlobalTransactionException(TransactionExceptionCode.FailedWriteSession,
+ "Fail to store global session");
} else if (LogOperation.GLOBAL_UPDATE.equals(logOperation)) {
- throw new GlobalTransactionException(TransactionExceptionCode.FailedWriteSession, "Fail to update global session");
+ throw new GlobalTransactionException(TransactionExceptionCode.FailedWriteSession,
+ "Fail to update global session");
} else if (LogOperation.GLOBAL_REMOVE.equals(logOperation)) {
- throw new GlobalTransactionException(TransactionExceptionCode.FailedWriteSession, "Fail to remove global session");
+ throw new GlobalTransactionException(TransactionExceptionCode.FailedWriteSession,
+ "Fail to remove global session");
} else if (LogOperation.BRANCH_ADD.equals(logOperation)) {
- throw new BranchTransactionException(TransactionExceptionCode.FailedWriteSession, "Fail to store branch session");
+ throw new BranchTransactionException(TransactionExceptionCode.FailedWriteSession,
+ "Fail to store branch session");
} else if (LogOperation.BRANCH_UPDATE.equals(logOperation)) {
- throw new BranchTransactionException(TransactionExceptionCode.FailedWriteSession, "Fail to update branch session");
+ throw new BranchTransactionException(TransactionExceptionCode.FailedWriteSession,
+ "Fail to update branch session");
} else if (LogOperation.BRANCH_REMOVE.equals(logOperation)) {
- throw new BranchTransactionException(TransactionExceptionCode.FailedWriteSession, "Fail to remove branch session");
- }else{
- throw new BranchTransactionException(TransactionExceptionCode.FailedWriteSession, "Unknown LogOperation:" + logOperation.name());
+ throw new BranchTransactionException(TransactionExceptionCode.FailedWriteSession,
+ "Fail to remove branch session");
+ } else {
+ throw new BranchTransactionException(TransactionExceptionCode.FailedWriteSession,
+ "Unknown LogOperation:" + logOperation.name());
}
}
}
diff --git a/server/src/main/java/io/seata/server/session/DefaultSessionManager.java b/server/src/main/java/io/seata/server/session/DefaultSessionManager.java
index a9fcf0cae66e943119e47166d17cf655527aee2c..a7e010d4958f3bf2bfbfea01ee797894db62f47e 100644
--- a/server/src/main/java/io/seata/server/session/DefaultSessionManager.java
+++ b/server/src/main/java/io/seata/server/session/DefaultSessionManager.java
@@ -37,7 +37,7 @@ public class DefaultSessionManager extends AbstractSessionManager {
/**
* The Session map.
*/
- protected Map<String, GlobalSession> sessionMap = new ConcurrentHashMap<String, GlobalSession>();
+ protected Map<String, GlobalSession> sessionMap = new ConcurrentHashMap<>();
/**
* Instantiates a new Default session manager.
@@ -51,6 +51,22 @@ public class DefaultSessionManager extends AbstractSessionManager {
public boolean writeSession(LogOperation logOperation, SessionStorable session) {
return true;
}
+
+ @Override
+ public long getCurrentMaxSessionId() {
+ long maxSessionId = 0L;
+ for (Map.Entry<String, GlobalSession> entry : sessionMap.entrySet()) {
+ GlobalSession globalSession = entry.getValue();
+ if (globalSession.hasBranch()) {
+ long maxBranchId = globalSession.getSortedBranches().get(globalSession.getSortedBranches().size() - 1)
+ .getBranchId();
+ if (maxBranchId > maxSessionId) {
+ maxSessionId = maxBranchId;
+ }
+ }
+ }
+ return maxSessionId;
+ }
};
}
@@ -65,6 +81,12 @@ public class DefaultSessionManager extends AbstractSessionManager {
return sessionMap.get(xid);
}
+ @Override
+ public GlobalSession findGlobalSession(String xid, boolean withBranchSessions) {
+ //withBranchSessions without process in memory
+ return sessionMap.get(xid);
+ }
+
@Override
public void removeGlobalSession(GlobalSession session) throws TransactionException {
super.removeGlobalSession(session);
diff --git a/server/src/main/java/io/seata/server/session/GlobalSession.java b/server/src/main/java/io/seata/server/session/GlobalSession.java
index d8be331660f918df31f5c19023af1c0a01a75f1d..97d5399d588468fdfb34a6f820a5682979579d28 100644
--- a/server/src/main/java/io/seata/server/session/GlobalSession.java
+++ b/server/src/main/java/io/seata/server/session/GlobalSession.java
@@ -122,6 +122,14 @@ public class GlobalSession implements SessionLifecycle, SessionStorable {
return (System.currentTimeMillis() - beginTime) > timeout;
}
+ /**
+ * prevent could not handle rollbacking transaction
+ * @return if true force roll back
+ */
+ public boolean isRollbackingDead() {
+ return (System.currentTimeMillis() - beginTime) > (2 * 6000);
+ }
+
@Override
public void begin() throws TransactionException {
this.status = GlobalStatus.Begin;
diff --git a/server/src/main/java/io/seata/server/session/SessionCondition.java b/server/src/main/java/io/seata/server/session/SessionCondition.java
index ce69172925264adcd5393a3f673c140e4f47571b..3a6dd8f1e1d6f0073725e1b0bfb36385a80e8e00 100644
--- a/server/src/main/java/io/seata/server/session/SessionCondition.java
+++ b/server/src/main/java/io/seata/server/session/SessionCondition.java
@@ -20,8 +20,7 @@ import io.seata.core.model.GlobalStatus;
/**
* The type Session condition.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/13
+ * @author slievrly
*/
public class SessionCondition {
private Long transactionId;
diff --git a/server/src/main/java/io/seata/server/session/SessionHolder.java b/server/src/main/java/io/seata/server/session/SessionHolder.java
index 0923f0e8d95e17b9493dce72734766b532f669a0..12f325e85d55489e9516e1de87bd8f90cbf75b60 100644
--- a/server/src/main/java/io/seata/server/session/SessionHolder.java
+++ b/server/src/main/java/io/seata/server/session/SessionHolder.java
@@ -81,7 +81,7 @@ public class SessionHolder {
/**
* Init.
*
- * @param mode the store mode: file、db
+ * @param mode the store mode: file, db
* @throws IOException the io exception
*/
public static void init(String mode) throws IOException {
@@ -102,7 +102,8 @@ public class SessionHolder {
new Object[] {RETRY_ROLLBACKING_SESSION_MANAGER_NAME});
} else if (StoreMode.FILE.equals(storeMode)) {
//file store
- String sessionStorePath = CONFIG.getConfig(ConfigurationKeys.STORE_FILE_DIR, DEFAULT_SESSION_STORE_FILE_DIR);
+ String sessionStorePath = CONFIG.getConfig(ConfigurationKeys.STORE_FILE_DIR,
+ DEFAULT_SESSION_STORE_FILE_DIR);
if (sessionStorePath == null) {
throw new StoreException("the {store.file.dir} is empty.");
}
@@ -166,8 +167,7 @@ public class SessionHolder {
case Committing:
case CommitRetrying:
try {
- globalSession.addSessionLifecycleListener(
- getRetryCommittingSessionManager());
+ globalSession.addSessionLifecycleListener(getRetryCommittingSessionManager());
getRetryCommittingSessionManager().addGlobalSession(globalSession);
} catch (TransactionException e) {
throw new ShouldNeverHappenException(e);
@@ -178,8 +178,7 @@ public class SessionHolder {
case TimeoutRollbacking:
case TimeoutRollbackRetrying:
try {
- globalSession.addSessionLifecycleListener(
- getRetryRollbackingSessionManager());
+ globalSession.addSessionLifecycleListener(getRetryRollbackingSessionManager());
getRetryRollbackingSessionManager().addGlobalSession(globalSession);
} catch (TransactionException e) {
throw new ShouldNeverHappenException(e);
@@ -257,10 +256,21 @@ public class SessionHolder {
* @return the global session
*/
public static GlobalSession findGlobalSession(String xid) {
- return getRootSessionManager().findGlobalSession(xid);
+ return findGlobalSession(xid, true);
}
- public static void destory() {
+ /**
+ * Find global session.
+ *
+ * @param xid the xid
+ * @param withBranchSessions the withBranchSessions
+ * @return the global session
+ */
+ public static GlobalSession findGlobalSession(String xid, boolean withBranchSessions) {
+ return getRootSessionManager().findGlobalSession(xid, withBranchSessions);
+ }
+
+ public static void destroy() {
ROOT_SESSION_MANAGER.destroy();
ASYNC_COMMITTING_SESSION_MANAGER.destroy();
RETRY_COMMITTING_SESSION_MANAGER.destroy();
diff --git a/server/src/main/java/io/seata/server/session/SessionManager.java b/server/src/main/java/io/seata/server/session/SessionManager.java
index e7e94017191c71019e6b8ceb5f6264f853302070..ee9ead88b4265c656841c0be31da6bd05a6bceb6 100644
--- a/server/src/main/java/io/seata/server/session/SessionManager.java
+++ b/server/src/main/java/io/seata/server/session/SessionManager.java
@@ -46,6 +46,15 @@ public interface SessionManager extends SessionLifecycleListener, Disposable {
*/
GlobalSession findGlobalSession(String xid) ;
+ /**
+ * Find global session global session.
+ *
+ * @param xid the xid
+ * @param withBranchSessions the withBranchSessions
+ * @return the global session
+ */
+ GlobalSession findGlobalSession(String xid, boolean withBranchSessions);
+
/**
* Update global session status.
*
diff --git a/server/src/main/java/io/seata/server/session/db/DataBaseSessionManager.java b/server/src/main/java/io/seata/server/session/db/DataBaseSessionManager.java
index 6c421b445f9163793c082062cbbbabaa921219af..65443bcb81f41fbcea563aaef3073b8ac9aa5948 100644
--- a/server/src/main/java/io/seata/server/session/db/DataBaseSessionManager.java
+++ b/server/src/main/java/io/seata/server/session/db/DataBaseSessionManager.java
@@ -27,9 +27,11 @@ import io.seata.core.exception.TransactionException;
import io.seata.core.model.BranchStatus;
import io.seata.core.model.GlobalStatus;
import io.seata.core.store.StoreMode;
+import io.seata.server.UUIDGenerator;
import io.seata.server.session.AbstractSessionManager;
import io.seata.server.session.BranchSession;
import io.seata.server.session.GlobalSession;
+import io.seata.server.session.Reloadable;
import io.seata.server.session.SessionCondition;
import io.seata.server.session.SessionHolder;
import io.seata.server.session.SessionLifecycleListener;
@@ -43,11 +45,10 @@ import org.slf4j.LoggerFactory;
* The Data base session manager.
*
* @author zhangsen
- * @data 2019 /4/4
*/
@LoadLevel(name = "db")
public class DataBaseSessionManager extends AbstractSessionManager
- implements SessionManager, SessionLifecycleListener, Initialize {
+ implements SessionManager, SessionLifecycleListener, Initialize, Reloadable {
/**
* The constant LOGGER.
@@ -154,7 +155,12 @@ public class DataBaseSessionManager extends AbstractSessionManager
@Override
public GlobalSession findGlobalSession(String xid) {
- return transactionStoreManager.readSession(xid);
+ return this.findGlobalSession(xid, true);
+ }
+
+ @Override
+ public GlobalSession findGlobalSession(String xid, boolean withBranchSessions) {
+ return transactionStoreManager.readSession(xid, withBranchSessions);
}
@Override
@@ -166,7 +172,7 @@ public class DataBaseSessionManager extends AbstractSessionManager
return findGlobalSessions(new SessionCondition(new GlobalStatus[] {GlobalStatus.CommitRetrying}));
} else if (SessionHolder.RETRY_ROLLBACKING_SESSION_MANAGER_NAME.equalsIgnoreCase(taskName)) {
return findGlobalSessions(new SessionCondition(new GlobalStatus[] {GlobalStatus.RollbackRetrying,
- GlobalStatus.TimeoutRollbacking, GlobalStatus.TimeoutRollbackRetrying}));
+ GlobalStatus.Rollbacking, GlobalStatus.TimeoutRollbacking, GlobalStatus.TimeoutRollbackRetrying}));
} else {
//all data
return findGlobalSessions(new SessionCondition(new GlobalStatus[] {
@@ -183,4 +189,11 @@ public class DataBaseSessionManager extends AbstractSessionManager
return transactionStoreManager.readSession(condition);
}
-}
\ No newline at end of file
+ @Override
+ public void reload() {
+ long maxSessionId = transactionStoreManager.getCurrentMaxSessionId();
+ if (maxSessionId > UUIDGenerator.getCurrentUUID()) {
+ UUIDGenerator.setUUID(UUIDGenerator.getCurrentUUID(), maxSessionId);
+ }
+ }
+}
diff --git a/server/src/main/java/io/seata/server/session/file/FileBasedSessionManager.java b/server/src/main/java/io/seata/server/session/file/FileBasedSessionManager.java
index 46a2b10c3fe1a3320f68cbdd29cc366b72dc68ab..3a4764cab591082eb0389552ddb4e8a3e5694b08 100644
--- a/server/src/main/java/io/seata/server/session/file/FileBasedSessionManager.java
+++ b/server/src/main/java/io/seata/server/session/file/FileBasedSessionManager.java
@@ -43,7 +43,7 @@ import io.seata.server.store.TransactionWriteStore;
/**
* The type File based session manager.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
@LoadLevel(name = "file")
public class FileBasedSessionManager extends DefaultSessionManager implements Reloadable {
diff --git a/server/src/main/java/io/seata/server/store/AbstractTransactionStoreManager.java b/server/src/main/java/io/seata/server/store/AbstractTransactionStoreManager.java
index f024bd772bf063eef62b46623ff533b41eff6c3e..31e9813f8d6e592fa845385819b8bbc36b9ce8bd 100644
--- a/server/src/main/java/io/seata/server/store/AbstractTransactionStoreManager.java
+++ b/server/src/main/java/io/seata/server/store/AbstractTransactionStoreManager.java
@@ -24,7 +24,6 @@ import java.util.List;
* The type Abstract transaction store manager.
*
* @author zhangsen
- * @data 2019 /4/25
*/
public abstract class AbstractTransactionStoreManager implements TransactionStoreManager {
@@ -33,6 +32,11 @@ public abstract class AbstractTransactionStoreManager implements TransactionStor
return null;
}
+ @Override
+ public GlobalSession readSession(String xid, boolean withBranchSessions) {
+ return null;
+ }
+
@Override
public List<GlobalSession> readSession(SessionCondition sessionCondition) {
return null;
diff --git a/server/src/main/java/io/seata/server/store/FlushDiskMode.java b/server/src/main/java/io/seata/server/store/FlushDiskMode.java
index 34f9ba3313263b6a36eeeb28fb4e0aa54aa5ea10..35684a96b9dd7ea1eff348dfe844acb227f0b6f9 100644
--- a/server/src/main/java/io/seata/server/store/FlushDiskMode.java
+++ b/server/src/main/java/io/seata/server/store/FlushDiskMode.java
@@ -16,10 +16,9 @@
package io.seata.server.store;
/**
- *
* @author lizhao
*/
-public enum FlushDiskMode {
+public enum FlushDiskMode {
/**
* sync flush disk
*/
@@ -36,7 +35,7 @@ public enum FlushDiskMode {
}
public static FlushDiskMode findDiskMode(String modeStr) {
- if (SYNC_MODEL.modeStr.equals(modeStr)){
+ if (SYNC_MODEL.modeStr.equals(modeStr)) {
return SYNC_MODEL;
}
return ASYNC_MODEL;
diff --git a/server/src/main/java/io/seata/server/store/ReloadableStore.java b/server/src/main/java/io/seata/server/store/ReloadableStore.java
index d7b705c65a81f786ff5011dfab09ca8a749dbfcf..bc3e25319bba899d52d47dd50bc88f4a4078cc6b 100644
--- a/server/src/main/java/io/seata/server/store/ReloadableStore.java
+++ b/server/src/main/java/io/seata/server/store/ReloadableStore.java
@@ -21,7 +21,6 @@ import java.util.List;
* The interface Reloadable store.
*
* @author zhangsen
- * @data 2019 /4/24
*/
public interface ReloadableStore {
diff --git a/server/src/main/java/io/seata/server/store/SessionStorable.java b/server/src/main/java/io/seata/server/store/SessionStorable.java
index 23b5dce75ef97b17097850859c6a0d68c08ea4ee..cdcebeb08050039c6a2fb363e45c420e3f0e36c6 100644
--- a/server/src/main/java/io/seata/server/store/SessionStorable.java
+++ b/server/src/main/java/io/seata/server/store/SessionStorable.java
@@ -18,7 +18,7 @@ package io.seata.server.store;
/**
* The interface Session storable.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public interface SessionStorable {
diff --git a/server/src/main/java/io/seata/server/store/StoreConfig.java b/server/src/main/java/io/seata/server/store/StoreConfig.java
index 37e2b0f3b8025429d86bca501fdcaba99d50743d..45b68c42fb2d928f6da48dbfa5ab60121b46a8c1 100644
--- a/server/src/main/java/io/seata/server/store/StoreConfig.java
+++ b/server/src/main/java/io/seata/server/store/StoreConfig.java
@@ -29,13 +29,19 @@ public class StoreConfig {
private static final Configuration CONFIGURATION = ConfigurationFactory.getInstance();
- // default 16kb
+ /**
+ * Default 16kb.
+ */
private static final int DEFAULT_MAX_BRANCH_SESSION_SIZE = 1024 * 16;
- // default 512b
+ /**
+ * Default 512b.
+ */
private static final int DEFAULT_MAX_GLOBAL_SESSION_SIZE = 512;
- // default 16kb
+ /**
+ * Default 16kb.
+ */
private static final int DEFAULT_WRITE_BUFFER_SIZE = 1024 * 16;
public static int getMaxBranchSessionSize() {
@@ -53,4 +59,4 @@ public class StoreConfig {
public static FlushDiskMode getFlushDiskMode() {
return FlushDiskMode.findDiskMode(CONFIGURATION.getConfig(STORE_FILE_PREFIX + "flush-disk-mode"));
}
-}
\ No newline at end of file
+}
diff --git a/server/src/main/java/io/seata/server/store/TransactionStoreManager.java b/server/src/main/java/io/seata/server/store/TransactionStoreManager.java
index 26dc122009c24b0fbc17c37d42227a4b864626c9..fdebb3d84043b40d9491eedf820c161ae46a2d4d 100644
--- a/server/src/main/java/io/seata/server/store/TransactionStoreManager.java
+++ b/server/src/main/java/io/seata/server/store/TransactionStoreManager.java
@@ -23,7 +23,7 @@ import java.util.List;
/**
* The interface Transaction store manager.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public interface TransactionStoreManager {
@@ -45,6 +45,15 @@ public interface TransactionStoreManager {
*/
GlobalSession readSession(String xid);
+ /**
+ * Read session global session.
+ *
+ * @param xid the xid
+ * @param withBranchSessions the withBranchSessions
+ * @return the global session
+ */
+ GlobalSession readSession(String xid, boolean withBranchSessions);
+
/**
* Read session by status list.
*
@@ -58,6 +67,13 @@ public interface TransactionStoreManager {
*/
void shutdown();
+ /**
+ * Gets current max session id.
+ *
+ * @return the current max session id
+ */
+ long getCurrentMaxSessionId();
+
/**
* The enum Log operation.
diff --git a/server/src/main/java/io/seata/server/store/TransactionWriteStore.java b/server/src/main/java/io/seata/server/store/TransactionWriteStore.java
index f7ab6c5424a4bc232f9afdda8f7314334c31d62f..c7d5eb83d7a338765363719c560ab66e0b8d6610 100644
--- a/server/src/main/java/io/seata/server/store/TransactionWriteStore.java
+++ b/server/src/main/java/io/seata/server/store/TransactionWriteStore.java
@@ -25,8 +25,7 @@ import io.seata.server.store.TransactionStoreManager.LogOperation;
/**
* The type Transaction write store.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/11
+ * @author slievrly
*/
public class TransactionWriteStore implements SessionStorable {
private SessionStorable sessionRequest;
diff --git a/server/src/main/java/io/seata/server/store/db/DatabaseTransactionStoreManager.java b/server/src/main/java/io/seata/server/store/db/DatabaseTransactionStoreManager.java
index 52940bcee6be775060046e9fdb6a1c1e9abdf47f..ec0ddc30c510b84ac106b99e8262efc309564559 100644
--- a/server/src/main/java/io/seata/server/store/db/DatabaseTransactionStoreManager.java
+++ b/server/src/main/java/io/seata/server/store/db/DatabaseTransactionStoreManager.java
@@ -16,8 +16,11 @@
package io.seata.server.store.db;
import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.stream.Collectors;
import javax.sql.DataSource;
@@ -38,6 +41,7 @@ import io.seata.core.store.GlobalTransactionDO;
import io.seata.core.store.LogStore;
import io.seata.core.store.StoreMode;
import io.seata.core.store.db.DataSourceGenerator;
+import io.seata.server.UUIDGenerator;
import io.seata.server.session.BranchSession;
import io.seata.server.session.GlobalSession;
import io.seata.server.session.SessionCondition;
@@ -49,7 +53,6 @@ import io.seata.server.store.TransactionStoreManager;
* The type Database transaction store manager.
*
* @author zhangsen
- * @data 2019 /4/2
*/
@LoadLevel(name = "db")
public class DatabaseTransactionStoreManager extends AbstractTransactionStoreManager
@@ -104,21 +107,20 @@ public class DatabaseTransactionStoreManager extends AbstractTransactionStoreMan
@Override
public boolean writeSession(LogOperation logOperation, SessionStorable session) {
if (LogOperation.GLOBAL_ADD.equals(logOperation)) {
- logStore.insertGlobalTransactionDO(convertGlobalTransactionDO(session));
+ return logStore.insertGlobalTransactionDO(convertGlobalTransactionDO(session));
} else if (LogOperation.GLOBAL_UPDATE.equals(logOperation)) {
- logStore.updateGlobalTransactionDO(convertGlobalTransactionDO(session));
+ return logStore.updateGlobalTransactionDO(convertGlobalTransactionDO(session));
} else if (LogOperation.GLOBAL_REMOVE.equals(logOperation)) {
- logStore.deleteGlobalTransactionDO(convertGlobalTransactionDO(session));
+ return logStore.deleteGlobalTransactionDO(convertGlobalTransactionDO(session));
} else if (LogOperation.BRANCH_ADD.equals(logOperation)) {
- logStore.insertBranchTransactionDO(convertBranchTransactionDO(session));
+ return logStore.insertBranchTransactionDO(convertBranchTransactionDO(session));
} else if (LogOperation.BRANCH_UPDATE.equals(logOperation)) {
- logStore.updateBranchTransactionDO(convertBranchTransactionDO(session));
+ return logStore.updateBranchTransactionDO(convertBranchTransactionDO(session));
} else if (LogOperation.BRANCH_REMOVE.equals(logOperation)) {
- logStore.deleteBranchTransactionDO(convertBranchTransactionDO(session));
+ return logStore.deleteBranchTransactionDO(convertBranchTransactionDO(session));
} else {
throw new StoreException("Unknown LogOperation:" + logOperation.name());
}
- return true;
}
/**
@@ -147,14 +149,29 @@ public class DatabaseTransactionStoreManager extends AbstractTransactionStoreMan
*/
@Override
public GlobalSession readSession(String xid) {
+ return this.readSession(xid, true);
+ }
+
+ /**
+ * Read session global session.
+ *
+ * @param xid the xid
+ * @param withBranchSessions the withBranchSessions
+ * @return the global session
+ */
+ @Override
+ public GlobalSession readSession(String xid, boolean withBranchSessions) {
//global transaction
GlobalTransactionDO globalTransactionDO = logStore.queryGlobalTransactionDO(xid);
if (globalTransactionDO == null) {
return null;
}
//branch transactions
- List<BranchTransactionDO> branchTransactionDOs = logStore.queryBranchTransactionDO(
- globalTransactionDO.getXid());
+ List<BranchTransactionDO> branchTransactionDOs = null;
+ //reduce rpc with db when branchRegister and getGlobalStatus
+ if (withBranchSessions) {
+ branchTransactionDOs = logStore.queryBranchTransactionDO(globalTransactionDO.getXid());
+ }
return getGlobalSession(globalTransactionDO, branchTransactionDOs);
}
@@ -169,18 +186,18 @@ public class DatabaseTransactionStoreManager extends AbstractTransactionStoreMan
for (int i = 0; i < statuses.length; i++) {
states[i] = statuses[i].getCode();
}
- List<GlobalSession> globalSessions = new ArrayList<GlobalSession>();
//global transaction
List<GlobalTransactionDO> globalTransactionDOs = logStore.queryGlobalTransactionDO(states, logQueryLimit);
if (CollectionUtils.isEmpty(globalTransactionDOs)) {
return null;
}
- for (GlobalTransactionDO globalTransactionDO : globalTransactionDOs) {
- List<BranchTransactionDO> branchTransactionDOs = logStore.queryBranchTransactionDO(
- globalTransactionDO.getXid());
- globalSessions.add(getGlobalSession(globalTransactionDO, branchTransactionDOs));
- }
- return globalSessions;
+ List<String> xids = globalTransactionDOs.stream().map(GlobalTransactionDO::getXid).collect(Collectors.toList());
+ List<BranchTransactionDO> branchTransactionDOs = logStore.queryBranchTransactionDO(xids);
+ Map<String, List<BranchTransactionDO>> branchTransactionDOsMap = branchTransactionDOs.stream()
+ .collect(Collectors.groupingBy(BranchTransactionDO::getXid, LinkedHashMap::new, Collectors.toList()));
+ return globalTransactionDOs.stream().map(globalTransactionDO ->
+ getGlobalSession(globalTransactionDO, branchTransactionDOsMap.get(globalTransactionDO.getXid())))
+ .collect(Collectors.toList());
}
@Override
@@ -205,6 +222,12 @@ public class DatabaseTransactionStoreManager extends AbstractTransactionStoreMan
return null;
}
+ @Override
+ public long getCurrentMaxSessionId() {
+ //check max transId or branchId
+ return logStore.getCurrentMaxSessionId(UUIDGenerator.getMaxUUID(), UUIDGenerator.getInitUUID());
+ }
+
private GlobalSession getGlobalSession(GlobalTransactionDO globalTransactionDO,
List<BranchTransactionDO> branchTransactionDOs) {
GlobalSession globalSession = convertGlobalSession(globalTransactionDO);
@@ -239,7 +262,6 @@ public class DatabaseTransactionStoreManager extends AbstractTransactionStoreMan
branchSession.setBranchType(BranchType.valueOf(branchTransactionDO.getBranchType()));
branchSession.setResourceId(branchTransactionDO.getResourceId());
branchSession.setClientId(branchTransactionDO.getClientId());
- branchSession.setLockKey(branchTransactionDO.getLockKey());
branchSession.setResourceGroupId(branchTransactionDO.getResourceGroupId());
branchSession.setStatus(BranchStatus.get(branchTransactionDO.getStatus()));
return branchSession;
@@ -277,7 +299,6 @@ public class DatabaseTransactionStoreManager extends AbstractTransactionStoreMan
branchTransactionDO.setBranchId(branchSession.getBranchId());
branchTransactionDO.setBranchType(branchSession.getBranchType().name());
branchTransactionDO.setClientId(branchSession.getClientId());
- branchTransactionDO.setLockKey(branchSession.getLockKey());
branchTransactionDO.setResourceGroupId(branchSession.getResourceGroupId());
branchTransactionDO.setTransactionId(branchSession.getTransactionId());
branchTransactionDO.setApplicationData(branchSession.getApplicationData());
@@ -303,4 +324,4 @@ public class DatabaseTransactionStoreManager extends AbstractTransactionStoreMan
public void setLogQueryLimit(int logQueryLimit) {
this.logQueryLimit = logQueryLimit;
}
-}
\ No newline at end of file
+}
diff --git a/server/src/main/java/io/seata/server/store/db/DbcpDataSourceGenerator.java b/server/src/main/java/io/seata/server/store/db/DbcpDataSourceGenerator.java
index 9c7187a6cc5b0b1624fd58a1ad73b2105b5c63d1..84beadfd0fc02423cc188612cefbbf327c34065a 100644
--- a/server/src/main/java/io/seata/server/store/db/DbcpDataSourceGenerator.java
+++ b/server/src/main/java/io/seata/server/store/db/DbcpDataSourceGenerator.java
@@ -25,7 +25,6 @@ import javax.sql.DataSource;
* The type Dbcp data source generator.
*
* @author zhangsen
- * @data 2019 /4/24
*/
@LoadLevel(name = "dbcp")
public class DbcpDataSourceGenerator extends AbstractDataSourceGenerator {
diff --git a/server/src/main/java/io/seata/server/store/db/DruidDataSourceGenerator.java b/server/src/main/java/io/seata/server/store/db/DruidDataSourceGenerator.java
index f438e81f8a4c5bfa40d23d0de1db61db69549d61..dd220ee4330b04eb60fadce575bc267bf088333b 100644
--- a/server/src/main/java/io/seata/server/store/db/DruidDataSourceGenerator.java
+++ b/server/src/main/java/io/seata/server/store/db/DruidDataSourceGenerator.java
@@ -25,7 +25,6 @@ import javax.sql.DataSource;
* The type Druid data source generator.
*
* @author zhangsen
- * @data 2019 /4/28
*/
@LoadLevel(name = "druid")
public class DruidDataSourceGenerator extends AbstractDataSourceGenerator {
diff --git a/server/src/main/java/io/seata/server/store/file/FileTransactionStoreManager.java b/server/src/main/java/io/seata/server/store/file/FileTransactionStoreManager.java
index 2dad9a287f2078b3844ea5162b51cf724b3e8e99..bb4cc061382674173c2b8e24e3151fcea311fed9 100644
--- a/server/src/main/java/io/seata/server/store/file/FileTransactionStoreManager.java
+++ b/server/src/main/java/io/seata/server/store/file/FileTransactionStoreManager.java
@@ -32,6 +32,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantLock;
+import io.seata.common.exception.NotSupportYetException;
import io.seata.common.exception.StoreException;
import io.seata.common.loader.LoadLevel;
import io.seata.common.thread.NamedThreadFactory;
@@ -53,7 +54,7 @@ import org.slf4j.LoggerFactory;
/**
* The type File transaction store manager.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
@LoadLevel(name = "file")
public class FileTransactionStoreManager extends AbstractTransactionStoreManager
@@ -122,6 +123,8 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
private static final int MAX_WAIT_FOR_FLUSH_TIME_MILLS = 2 * 1000;
+ private static final int MAX_WAIT_FOR_CLOSE_TIME_MILLS = 2 * 1000;
+
private static final int INT_BYTE_SIZE = 4;
/**
@@ -134,8 +137,7 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
public FileTransactionStoreManager(String fullFileName, SessionManager sessionManager) throws IOException {
initFile(fullFileName);
fileWriteExecutor = new ThreadPoolExecutor(MAX_THREAD_WRITE, MAX_THREAD_WRITE, Integer.MAX_VALUE,
- TimeUnit.MILLISECONDS,
- new LinkedBlockingQueue<Runnable>(),
+ TimeUnit.MILLISECONDS, new LinkedBlockingQueue<Runnable>(),
new NamedThreadFactory("fileTransactionStore", MAX_THREAD_WRITE, true));
writeDataFileRunnable = new WriteDataFileRunnable();
fileWriteExecutor.submit(writeDataFileRunnable);
@@ -162,7 +164,7 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
currRaf.seek(currDataFile.length());
currFileChannel = currRaf.getChannel();
} catch (IOException exx) {
- LOGGER.error("init file error," + exx.getMessage());
+ LOGGER.error("init file error,{}", exx.getMessage(), exx);
throw exx;
}
}
@@ -177,8 +179,8 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
}
lastModifiedTime = System.currentTimeMillis();
curFileTrxNum = FILE_TRX_NUM.incrementAndGet();
- if (curFileTrxNum % PER_FILE_BLOCK_SIZE == 0 &&
- (System.currentTimeMillis() - trxStartTimeMills) > MAX_TRX_TIMEOUT_MILLS) {
+ if (curFileTrxNum % PER_FILE_BLOCK_SIZE == 0
+ && (System.currentTimeMillis() - trxStartTimeMills) > MAX_TRX_TIMEOUT_MILLS) {
return saveHistory();
}
} catch (Exception exx) {
@@ -212,7 +214,9 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
boolean result;
try {
result = findTimeoutAndSave();
- writeDataFileRunnable.putRequest(new CloseFileRequest(currFileChannel, currRaf));
+ StoreRequest request = new CloseFileRequest(currFileChannel, currRaf);
+ writeDataFileRunnable.putRequest(request);
+ ((CloseFileRequest)request).waitForClose(MAX_WAIT_FOR_CLOSE_TIME_MILLS);
Files.move(currDataFile.toPath(), new File(hisFullFileName).toPath(), StandardCopyOption.REPLACE_EXISTING);
} catch (IOException exx) {
LOGGER.error("save history data file error, {}", exx.getMessage(), exx);
@@ -236,7 +240,8 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
}
bufferRemainingSize = writeBuffer.remaining();
if (bufferRemainingSize <= INT_BYTE_SIZE) {
- throw new IllegalStateException(String.format("Write buffer remaining size %d was too small", bufferRemainingSize));
+ throw new IllegalStateException(
+ String.format("Write buffer remaining size %d was too small", bufferRemainingSize));
}
writeBuffer.putInt(dataLength);
bufferRemainingSize = writeBuffer.remaining();
@@ -267,24 +272,24 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
}
private boolean findTimeoutAndSave() throws IOException {
- List<GlobalSession> globalSessionsOverMaxTimeout =
- sessionManager.findGlobalSessions(new SessionCondition(MAX_TRX_TIMEOUT_MILLS));
+ List<GlobalSession> globalSessionsOverMaxTimeout = sessionManager.findGlobalSessions(
+ new SessionCondition(MAX_TRX_TIMEOUT_MILLS));
if (CollectionUtils.isEmpty(globalSessionsOverMaxTimeout)) {
return true;
}
for (GlobalSession globalSession : globalSessionsOverMaxTimeout) {
TransactionWriteStore globalWriteStore = new TransactionWriteStore(globalSession, LogOperation.GLOBAL_ADD);
byte[] data = globalWriteStore.encode();
- if(!writeDataFrame(data)) {
+ if (!writeDataFrame(data)) {
return false;
}
List<BranchSession> branchSessIonsOverMaXTimeout = globalSession.getSortedBranches();
if (null != branchSessIonsOverMaXTimeout) {
for (BranchSession branchSession : branchSessIonsOverMaXTimeout) {
- TransactionWriteStore branchWriteStore =
- new TransactionWriteStore(branchSession, LogOperation.BRANCH_ADD);
+ TransactionWriteStore branchWriteStore = new TransactionWriteStore(branchSession,
+ LogOperation.BRANCH_ADD);
data = branchWriteStore.encode();
- if(!writeDataFrame(data)) {
+ if (!writeDataFrame(data)) {
return false;
}
}
@@ -327,11 +332,16 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
try {
currFileChannel.force(true);
} catch (IOException e) {
- LOGGER.error("filechannel force error", e);
+ LOGGER.error("fileChannel force error{}", e.getMessage(), e);
}
closeFile(currRaf);
}
+ @Override
+ public long getCurrentMaxSessionId() {
+ throw new NotSupportYetException("not support getCurrentMaxSessionId");
+ }
+
@Override
public List<TransactionWriteStore> readWriteStore(int readSize, boolean isHistory) {
File file = null;
@@ -405,13 +415,13 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
break;
}
} catch (Exception ex) {
- LOGGER.error("decode data file error:" + ex.getMessage());
+ LOGGER.error("decode data file error:{}", ex.getMessage(), ex);
break;
}
}
return transactionWriteStores;
} catch (IOException exx) {
- LOGGER.error("parse data file error:" + exx.getMessage() + ",file:" + file.getName());
+ LOGGER.error("parse data file error:{},file:{}", exx.getMessage(), file.getName(), exx);
return null;
} finally {
try {
@@ -424,7 +434,7 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
}
closeFile(raf);
} catch (IOException exx) {
- LOGGER.error("file close error," + exx.getMessage());
+ LOGGER.error("file close error{}", exx.getMessage(), exx);
}
}
@@ -442,7 +452,7 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
raf = null;
}
} catch (IOException exx) {
- LOGGER.error("file close error," + exx.getMessage());
+ LOGGER.error("file close error,{}", exx.getMessage(), exx);
}
}
@@ -463,11 +473,11 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
currFileChannel.write(byteBuffer);
}
return true;
- } catch (IOException exx) {
- LOGGER.error("write data file error:" + exx.getMessage());
+ } catch (Exception exx) {
+ LOGGER.error("write data file error:{}", exx.getMessage(), exx);
}
}
- LOGGER.error("write dataFile failed,retry more than :" + MAX_WRITE_RETRY);
+ LOGGER.error("write dataFile failed,retry more than :{}", MAX_WRITE_RETRY);
return false;
}
@@ -502,7 +512,7 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
super(curFileTrxNum, curFileChannel);
}
- public void wakeupCustomer() {
+ public void wakeup() {
this.countDownLatch.countDown();
}
@@ -524,7 +534,7 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
}
static class CloseFileRequest implements StoreRequest {
-
+ private final CountDownLatch countDownLatch = new CountDownLatch(1);
private FileChannel fileChannel;
private RandomAccessFile file;
@@ -541,6 +551,18 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
public RandomAccessFile getFile() {
return file;
}
+
+ public void wakeup() {
+ this.countDownLatch.countDown();
+ }
+
+ public void waitForClose(long timeout) {
+ try {
+ this.countDownLatch.await(timeout, TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ LOGGER.error("Interrupted", e);
+ }
+ }
}
/**
@@ -594,7 +616,8 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
long diff = FILE_TRX_NUM.get() - FILE_FLUSH_NUM.get();
flush(req.getFileChannel());
FILE_FLUSH_NUM.addAndGet(diff);
- closeFile(currRaf);
+ closeFile(req.getFile());
+ req.wakeup();
}
private void async(AsyncFlushRequest req) {
@@ -610,7 +633,7 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
FILE_FLUSH_NUM.addAndGet(diff);
}
// notify
- req.wakeupCustomer();
+ req.wakeup();
}
private void flushOnCondition(FileChannel fileChannel) {
@@ -621,8 +644,7 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
if (diff == 0) {
return;
}
- if (diff % MAX_FLUSH_NUM == 0 ||
- System.currentTimeMillis() - lastModifiedTime > MAX_FLUSH_TIME_MILLS) {
+ if (diff % MAX_FLUSH_NUM == 0 || System.currentTimeMillis() - lastModifiedTime > MAX_FLUSH_TIME_MILLS) {
flush(fileChannel);
FILE_FLUSH_NUM.addAndGet(diff);
}
@@ -632,7 +654,7 @@ public class FileTransactionStoreManager extends AbstractTransactionStoreManager
try {
fileChannel.force(false);
} catch (IOException exx) {
- LOGGER.error("flush error:" + exx.getMessage());
+ LOGGER.error("flush error: {}", exx.getMessage(), exx);
}
}
}
diff --git a/server/src/main/resources/README-zh.md b/server/src/main/resources/README-zh.md
new file mode 100644
index 0000000000000000000000000000000000000000..f46a0446fa91921b134c029b21a82020324527a6
--- /dev/null
+++ b/server/src/main/resources/README-zh.md
@@ -0,0 +1,27 @@
+# 脚本说明
+
+## client
+
+> 存放用于客户端的配置和SQL
+
+- at: AT模式下的 `undo_log` 建表语句
+- conf: 客户端的配置文件
+- saga: SAGA 模式下所需表的建表语句
+- spring: SpringBoot 应用支持的配置文件
+
+## server
+
+> 存放server侧所需SQL
+
+- db: server 侧的保存模式为 `db` 时所需表的建表语句
+
+## config-center
+
+> 用于存放各种配置中心的初始化脚本，执行时都会读取 `config.txt`配置文件，并写入配置中心
+
+- nacos: 用于向 Nacos 中添加配置
+- zk: 用于向 Zookeeper 中添加配置，脚本依赖 Zookeeper 的相关脚本，需要手动下载；ZooKeeper相关的配置可以写在 `zk-params.txt` 中，也可以在执行的时候输入
+- apollo: 向 Apollo 中添加配置，Apollo 的地址端口等可以写在 `apollo-params.txt`，也可以在执行的时候输入
+- etcd3: 用于向 Etcd3 中添加配置
+- consul: 用于向 consul 中添加配置
+
diff --git a/server/src/main/resources/README.md b/server/src/main/resources/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..13263be5f2717821c21461a3034b760ad4e39a5e
--- /dev/null
+++ b/server/src/main/resources/README.md
@@ -0,0 +1,27 @@
+# Script Description
+
+## client
+
+> Store configuration and SQL for client side
+
+- at: Script of create table `undo_log` for AT mode.
+- conf: Configuration which client need.
+- saga: Script of create table in SAGA mode
+- spring: Configuration for Spring Boot
+
+## server
+
+> Store SQL for server side
+
+- db: Create table script for server when store mode is `db`
+
+## config-center
+
+> Store initialize script for configuration center, will use `config.txt` as configuration when initial
+
+- nacos: Initialize script for Nacos
+- zk: Initialize script for ZooKeeper, the script need related script in Zookeeper, you need download yourself. You can modify `zk-params.txt` to change the ZooKeeper server configuration, or input when execute also
+- apollo: Initialize script for Apollo. You can modify `apollo-params.txt` to change the Apollo server configuration, or input when execute also
+- etcd3: Initialize script for Etcd3
+- consul: Initialize script for consul
+
diff --git a/server/src/main/resources/db_store.sql b/server/src/main/resources/db_store.sql
deleted file mode 100644
index 919237083ffa35cf663a540a7bb05a664fef8957..0000000000000000000000000000000000000000
--- a/server/src/main/resources/db_store.sql
+++ /dev/null
@@ -1,52 +0,0 @@
--- the table to store GlobalSession data
-drop table if exists `global_table`;
-create table `global_table` (
- `xid` varchar(128) not null,
- `transaction_id` bigint,
- `status` tinyint not null,
- `application_id` varchar(32),
- `transaction_service_group` varchar(32),
- `transaction_name` varchar(128),
- `timeout` int,
- `begin_time` bigint,
- `application_data` varchar(2000),
- `gmt_create` datetime,
- `gmt_modified` datetime,
- primary key (`xid`),
- key `idx_gmt_modified_status` (`gmt_modified`, `status`),
- key `idx_transaction_id` (`transaction_id`)
-);
-
--- the table to store BranchSession data
-drop table if exists `branch_table`;
-create table `branch_table` (
- `branch_id` bigint not null,
- `xid` varchar(128) not null,
- `transaction_id` bigint ,
- `resource_group_id` varchar(32),
- `resource_id` varchar(256) ,
- `lock_key` varchar(128) ,
- `branch_type` varchar(8) ,
- `status` tinyint,
- `client_id` varchar(64),
- `application_data` varchar(2000),
- `gmt_create` datetime,
- `gmt_modified` datetime,
- primary key (`branch_id`),
- key `idx_xid` (`xid`)
-);
-
--- the table to store lock data
-drop table if exists `lock_table`;
-create table `lock_table` (
- `row_key` varchar(128) not null,
- `xid` varchar(96),
- `transaction_id` long ,
- `branch_id` long,
- `resource_id` varchar(256) ,
- `table_name` varchar(32) ,
- `pk` varchar(36) ,
- `gmt_create` datetime ,
- `gmt_modified` datetime,
- primary key(`row_key`)
-);
diff --git a/server/src/main/resources/db_undo_log.sql b/server/src/main/resources/db_undo_log.sql
deleted file mode 100644
index f87b7cdd78be420577b5b6c59fb0e2ea08db154f..0000000000000000000000000000000000000000
--- a/server/src/main/resources/db_undo_log.sql
+++ /dev/null
@@ -1,19 +0,0 @@
--- the table to store seata xid data
--- 0.7.0+ add context
--- you must to init this sql for you business databese. the seata server not need it.
--- 此脚本必须初始化在你当前的业务数据库中，用于AT 模式XID记录。与server端无关（注：业务数据库）
--- 注意此处0.3.0+ 增加唯一索引 ux_undo_log
-drop table `undo_log`;
-CREATE TABLE `undo_log` (
- `id` bigint(20) NOT NULL AUTO_INCREMENT,
- `branch_id` bigint(20) NOT NULL,
- `xid` varchar(100) NOT NULL,
- `context` varchar(128) NOT NULL,
- `rollback_info` longblob NOT NULL,
- `log_status` int(11) NOT NULL,
- `log_created` datetime NOT NULL,
- `log_modified` datetime NOT NULL,
- `ext` varchar(100) DEFAULT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`)
-) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
\ No newline at end of file
diff --git a/server/src/main/resources/file.conf b/server/src/main/resources/file.conf
index 9967e90aad6e7e62287beafad9ad0d6fc8a85bd4..d9f7dd88f2a67a487c899823afc5ac7637ae3f2b 100644
--- a/server/src/main/resources/file.conf
+++ b/server/src/main/resources/file.conf
@@ -1,78 +1,24 @@
-transport {
- # tcp udt unix-domain-socket
- type = "TCP"
- #NIO NATIVE
- server = "NIO"
- #enable heartbeat
- heartbeat = true
- #thread factory for netty
- thread-factory {
- boss-thread-prefix = "NettyBoss"
- worker-thread-prefix = "NettyServerNIOWorker"
- server-executor-thread-prefix = "NettyServerBizHandler"
- share-boss-worker = false
- client-selector-thread-prefix = "NettyClientSelector"
- client-selector-thread-size = 1
- client-worker-thread-prefix = "NettyClientWorkerThread"
- # netty boss thread size,will not be used for UDT
- boss-thread-size = 1
- #auto default pin or 8
- worker-thread-size = 8
- }
- shutdown {
- # when destroy server, wait seconds
- wait = 3
- }
- serialization = "seata"
- compressor = "none"
-}
service {
- #vgroup->rgroup
+ #transaction service group mapping
vgroup_mapping.my_test_tx_group = "default"
- #only support single node
+ #only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8091"
- #degrade current not support
- enableDegrade = false
- #disable
- disable = false
- #unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent
- max.commit.retry.timeout = "-1"
- max.rollback.retry.timeout = "-1"
-}
-
-client {
- async.commit.buffer.limit = 10000
- lock {
- retry.internal = 10
- retry.times = 30
- }
- report.retry.count = 5
- tm.commit.retry.count = 1
- tm.rollback.retry.count = 1
+ #disable seata
+ disableGlobalTransaction = false
}
-## transaction log store
+## transaction log store, only used in seata-server
store {
## store mode: file、db
mode = "file"
- ## file store
+ ## file store property
file {
+ ## store location dir
dir = "sessionStore"
-
- # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
- max-branch-session-size = 16384
- # globe session size , if exceeded throws exceptions
- max-global-session-size = 512
- # file buffer size , if exceeded allocate new buffer
- file-write-buffer-cache-size = 16384
- # when recover batch read size
- session.reload.read_size = 100
- # async, sync
- flush-disk-mode = async
}
- ## database store
+ ## database store property
db {
## the implement of javax.sql.DataSource, such as DruidDataSource(druid)/BasicDataSource(dbcp) etc.
datasource = "dbcp"
@@ -82,59 +28,5 @@ store {
url = "jdbc:mysql://127.0.0.1:3306/seata"
user = "mysql"
password = "mysql"
- min-conn = 1
- max-conn = 3
- global.table = "global_table"
- branch.table = "branch_table"
- lock-table = "lock_table"
- query-limit = 100
- }
-}
-lock {
- ## the lock store mode: local、remote
- mode = "remote"
-
- local {
- ## store locks in user's database
- }
-
- remote {
- ## store locks in the seata's server
- }
-}
-recovery {
- #schedule committing retry period in milliseconds
- committing-retry-period = 1000
- #schedule asyn committing retry period in milliseconds
- asyn-committing-retry-period = 1000
- #schedule rollbacking retry period in milliseconds
- rollbacking-retry-period = 1000
- #schedule timeout retry period in milliseconds
- timeout-retry-period = 1000
-}
-
-transaction {
- undo.data.validation = true
- undo.log.serialization = "jackson"
- undo.log.save.days = 7
- #schedule delete expired undo_log in milliseconds
- undo.log.delete.period = 86400000
- undo.log.table = "undo_log"
-}
-
-## metrics settings
-metrics {
- enabled = false
- registry-type = "compact"
- # multi exporters use comma divided
- exporter-list = "prometheus"
- exporter-prometheus-port = 9898
-}
-
-support {
- ## spring
- spring {
- # auto proxy the DataSource bean
- datasource.autoproxy = false
}
}
\ No newline at end of file
diff --git a/server/src/main/resources/file.conf.example b/server/src/main/resources/file.conf.example
new file mode 100644
index 0000000000000000000000000000000000000000..e98f96203472cd28394080ef52ef42ca0a4f92a7
--- /dev/null
+++ b/server/src/main/resources/file.conf.example
@@ -0,0 +1,136 @@
+transport {
+ # tcp udt unix-domain-socket
+ type = "TCP"
+ #NIO NATIVE
+ server = "NIO"
+ #enable heartbeat
+ heartbeat = true
+ #thread factory for netty
+ thread-factory {
+ boss-thread-prefix = "NettyBoss"
+ worker-thread-prefix = "NettyServerNIOWorker"
+ server-executor-thread-prefix = "NettyServerBizHandler"
+ share-boss-worker = false
+ client-selector-thread-prefix = "NettyClientSelector"
+ client-selector-thread-size = 1
+ client-worker-thread-prefix = "NettyClientWorkerThread"
+ # netty boss thread size,will not be used for UDT
+ boss-thread-size = 1
+ #auto default pin or 8
+ worker-thread-size = 8
+ }
+ shutdown {
+ # when destroy server, wait seconds
+ wait = 3
+ }
+ serialization = "seata"
+ compressor = "none"
+}
+service {
+ #transaction service group mapping
+ vgroup_mapping.my_test_tx_group = "default"
+ #only support when registry.type=file, please don't set multiple addresses
+ default.grouplist = "127.0.0.1:8091"
+ #degrade, current not support
+ enableDegrade = false
+ #disable seata
+ disableGlobalTransaction = false
+}
+
+client {
+ rm {
+ async.commit.buffer.limit = 10000
+ lock {
+ retry.internal = 10
+ retry.times = 30
+ retry.policy.branch-rollback-on-conflict = true
+ }
+ report.retry.count = 5
+ table.meta.check.enable = false
+ report.success.enable = true
+ }
+ tm {
+ commit.retry.count = 5
+ rollback.retry.count = 5
+ }
+ undo {
+ data.validation = true
+ log.serialization = "jackson"
+ log.table = "undo_log"
+ }
+ log {
+ exceptionRate = 100
+ }
+ support {
+ # auto proxy the DataSource bean
+ spring.datasource.autoproxy = false
+ }
+}
+
+## transaction log store
+store {
+ ## store mode: file、db
+ mode = "file"
+ ## file store property
+ file {
+ ## store location dir
+ dir = "sessionStore"
+ # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
+ max-branch-session-size = 16384
+ # globe session size , if exceeded throws exceptions
+ max-global-session-size = 512
+ # file buffer size , if exceeded allocate new buffer
+ file-write-buffer-cache-size = 16384
+ # when recover batch read size
+ session.reload.read_size = 100
+ # async, sync
+ flush-disk-mode = async
+ }
+
+ ## database store property
+ db {
+ ## the implement of javax.sql.DataSource, such as DruidDataSource(druid)/BasicDataSource(dbcp) etc.
+ datasource = "dbcp"
+ ## mysql/oracle/h2/oceanbase etc.
+ db-type = "mysql"
+ driver-class-name = "com.mysql.jdbc.Driver"
+ url = "jdbc:mysql://127.0.0.1:3306/seata"
+ user = "mysql"
+ password = "mysql"
+ min-conn = 1
+ max-conn = 10
+ global.table = "global_table"
+ branch.table = "branch_table"
+ lock-table = "lock_table"
+ query-limit = 100
+ }
+}
+server {
+ recovery {
+ #schedule committing retry period in milliseconds
+ committing-retry-period = 1000
+ #schedule asyn committing retry period in milliseconds
+ asyn-committing-retry-period = 1000
+ #schedule rollbacking retry period in milliseconds
+ rollbacking-retry-period = 1000
+ #schedule timeout retry period in milliseconds
+ timeout-retry-period = 1000
+ }
+ undo {
+ log.save.days = 7
+ #schedule delete expired undo_log in milliseconds
+ log.delete.period = 86400000
+ }
+ #unit ms,s,m,h,d represents milliseconds, seconds, minutes, hours, days, default permanent
+ max.commit.retry.timeout = "-1"
+ max.rollback.retry.timeout = "-1"
+}
+
+## metrics settings
+metrics {
+ enabled = false
+ registry-type = "compact"
+ # multi exporters use comma divided
+ exporter-list = "prometheus"
+ exporter-prometheus-port = 9898
+}
\ No newline at end of file
diff --git a/server/src/main/resources/nacos-config.sh b/server/src/main/resources/nacos-config.sh
deleted file mode 100755
index 866b916fdad123817abc4a157d22d2c9ce98c639..0000000000000000000000000000000000000000
--- a/server/src/main/resources/nacos-config.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-if [ $# != 1 ]; then
-echo "./nacos-config.sh nacosIp"
-exit -1
-fi
-
-nacosIp=$1
-echo "set nacosIp=$nacosIp"
-error=0
-
-for line in $(cat nacos-config.txt)
-
-do
-
-key=${line%%=*}
-value=${line#*=}
-echo "\r\n set "${key}" = "${value}
-
-result=`curl -X POST "http://$nacosIp:8848/nacos/v1/cs/configs?dataId=$key&group=SEATA_GROUP&content=$value"`
-
-if [ "$result"x == "true"x ]; then
-
- echo "\033[42;37m $result \033[0m"
-
-else
-
- echo "\033[41;37 $result \033[0m"
- let error++
-
-fi
-
-done
-
-
-if [ $error -eq 0 ]; then
-
-echo "\r\n\033[42;37m init nacos config finished, please start seata-server. \033[0m"
-
-else
-
-echo "\r\n\033[41;33m init nacos config fail. \033[0m"
-
-fi
\ No newline at end of file
diff --git a/server/src/test/java/ServerTest.java b/server/src/test/java/ServerTest.java
index 0e5812ff1854d567fc0bb2d71c432dc341a9eb34..d957debcd0c965bd2004a0b3713370bf76a4509b 100644
--- a/server/src/test/java/ServerTest.java
+++ b/server/src/test/java/ServerTest.java
@@ -26,8 +26,7 @@ import java.util.concurrent.TimeUnit;
/**
* The type Server test.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/4
+ * @author slievrly
*/
public class ServerTest {
diff --git a/server/src/test/java/WriteStoreMultithreadTest.java b/server/src/test/java/WriteStoreMultithreadTest.java
index 360759f5b69f78f9b95858b1dc8fcda5cab3ee43..ce82229c9e68bd635156070529ab08a20d74972a 100644
--- a/server/src/test/java/WriteStoreMultithreadTest.java
+++ b/server/src/test/java/WriteStoreMultithreadTest.java
@@ -59,6 +59,11 @@ public class WriteStoreMultithreadTest {
return null;
}
+ @Override
+ public GlobalSession findGlobalSession(String xid, boolean withBranchSessions) {
+ return null;
+ }
+
@Override
public void updateGlobalSessionStatus(GlobalSession session, GlobalStatus status)
diff --git a/server/src/test/java/WriteStoreTest.java b/server/src/test/java/WriteStoreTest.java
index d2056f75f63421b0bd322368d4f5a8a08cbbf512..9eafafa4d9e758e1164127af4755238603a86e22 100644
--- a/server/src/test/java/WriteStoreTest.java
+++ b/server/src/test/java/WriteStoreTest.java
@@ -38,8 +38,7 @@ import io.seata.server.store.file.FileTransactionStoreManager;
/**
* The type Write store test.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/13
+ * @author slievrly
* write cost:87281,read cost:158922 65535*5 1000 per open init 1024 write cost:86454,read
* cost:160541 65535*5 2000 per open init 1024 write cost:82953,read cost:157736 65535*5 2000 per open init
* 65535*5*9 write cost:115079,read cost:163664 65535*5 2000 per open init 65535*5*9 schedule flush 10||2s
@@ -77,6 +76,11 @@ public class WriteStoreTest {
return null;
}
+ @Override
+ public GlobalSession findGlobalSession(String xid, boolean withBranchSessions) {
+ return null;
+ }
+
@Override
public void updateGlobalSessionStatus(GlobalSession session, GlobalStatus status)
throws TransactionException {
diff --git a/server/src/test/java/io/seata/server/ParameterParserTest.java b/server/src/test/java/io/seata/server/ParameterParserTest.java
index b72bdc71b80eea31ea025e7946f8a45da373801c..483dcf7ad51642033350abbe5b6ab13c13cf6166 100644
--- a/server/src/test/java/io/seata/server/ParameterParserTest.java
+++ b/server/src/test/java/io/seata/server/ParameterParserTest.java
@@ -24,7 +24,6 @@ import org.junit.jupiter.api.Test;
* The type parameter parser test
*
* @author xingfudeshi@gmail.com
- * @date 2019/05/30
*/
public class ParameterParserTest {
private static ParameterParser parameterParser = null;
diff --git a/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorMetricsTest.java b/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorMetricsTest.java
index fe485ca21cfccf8394912e22962ef1af1ceda3f6..e02d9697243349d68ff7ed755f2c6219ab26885f 100644
--- a/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorMetricsTest.java
+++ b/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorMetricsTest.java
@@ -44,91 +44,95 @@ public class DefaultCoordinatorMetricsTest {
SessionHolder.init(null);
DefaultCoordinator coordinator = new DefaultCoordinator(null);
coordinator.init();
-
- MetricsManager.get().init();
-
- //start a transaction
- GlobalBeginRequest request = new GlobalBeginRequest();
- request.setTransactionName("test_transaction");
- GlobalBeginResponse response = new GlobalBeginResponse();
- coordinator.doGlobalBegin(request, response, new RpcContext());
-
- Map<String, Measurement> measurements = new HashMap<>();
- MetricsManager.get().getRegistry().measure().forEach(
- measurement -> measurements.put(measurement.getId().toString(), measurement));
-
- Assertions.assertEquals(1, measurements.size());
- Assertions.assertEquals(1,
- measurements.get("seata.transaction(meter=counter,role=tc,status=active)").getValue(), 0);
-
- //commit this transaction
- GlobalCommitRequest commitRequest = new GlobalCommitRequest();
- commitRequest.setXid(response.getXid());
- coordinator.doGlobalCommit(commitRequest, new GlobalCommitResponse(), new RpcContext());
-
- //we need sleep for a short while because default canBeCommittedAsync() is true
- Thread.sleep(200);
-
- measurements.clear();
- MetricsManager.get().getRegistry().measure().forEach(
- measurement -> measurements.put(measurement.getId().toString(), measurement));
- Assertions.assertEquals(9, measurements.size());
- Assertions.assertEquals(0,
- measurements.get("seata.transaction(meter=counter,role=tc,status=active)").getValue(), 0);
- Assertions
- .assertEquals(1, measurements.get("seata.transaction(meter=counter,role=tc,status=committed)").getValue(),
- 0);
- Assertions.assertEquals(1,
- measurements.get("seata.transaction(meter=summary,role=tc,statistic=count,status=committed)").getValue(),
- 0);
- Assertions.assertEquals(1,
- measurements.get("seata.transaction(meter=summary,role=tc,statistic=total,status=committed)").getValue(),
- 0);
- Assertions.assertEquals(1,
- measurements.get("seata.transaction(meter=timer,role=tc,statistic=count,status=committed)").getValue(), 0);
-
- //start another new transaction
- request = new GlobalBeginRequest();
- request.setTransactionName("test_transaction_2");
- response = new GlobalBeginResponse();
- coordinator.doGlobalBegin(request, response, new RpcContext());
-
- //rollback this transaction
- GlobalRollbackRequest rollbackRequest = new GlobalRollbackRequest();
- rollbackRequest.setXid(response.getXid());
- coordinator.doGlobalRollback(rollbackRequest, new GlobalRollbackResponse(), new RpcContext());
-
- Thread.sleep(200);
-
- measurements.clear();
- MetricsManager.get().getRegistry().measure().forEach(
- measurement -> measurements.put(measurement.getId().toString(), measurement));
- Assertions.assertEquals(17, measurements.size());
- Assertions.assertEquals(0,
- measurements.get("seata.transaction(meter=counter,role=tc,status=active)").getValue(), 0);
-
- Assertions
- .assertEquals(1, measurements.get("seata.transaction(meter=counter,role=tc,status=committed)").getValue(),
- 0);
- Assertions.assertEquals(0,
- measurements.get("seata.transaction(meter=summary,role=tc,statistic=count,status=committed)").getValue(),
- 0);
- Assertions.assertEquals(0,
- measurements.get("seata.transaction(meter=summary,role=tc,statistic=total,status=committed)").getValue(),
- 0);
- Assertions.assertEquals(0,
- measurements.get("seata.transaction(meter=timer,role=tc,statistic=count,status=committed)").getValue(), 0);
-
- Assertions.assertEquals(1,
- measurements.get("seata.transaction(meter=counter,role=tc,status=rollbacked)").getValue(), 0);
- Assertions.assertEquals(1,
- measurements.get("seata.transaction(meter=summary,role=tc,statistic=count,status=rollbacked)").getValue(),
- 0);
- Assertions.assertEquals(1,
- measurements.get("seata.transaction(meter=summary,role=tc,statistic=total,status=rollbacked)").getValue(),
- 0);
- Assertions.assertEquals(1,
- measurements.get("seata.transaction(meter=timer,role=tc,statistic=count,status=rollbacked)").getValue(), 0);
+ try {
+ MetricsManager.get().init();
+
+ //start a transaction
+ GlobalBeginRequest request = new GlobalBeginRequest();
+ request.setTransactionName("test_transaction");
+ GlobalBeginResponse response = new GlobalBeginResponse();
+ coordinator.doGlobalBegin(request, response, new RpcContext());
+
+ Map<String, Measurement> measurements = new HashMap<>();
+ MetricsManager.get().getRegistry().measure().forEach(
+ measurement -> measurements.put(measurement.getId().toString(), measurement));
+
+ Assertions.assertEquals(1, measurements.size());
+ Assertions.assertEquals(1,
+ measurements.get("seata.transaction(meter=counter,role=tc,status=active)").getValue(), 0);
+
+ //commit this transaction
+ GlobalCommitRequest commitRequest = new GlobalCommitRequest();
+ commitRequest.setXid(response.getXid());
+ coordinator.doGlobalCommit(commitRequest, new GlobalCommitResponse(), new RpcContext());
+
+ //we need sleep for a short while because default canBeCommittedAsync() is true
+ Thread.sleep(200);
+
+ measurements.clear();
+ MetricsManager.get().getRegistry().measure().forEach(
+ measurement -> measurements.put(measurement.getId().toString(), measurement));
+ Assertions.assertEquals(9, measurements.size());
+ Assertions.assertEquals(0,
+ measurements.get("seata.transaction(meter=counter,role=tc,status=active)").getValue(), 0);
+ Assertions
+ .assertEquals(1, measurements.get("seata.transaction(meter=counter,role=tc,status=committed)").getValue(),
+ 0);
+ Assertions.assertEquals(1,
+ measurements.get("seata.transaction(meter=summary,role=tc,statistic=count,status=committed)").getValue(),
+ 0);
+ Assertions.assertEquals(1,
+ measurements.get("seata.transaction(meter=summary,role=tc,statistic=total,status=committed)").getValue(),
+ 0);
+ Assertions.assertEquals(1,
+ measurements.get("seata.transaction(meter=timer,role=tc,statistic=count,status=committed)").getValue(), 0);
+
+ //start another new transaction
+ request = new GlobalBeginRequest();
+ request.setTransactionName("test_transaction_2");
+ response = new GlobalBeginResponse();
+ coordinator.doGlobalBegin(request, response, new RpcContext());
+
+ //rollback this transaction
+ GlobalRollbackRequest rollbackRequest = new GlobalRollbackRequest();
+ rollbackRequest.setXid(response.getXid());
+ coordinator.doGlobalRollback(rollbackRequest, new GlobalRollbackResponse(), new RpcContext());
+
+ Thread.sleep(200);
+
+ measurements.clear();
+ MetricsManager.get().getRegistry().measure().forEach(
+ measurement -> measurements.put(measurement.getId().toString(), measurement));
+ Assertions.assertEquals(17, measurements.size());
+ Assertions.assertEquals(0,
+ measurements.get("seata.transaction(meter=counter,role=tc,status=active)").getValue(), 0);
+
+ Assertions
+ .assertEquals(1, measurements.get("seata.transaction(meter=counter,role=tc,status=committed)").getValue(),
+ 0);
+ Assertions.assertEquals(0,
+ measurements.get("seata.transaction(meter=summary,role=tc,statistic=count,status=committed)").getValue(),
+ 0);
+ Assertions.assertEquals(0,
+ measurements.get("seata.transaction(meter=summary,role=tc,statistic=total,status=committed)").getValue(),
+ 0);
+ Assertions.assertEquals(0,
+ measurements.get("seata.transaction(meter=timer,role=tc,statistic=count,status=committed)").getValue(), 0);
+
+ Assertions.assertEquals(1,
+ measurements.get("seata.transaction(meter=counter,role=tc,status=rollbacked)").getValue(), 0);
+ Assertions.assertEquals(1,
+ measurements.get("seata.transaction(meter=summary,role=tc,statistic=count,status=rollbacked)").getValue(),
+ 0);
+ Assertions.assertEquals(1,
+ measurements.get("seata.transaction(meter=summary,role=tc,statistic=total,status=rollbacked)").getValue(),
+ 0);
+ Assertions.assertEquals(1,
+ measurements.get("seata.transaction(meter=timer,role=tc,statistic=count,status=rollbacked)").getValue(), 0);
+ } finally {
+ coordinator.destroy();
+ SessionHolder.destroy();
+ }
}
}
diff --git a/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorTest.java b/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorTest.java
index c681f73b025eaef1792f96ad23f9c58122edf395..a1bc248b794dc3141b958c2b6c5e328c303fdab4 100644
--- a/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorTest.java
+++ b/server/src/test/java/io/seata/server/coordinator/DefaultCoordinatorTest.java
@@ -140,6 +140,8 @@ public class DefaultCoordinatorTest {
for (GlobalSession globalSession : globalSessions) {
globalSession.closeAndClean();
}
+
+ SessionHolder.destroy();
}
static Stream<Arguments> xidAndBranchIdProviderForCommit() throws Exception {
diff --git a/server/src/test/java/io/seata/server/coordinator/DefaultCoreTest.java b/server/src/test/java/io/seata/server/coordinator/DefaultCoreTest.java
index 71ef3568c51c218a631a14bc9ff31d5a8621d113..9581f2ffb61206b7f2fedfcd0d7aa5333ab5aa3a 100644
--- a/server/src/test/java/io/seata/server/coordinator/DefaultCoreTest.java
+++ b/server/src/test/java/io/seata/server/coordinator/DefaultCoreTest.java
@@ -27,9 +27,10 @@ import io.seata.server.session.BranchSession;
import io.seata.server.session.GlobalSession;
import io.seata.server.session.SessionHelper;
import io.seata.server.session.SessionHolder;
+import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
@@ -70,11 +71,19 @@ public class DefaultCoreTest {
*
* @throws Exception the exception
*/
- @BeforeEach
- public void initSessionManager() throws Exception {
+ @BeforeAll
+ public static void initSessionManager() throws Exception {
SessionHolder.init(null);
}
+ /**
+ * Destroy session manager.
+ */
+ @AfterAll
+ public static void destroySessionManager() {
+ SessionHolder.destroy();
+ }
+
/**
* Clean.
*
diff --git a/server/src/test/java/io/seata/server/event/DefaultCoreForEventBusTest.java b/server/src/test/java/io/seata/server/event/DefaultCoreForEventBusTest.java
index 31c76fa5bdd18dc5c9064de59e141cc99a8d93e0..b82fd282939bd669f38d641b0f12e2354e0e428c 100644
--- a/server/src/test/java/io/seata/server/event/DefaultCoreForEventBusTest.java
+++ b/server/src/test/java/io/seata/server/event/DefaultCoreForEventBusTest.java
@@ -57,49 +57,52 @@ public class DefaultCoreForEventBusTest {
counter.addAndGet(1);
}
}
-
SessionHolder.init(null);
DefaultCoordinator coordinator = new DefaultCoordinator(null);
coordinator.init();
+ try {
+ Core core = CoreFactory.get();
- Core core = CoreFactory.get();
-
- GlobalTransactionEventSubscriber subscriber = new GlobalTransactionEventSubscriber();
- EventBusManager.get().register(subscriber);
+ GlobalTransactionEventSubscriber subscriber = new GlobalTransactionEventSubscriber();
+ EventBusManager.get().register(subscriber);
- //start a transaction
- String xid = core.begin("test_app_id", "default_group", "test_tran_name", 30000);
+ //start a transaction
+ String xid = core.begin("test_app_id", "default_group", "test_tran_name", 30000);
- Assertions.assertEquals(1, subscriber.getEventCounters().get(GlobalStatus.Begin).get());
+ Assertions.assertEquals(1, subscriber.getEventCounters().get(GlobalStatus.Begin).get());
- //commit this transaction
- core.commit(xid);
+ //commit this transaction
+ core.commit(xid);
- //we need sleep for a short while because default canBeCommittedAsync() is true
- Thread.sleep(1000);
+ //we need sleep for a short while because default canBeCommittedAsync() is true
+ Thread.sleep(1000);
- //check
- Assertions.assertEquals(1, subscriber.getEventCounters().get(GlobalStatus.AsyncCommitting).get());
- Assertions.assertEquals(1, subscriber.getEventCounters().get(GlobalStatus.Committed).get());
+ //check
+ Assertions.assertEquals(1, subscriber.getEventCounters().get(GlobalStatus.AsyncCommitting).get());
+ Assertions.assertEquals(1, subscriber.getEventCounters().get(GlobalStatus.Committed).get());
- //start another new transaction
- xid = core.begin("test_app_id", "default_group", "test_tran_name2", 30000);
+ //start another new transaction
+ xid = core.begin("test_app_id", "default_group", "test_tran_name2", 30000);
- Assertions.assertEquals(2, subscriber.getEventCounters().get(GlobalStatus.Begin).get());
+ Assertions.assertEquals(2, subscriber.getEventCounters().get(GlobalStatus.Begin).get());
- core.rollback(xid);
+ core.rollback(xid);
- //check
- Assertions.assertEquals(1, subscriber.getEventCounters().get(GlobalStatus.Rollbacking).get());
- Assertions.assertEquals(1, subscriber.getEventCounters().get(GlobalStatus.Rollbacked).get());
+ //check
+ Assertions.assertEquals(1, subscriber.getEventCounters().get(GlobalStatus.Rollbacking).get());
+ Assertions.assertEquals(1, subscriber.getEventCounters().get(GlobalStatus.Rollbacked).get());
- //start more one new transaction for test timeout and let this transaction immediately timeout
- xid = core.begin("test_app_id", "default_group", "test_tran_name3", 0);
+ //start more one new transaction for test timeout and let this transaction immediately timeout
+ xid = core.begin("test_app_id", "default_group", "test_tran_name3", 0);
- //sleep for check -> DefaultCoordinator.timeoutCheck
- Thread.sleep(1000);
+ //sleep for check -> DefaultCoordinator.timeoutCheck
+ Thread.sleep(1000);
- //at lease retry once because DefaultCoordinator.timeoutCheck is 1 second
- Assertions.assertTrue(subscriber.getEventCounters().get(GlobalStatus.TimeoutRollbacking).get() >= 1);
+ //at lease retry once because DefaultCoordinator.timeoutCheck is 1 second
+ Assertions.assertTrue(subscriber.getEventCounters().get(GlobalStatus.TimeoutRollbacking).get() >= 1);
+ } finally {
+ coordinator.destroy();
+ SessionHolder.destroy();
+ }
}
}
diff --git a/server/src/test/java/io/seata/server/lock/db/DataBaseLockManagerImplTest.java b/server/src/test/java/io/seata/server/lock/db/DataBaseLockManagerImplTest.java
index f11485d64083f98b05aede67b13d239475b05288..8ed71af8c6ddbc6b5b3bd349c17cd390eccc1838 100644
--- a/server/src/test/java/io/seata/server/lock/db/DataBaseLockManagerImplTest.java
+++ b/server/src/test/java/io/seata/server/lock/db/DataBaseLockManagerImplTest.java
@@ -15,6 +15,7 @@
*/
package io.seata.server.lock.db;
+import io.seata.common.util.IOUtil;
import io.seata.core.exception.TransactionException;
import io.seata.core.lock.Locker;
import io.seata.core.store.db.LockStoreDataBaseDAO;
@@ -35,7 +36,6 @@ import java.sql.Statement;
/**
* @author zhangsen
- * @data 2019/4/28
*/
public class DataBaseLockManagerImplTest {
@@ -77,13 +77,7 @@ public class DataBaseLockManagerImplTest {
} catch (Exception e) {
e.printStackTrace();
} finally {
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- e.printStackTrace();
- }
- }
+ IOUtil.close(conn);
}
}
@@ -125,12 +119,7 @@ public class DataBaseLockManagerImplTest {
conn.createStatement().execute(delSql);
} finally {
- if(conn != null){
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(conn);
}
}
@@ -170,12 +159,7 @@ public class DataBaseLockManagerImplTest {
conn.createStatement().execute(delSql);
} finally {
- if(conn != null){
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(conn);
}
}
@@ -226,12 +210,7 @@ public class DataBaseLockManagerImplTest {
rs.close();
} finally {
- if(conn != null){
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(conn);
}
@@ -274,12 +253,7 @@ public class DataBaseLockManagerImplTest {
conn.createStatement().execute(delSql);
} finally {
- if(conn != null){
- try {
- conn.close();
- } catch (SQLException e) {
- }
- }
+ IOUtil.close(conn);
}
}
@@ -298,4 +272,4 @@ public class DataBaseLockManagerImplTest {
return locker;
}
}
-}
\ No newline at end of file
+}
diff --git a/server/src/test/java/io/seata/server/lock/memory/MemoryLockManagerForTest.java b/server/src/test/java/io/seata/server/lock/memory/MemoryLockManagerForTest.java
index 1bdd7c0c0b7a9cbecbafac9e7ccb8b1d653f63ff..082c300b8a93328b23117815bb51efa1822668a3 100644
--- a/server/src/test/java/io/seata/server/lock/memory/MemoryLockManagerForTest.java
+++ b/server/src/test/java/io/seata/server/lock/memory/MemoryLockManagerForTest.java
@@ -21,7 +21,6 @@ import io.seata.server.session.BranchSession;
/**
* @author zhangsen
- * @data 2019-05-16
*/
public class MemoryLockManagerForTest extends DefaultLockManager {
diff --git a/server/src/test/java/io/seata/server/session/SessionHolderTest.java b/server/src/test/java/io/seata/server/session/SessionHolderTest.java
index e4b5008ea685881cda3deed481859741ba82f666..8d27935c8905b3ec45d429bc480e149d9bb6d606 100644
--- a/server/src/test/java/io/seata/server/session/SessionHolderTest.java
+++ b/server/src/test/java/io/seata/server/session/SessionHolderTest.java
@@ -31,7 +31,6 @@ import static io.seata.server.session.SessionHolder.ROOT_SESSION_MANAGER_NAME;
* The type Session holder test.
*
* @author Wu
- * @date 2019 /3/6 The type Session holder test.
*/
public class SessionHolderTest {
private String pathname;
@@ -51,9 +50,13 @@ public class SessionHolderTest {
}
final String mode = StoreMode.FILE.toString();
SessionHolder.init(mode);
- final File actual = new File(pathname);
- Assertions.assertTrue(actual.exists());
- Assertions.assertTrue(actual.isFile());
+ try {
+ final File actual = new File(pathname);
+ Assertions.assertTrue(actual.exists());
+ Assertions.assertTrue(actual.isFile());
+ } finally {
+ SessionHolder.destroy();
+ }
}
@AfterEach
diff --git a/server/src/test/java/io/seata/server/session/db/DataBaseSessionManagerTest.java b/server/src/test/java/io/seata/server/session/db/DataBaseSessionManagerTest.java
index 68b408bdeb63456ac33e1007082f2e852515f4c5..a78fd918b4c855dc7389a9fc7a8a1b4469baf130 100644
--- a/server/src/test/java/io/seata/server/session/db/DataBaseSessionManagerTest.java
+++ b/server/src/test/java/io/seata/server/session/db/DataBaseSessionManagerTest.java
@@ -16,6 +16,7 @@
package io.seata.server.session.db;
import io.seata.common.XID;
+import io.seata.common.util.IOUtil;
import io.seata.core.exception.TransactionException;
import io.seata.core.model.BranchStatus;
import io.seata.core.model.BranchType;
@@ -43,7 +44,6 @@ import java.util.Collection;
* The type Data base session manager test.
*
* @author zhangsen
- * @data 2019 /4/28
*/
public class DataBaseSessionManagerTest {
@@ -102,13 +102,7 @@ public class DataBaseSessionManagerTest {
} catch (Exception e) {
e.printStackTrace();
} finally {
- if (conn != null) {
- try {
- conn.close();
- } catch (SQLException e) {
- e.printStackTrace();
- }
- }
+ IOUtil.close(conn);
}
}
@@ -602,4 +596,4 @@ public class DataBaseSessionManagerTest {
-}
\ No newline at end of file
+}
diff --git a/server/src/test/java/io/seata/server/store/SessionStoreTest.java b/server/src/test/java/io/seata/server/store/SessionStoreTest.java
index 37fecd0d6c40400d7b539bf45df49664d680ce28..e1229b1e8b2ee4479fe687a8c4d9a2f393eece06 100644
--- a/server/src/test/java/io/seata/server/store/SessionStoreTest.java
+++ b/server/src/test/java/io/seata/server/store/SessionStoreTest.java
@@ -76,54 +76,58 @@ public class SessionStoreTest {
*/
@Test
public void testRestoredFromFile() throws Exception {
- SessionHolder.init("file");
- GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
- String xid = XID.generateXID(globalSession.getTransactionId());
- globalSession.setXid(xid);
+ try {
+ SessionHolder.init("file");
+ GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
+ String xid = XID.generateXID(globalSession.getTransactionId());
+ globalSession.setXid(xid);
- globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
- globalSession.begin();
+ globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
+ globalSession.begin();
- BranchSession branchSession1 = SessionHelper.newBranchByGlobal(globalSession, BranchType.AT, RESOURCE_ID,
- "ta:1,2;tb:3", "xxx");
- branchSession1.setXid(xid);
- branchSession1.lock();
- globalSession.addBranch(branchSession1);
+ BranchSession branchSession1 = SessionHelper.newBranchByGlobal(globalSession, BranchType.AT, RESOURCE_ID,
+ "ta:1,2;tb:3", "xxx");
+ branchSession1.setXid(xid);
+ branchSession1.lock();
+ globalSession.addBranch(branchSession1);
- LockManager lockManager = new MemoryLockManagerForTest();
+ LockManager lockManager = new MemoryLockManagerForTest();
- String otherXID = XID.generateXID(0L);
+ String otherXID = XID.generateXID(0L);
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:2"));
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "tb:3"));
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:2"));
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "tb:3"));
- Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:4"));
- Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "tb:5"));
+ Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:4"));
+ Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "tb:5"));
- lockManager.cleanAllLocks();
+ lockManager.cleanAllLocks();
- Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:2"));
- Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "tb:3"));
+ Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:2"));
+ Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "tb:3"));
- // Re-init SessionHolder: restore sessions from file
- SessionHolder.init("file");
+ // Re-init SessionHolder: restore sessions from file
+ SessionHolder.init("file");
- long tid = globalSession.getTransactionId();
- GlobalSession reloadSession = SessionHolder.findGlobalSession(globalSession.getXid());
- Assertions.assertNotNull(reloadSession);
- Assertions.assertFalse(globalSession == reloadSession);
- Assertions.assertEquals(globalSession.getApplicationId(), reloadSession.getApplicationId());
+ long tid = globalSession.getTransactionId();
+ GlobalSession reloadSession = SessionHolder.findGlobalSession(globalSession.getXid());
+ Assertions.assertNotNull(reloadSession);
+ Assertions.assertFalse(globalSession == reloadSession);
+ Assertions.assertEquals(globalSession.getApplicationId(), reloadSession.getApplicationId());
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:2"));
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "tb:3"));
- Assertions.assertTrue(lockManager.isLockable(xid, RESOURCE_ID, "tb:3"));
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:2"));
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "tb:3"));
+ Assertions.assertTrue(lockManager.isLockable(xid, RESOURCE_ID, "tb:3"));
- //clear
- reloadSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
- reloadSession.end();
+ //clear
+ reloadSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
+ reloadSession.end();
+ } finally {
+ SessionHolder.destroy();
+ }
}
/**
@@ -133,14 +137,18 @@ public class SessionStoreTest {
*/
//@Test
public void testRestoredFromFile2() throws Exception {
- SessionHolder.init("file");
- GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
+ try {
+ SessionHolder.init("file");
+ GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
- globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
- globalSession.begin();
+ globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
+ globalSession.begin();
- // Re-init SessionHolder: restore sessions from file
- SessionHolder.init("file");
+ // Re-init SessionHolder: restore sessions from file
+ SessionHolder.init("file");
+ } finally {
+ SessionHolder.destroy();
+ }
}
/**
@@ -150,49 +158,53 @@ public class SessionStoreTest {
*/
@Test
public void testRestoredFromFileAsyncCommitting() throws Exception {
- SessionHolder.init("file");
- GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
+ try {
+ SessionHolder.init("file");
+ GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
- String xid = XID.generateXID(globalSession.getTransactionId());
- globalSession.setXid(xid);
+ String xid = XID.generateXID(globalSession.getTransactionId());
+ globalSession.setXid(xid);
- globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
- globalSession.begin();
+ globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
+ globalSession.begin();
- BranchSession branchSession1 = SessionHelper.newBranchByGlobal(globalSession, BranchType.AT, RESOURCE_ID,
- "ta:1", "xxx");
- Assertions.assertTrue(branchSession1.lock());
- globalSession.addBranch(branchSession1);
+ BranchSession branchSession1 = SessionHelper.newBranchByGlobal(globalSession, BranchType.AT, RESOURCE_ID,
+ "ta:1", "xxx");
+ Assertions.assertTrue(branchSession1.lock());
+ globalSession.addBranch(branchSession1);
- LockManager lockManager = new MemoryLockManagerForTest();
+ LockManager lockManager = new MemoryLockManagerForTest();
- String otherXID = XID.generateXID(0L);
+ String otherXID = XID.generateXID(0L);
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- globalSession.changeStatus(GlobalStatus.AsyncCommitting);
+ globalSession.changeStatus(GlobalStatus.AsyncCommitting);
- lockManager.cleanAllLocks();
+ lockManager.cleanAllLocks();
- Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- // Re-init SessionHolder: restore sessions from file
- SessionHolder.init("file");
+ // Re-init SessionHolder: restore sessions from file
+ SessionHolder.init("file");
- long tid = globalSession.getTransactionId();
- GlobalSession reloadSession = SessionHolder.findGlobalSession(globalSession.getXid());
- Assertions.assertEquals(reloadSession.getStatus(), GlobalStatus.AsyncCommitting);
+ long tid = globalSession.getTransactionId();
+ GlobalSession reloadSession = SessionHolder.findGlobalSession(globalSession.getXid());
+ Assertions.assertEquals(reloadSession.getStatus(), GlobalStatus.AsyncCommitting);
- GlobalSession sessionInAsyncCommittingQueue = SessionHolder.getAsyncCommittingSessionManager()
- .findGlobalSession(globalSession.getXid());
- Assertions.assertTrue(reloadSession == sessionInAsyncCommittingQueue);
+ GlobalSession sessionInAsyncCommittingQueue = SessionHolder.getAsyncCommittingSessionManager()
+ .findGlobalSession(globalSession.getXid());
+ Assertions.assertTrue(reloadSession == sessionInAsyncCommittingQueue);
- // No locking for session in AsyncCommitting status
- Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ // No locking for session in AsyncCommitting status
+ Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- //clear
- reloadSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
- reloadSession.end();
+ //clear
+ reloadSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
+ reloadSession.end();
+ } finally {
+ SessionHolder.destroy();
+ }
}
/**
@@ -202,53 +214,57 @@ public class SessionStoreTest {
*/
@Test
public void testRestoredFromFileCommitRetry() throws Exception {
- SessionHolder.init("file");
- GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
+ try {
+ SessionHolder.init("file");
+ GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
- String xid = XID.generateXID(globalSession.getTransactionId());
- globalSession.setXid(xid);
+ String xid = XID.generateXID(globalSession.getTransactionId());
+ globalSession.setXid(xid);
- globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
- globalSession.begin();
+ globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
+ globalSession.begin();
- BranchSession branchSession1 = SessionHelper.newBranchByGlobal(globalSession, BranchType.AT, RESOURCE_ID,
- "ta:1", "xxx");
- branchSession1.lock();
- globalSession.addBranch(branchSession1);
+ BranchSession branchSession1 = SessionHelper.newBranchByGlobal(globalSession, BranchType.AT, RESOURCE_ID,
+ "ta:1", "xxx");
+ branchSession1.lock();
+ globalSession.addBranch(branchSession1);
- LockManager lockManager = new MemoryLockManagerForTest();
+ LockManager lockManager = new MemoryLockManagerForTest();
- String otherXID = XID.generateXID(0L);
+ String otherXID = XID.generateXID(0L);
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- globalSession.changeStatus(GlobalStatus.Committing);
- globalSession.changeBranchStatus(branchSession1, BranchStatus.PhaseTwo_CommitFailed_Retryable);
- globalSession.changeStatus(GlobalStatus.CommitRetrying);
+ globalSession.changeStatus(GlobalStatus.Committing);
+ globalSession.changeBranchStatus(branchSession1, BranchStatus.PhaseTwo_CommitFailed_Retryable);
+ globalSession.changeStatus(GlobalStatus.CommitRetrying);
- lockManager.cleanAllLocks();
+ lockManager.cleanAllLocks();
- Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- // Re-init SessionHolder: restore sessions from file
- SessionHolder.init("file");
+ // Re-init SessionHolder: restore sessions from file
+ SessionHolder.init("file");
- long tid = globalSession.getTransactionId();
- GlobalSession reloadSession = SessionHolder.findGlobalSession(globalSession.getXid());
- Assertions.assertEquals(reloadSession.getStatus(), GlobalStatus.CommitRetrying);
+ long tid = globalSession.getTransactionId();
+ GlobalSession reloadSession = SessionHolder.findGlobalSession(globalSession.getXid());
+ Assertions.assertEquals(reloadSession.getStatus(), GlobalStatus.CommitRetrying);
- GlobalSession sessionInRetryCommittingQueue = SessionHolder.getRetryCommittingSessionManager()
- .findGlobalSession(globalSession.getXid());
- Assertions.assertTrue(reloadSession == sessionInRetryCommittingQueue);
- BranchSession reloadBranchSession = reloadSession.getBranch(branchSession1.getBranchId());
- Assertions.assertEquals(reloadBranchSession.getStatus(), BranchStatus.PhaseTwo_CommitFailed_Retryable);
+ GlobalSession sessionInRetryCommittingQueue = SessionHolder.getRetryCommittingSessionManager()
+ .findGlobalSession(globalSession.getXid());
+ Assertions.assertTrue(reloadSession == sessionInRetryCommittingQueue);
+ BranchSession reloadBranchSession = reloadSession.getBranch(branchSession1.getBranchId());
+ Assertions.assertEquals(reloadBranchSession.getStatus(), BranchStatus.PhaseTwo_CommitFailed_Retryable);
- // Lock is held by session in CommitRetrying status
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ // Lock is held by session in CommitRetrying status
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- //clear
- reloadSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
- reloadSession.end();
+ //clear
+ reloadSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
+ reloadSession.end();
+ } finally {
+ SessionHolder.destroy();
+ }
}
/**
@@ -258,54 +274,58 @@ public class SessionStoreTest {
*/
@Test
public void testRestoredFromFileRollbackRetry() throws Exception {
- SessionHolder.init("file");
+ try {
+ SessionHolder.init("file");
- GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
+ GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
- String xid = XID.generateXID(globalSession.getTransactionId());
- globalSession.setXid(xid);
+ String xid = XID.generateXID(globalSession.getTransactionId());
+ globalSession.setXid(xid);
- globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
- globalSession.begin();
+ globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
+ globalSession.begin();
- BranchSession branchSession1 = SessionHelper.newBranchByGlobal(globalSession, BranchType.AT, RESOURCE_ID,
- "ta:1", "xxx");
- branchSession1.lock();
- globalSession.addBranch(branchSession1);
+ BranchSession branchSession1 = SessionHelper.newBranchByGlobal(globalSession, BranchType.AT, RESOURCE_ID,
+ "ta:1", "xxx");
+ branchSession1.lock();
+ globalSession.addBranch(branchSession1);
- LockManager lockManager = new MemoryLockManagerForTest();
+ LockManager lockManager = new MemoryLockManagerForTest();
- String otherXID = XID.generateXID(0L);
+ String otherXID = XID.generateXID(0L);
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- globalSession.changeStatus(GlobalStatus.Rollbacking);
- globalSession.changeBranchStatus(branchSession1, BranchStatus.PhaseTwo_RollbackFailed_Retryable);
- globalSession.changeStatus(GlobalStatus.RollbackRetrying);
+ globalSession.changeStatus(GlobalStatus.Rollbacking);
+ globalSession.changeBranchStatus(branchSession1, BranchStatus.PhaseTwo_RollbackFailed_Retryable);
+ globalSession.changeStatus(GlobalStatus.RollbackRetrying);
- lockManager.cleanAllLocks();
+ lockManager.cleanAllLocks();
- Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- // Re-init SessionHolder: restore sessions from file
- SessionHolder.init("file");
+ // Re-init SessionHolder: restore sessions from file
+ SessionHolder.init("file");
- long tid = globalSession.getTransactionId();
- GlobalSession reloadSession = SessionHolder.findGlobalSession(globalSession.getXid());
- Assertions.assertEquals(reloadSession.getStatus(), GlobalStatus.RollbackRetrying);
+ long tid = globalSession.getTransactionId();
+ GlobalSession reloadSession = SessionHolder.findGlobalSession(globalSession.getXid());
+ Assertions.assertEquals(reloadSession.getStatus(), GlobalStatus.RollbackRetrying);
- GlobalSession sessionInRetryRollbackingQueue = SessionHolder.getRetryRollbackingSessionManager()
- .findGlobalSession(globalSession.getXid());
- Assertions.assertTrue(reloadSession == sessionInRetryRollbackingQueue);
- BranchSession reloadBranchSession = reloadSession.getBranch(branchSession1.getBranchId());
- Assertions.assertEquals(reloadBranchSession.getStatus(), BranchStatus.PhaseTwo_RollbackFailed_Retryable);
+ GlobalSession sessionInRetryRollbackingQueue = SessionHolder.getRetryRollbackingSessionManager()
+ .findGlobalSession(globalSession.getXid());
+ Assertions.assertTrue(reloadSession == sessionInRetryRollbackingQueue);
+ BranchSession reloadBranchSession = reloadSession.getBranch(branchSession1.getBranchId());
+ Assertions.assertEquals(reloadBranchSession.getStatus(), BranchStatus.PhaseTwo_RollbackFailed_Retryable);
- // Lock is held by session in RollbackRetrying status
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ // Lock is held by session in RollbackRetrying status
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- //clear
- reloadSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
- reloadSession.end();
+ //clear
+ reloadSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
+ reloadSession.end();
+ } finally {
+ SessionHolder.destroy();
+ }
}
/**
@@ -315,43 +335,47 @@ public class SessionStoreTest {
*/
@Test
public void testRestoredFromFileRollbackFailed() throws Exception {
- SessionHolder.init("file");
+ try {
+ SessionHolder.init("file");
- GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
+ GlobalSession globalSession = new GlobalSession("demo-app", "my_test_tx_group", "test", 6000);
- String xid = XID.generateXID(globalSession.getTransactionId());
- globalSession.setXid(xid);
+ String xid = XID.generateXID(globalSession.getTransactionId());
+ globalSession.setXid(xid);
- globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
- globalSession.begin();
+ globalSession.addSessionLifecycleListener(SessionHolder.getRootSessionManager());
+ globalSession.begin();
- BranchSession branchSession1 = SessionHelper.newBranchByGlobal(globalSession, BranchType.AT, RESOURCE_ID,
- "ta:1", "xxx");
- branchSession1.lock();
- globalSession.addBranch(branchSession1);
+ BranchSession branchSession1 = SessionHelper.newBranchByGlobal(globalSession, BranchType.AT, RESOURCE_ID,
+ "ta:1", "xxx");
+ branchSession1.lock();
+ globalSession.addBranch(branchSession1);
- LockManager lockManager = new MemoryLockManagerForTest();
+ LockManager lockManager = new MemoryLockManagerForTest();
- String otherXID = XID.generateXID(0L);
+ String otherXID = XID.generateXID(0L);
- Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ Assertions.assertFalse(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- globalSession.changeStatus(GlobalStatus.Rollbacking);
- globalSession.changeBranchStatus(branchSession1, BranchStatus.PhaseTwo_CommitFailed_Unretryable);
- SessionHelper.endRollbackFailed(globalSession);
+ globalSession.changeStatus(GlobalStatus.Rollbacking);
+ globalSession.changeBranchStatus(branchSession1, BranchStatus.PhaseTwo_CommitFailed_Unretryable);
+ SessionHelper.endRollbackFailed(globalSession);
- // Lock is released.
- Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ // Lock is released.
+ Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- lockManager.cleanAllLocks();
+ lockManager.cleanAllLocks();
- Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
+ Assertions.assertTrue(lockManager.isLockable(otherXID, RESOURCE_ID, "ta:1"));
- // Re-init SessionHolder: restore sessions from file
- SessionHolder.init("file");
+ // Re-init SessionHolder: restore sessions from file
+ SessionHolder.init("file");
- long tid = globalSession.getTransactionId();
- GlobalSession reloadSession = SessionHolder.findGlobalSession(globalSession.getXid());
- Assertions.assertNull(reloadSession);
+ long tid = globalSession.getTransactionId();
+ GlobalSession reloadSession = SessionHolder.findGlobalSession(globalSession.getXid());
+ Assertions.assertNull(reloadSession);
+ } finally {
+ SessionHolder.destroy();
+ }
}
}
diff --git a/server/src/test/java/io/seata/server/store/file/FileTransactionStoreManagerTest.java b/server/src/test/java/io/seata/server/store/file/FileTransactionStoreManagerTest.java
index a28e87e91df2d1e09d0844f498d60d19aaa68905..6c3fcd6f5a1643e05f82a874e3b71590f90a00a5 100644
--- a/server/src/test/java/io/seata/server/store/file/FileTransactionStoreManagerTest.java
+++ b/server/src/test/java/io/seata/server/store/file/FileTransactionStoreManagerTest.java
@@ -42,8 +42,9 @@ public class FileTransactionStoreManagerTest {
@Test
public void testBigDataWrite() throws Exception {
File seataFile = Files.newTemporaryFile();
+ FileTransactionStoreManager fileTransactionStoreManager = null;
try {
- FileTransactionStoreManager fileTransactionStoreManager = new FileTransactionStoreManager(seataFile.getAbsolutePath(), null);
+ fileTransactionStoreManager = new FileTransactionStoreManager(seataFile.getAbsolutePath(), null);
BranchSession branchSessionA = Mockito.mock(BranchSession.class);
GlobalSession global = new GlobalSession();
Mockito.when(branchSessionA.encode())
@@ -65,6 +66,9 @@ public class FileTransactionStoreManagerTest {
BranchSession loadedBranchSessionB = (BranchSession) list.get(1).getSessionRequest();
Assertions.assertEquals(branchSessionB.getApplicationData(), loadedBranchSessionB.getApplicationData());
} finally {
+ if (null != fileTransactionStoreManager) {
+ fileTransactionStoreManager.shutdown();
+ }
Assertions.assertTrue(seataFile.delete());
}
}
@@ -74,6 +78,8 @@ public class FileTransactionStoreManagerTest {
File seataFile = Files.newTemporaryFile();
Method findTimeoutAndSaveMethod = FileTransactionStoreManager.class.getDeclaredMethod("findTimeoutAndSave");
findTimeoutAndSaveMethod.setAccessible(true);
+ FileBasedSessionManager sessionManager = null;
+ FileTransactionStoreManager fileTransactionStoreManager = null;
try {
List<GlobalSession> timeoutSessions = new ArrayList<>();
for (int i = 0; i < 100; i++) {
@@ -95,10 +101,11 @@ public class FileTransactionStoreManagerTest {
SessionManager sessionManagerMock = Mockito.mock(SessionManager.class);
Mockito.when(sessionManagerMock.findGlobalSessions(Mockito.any()))
.thenReturn(timeoutSessions);
- FileTransactionStoreManager fileTransactionStoreManager = new FileTransactionStoreManager(seataFile.getAbsolutePath(), sessionManagerMock);
+ fileTransactionStoreManager = new FileTransactionStoreManager(
+ seataFile.getAbsolutePath(), sessionManagerMock);
Assertions.assertTrue((boolean) findTimeoutAndSaveMethod.invoke(fileTransactionStoreManager));
- FileBasedSessionManager sessionManager = new FileBasedSessionManager(seataFile.getName(), seataFile.getParent());
+ sessionManager = new FileBasedSessionManager(seataFile.getName(), seataFile.getParent());
sessionManager.reload();
Collection<GlobalSession> globalSessions = sessionManager.allSessions();
Assertions.assertNotNull(globalSessions);
@@ -111,6 +118,12 @@ public class FileTransactionStoreManagerTest {
});
} finally {
findTimeoutAndSaveMethod.setAccessible(false);
+ if (null != fileTransactionStoreManager) {
+ fileTransactionStoreManager.shutdown();
+ }
+ if (null != sessionManager) {
+ sessionManager.destroy();
+ }
Assertions.assertTrue(seataFile.delete());
}
}
diff --git a/server/src/test/resources/file.conf b/server/src/test/resources/file.conf
index 4ef0f9ebc0841935ca94538d181ed79d35512073..3d42b148902aa1c150a191cab9be38a8bedce8c3 100644
--- a/server/src/test/resources/file.conf
+++ b/server/src/test/resources/file.conf
@@ -1,51 +1,38 @@
#reduce delay for test
+## transaction log store, only used in seata-server
store {
## store mode: file、db
mode = "file"
- ## file store
+ ## file store property
file {
+ ## store location dir
dir = "sessionStore"
-
- # branch session size , if exceeded first try compress lockkey, still exceeded throws exceptions
- max-branch-session-size = 16384
- # globe session size , if exceeded throws exceptions
- max-global-session-size = 512
- # file buffer size , if exceeded allocate new buffer
- file-write-buffer-cache-size = 16384
- # when recover batch read size
- session.reload.read_size = 100
- # async, sync
- flush-disk-mode = async
}
- ## database store
+ ## database store property
db {
## the implement of javax.sql.DataSource, such as DruidDataSource(druid)/BasicDataSource(dbcp) etc.
datasource = "dbcp"
## mysql/oracle/h2/oceanbase etc.
db-type = "mysql"
+ driver-class-name = "com.mysql.jdbc.Driver"
url = "jdbc:mysql://127.0.0.1:3306/seata"
user = "mysql"
password = "mysql"
- min-conn = 1
- max-conn = 3
- global.table = "global_table"
- branch.table = "branch_table"
- lock-table = "lock_table"
- query-limit = 100
}
}
-
-recovery {
- #schedule committing retry period in milliseconds
- committing-retry-period = 100
- #schedule asyn committing retry period in milliseconds
- asyn-committing-retry-period = 100
- #schedule rollbacking retry period in milliseconds
- rollbacking-retry-period = 100
- #schedule timeout retry period in milliseconds
- timeout-retry-period = 100
+server {
+ recovery {
+ #schedule committing retry period in milliseconds
+ committing-retry-period = 100
+ #schedule asyn committing retry period in milliseconds
+ asyn-committing-retry-period = 100
+ #schedule rollbacking retry period in milliseconds
+ rollbacking-retry-period = 100
+ #schedule timeout retry period in milliseconds
+ timeout-retry-period = 100
+ }
}
## metrics settings
metrics {
@@ -54,12 +41,4 @@ metrics {
# multi exporters use comma divided
exporter-list = "prometheus"
exporter-prometheus-port = 9898
-}
-
-support {
- ## spring
- spring {
- # auto proxy the DataSource bean
- datasource.autoproxy = false
- }
}
\ No newline at end of file
diff --git a/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java b/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java
index b12ebbac35d42caa634c3101789ed5c040a79c9c..d578058d80ce14399d22734e71479d2a8bf7c07c 100644
--- a/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java
+++ b/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java
@@ -16,12 +16,17 @@
package io.seata.spring.annotation;
import javax.sql.DataSource;
+import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
import java.util.HashSet;
import java.util.Set;
+import io.seata.common.exception.ShouldNeverHappenException;
import io.seata.common.util.StringUtils;
+import io.seata.config.ConfigurationChangeListener;
import io.seata.config.ConfigurationFactory;
+import io.seata.core.constants.ConfigurationKeys;
import io.seata.core.rpc.netty.RmRpcClient;
import io.seata.core.rpc.netty.ShutdownHook;
import io.seata.core.rpc.netty.TmRpcClient;
@@ -46,7 +51,6 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.beans.factory.InitializingBean;
-import org.springframework.cglib.proxy.Enhancer;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.context.ConfigurableApplicationContext;
@@ -56,8 +60,7 @@ import static io.seata.core.constants.ConfigurationKeys.DATASOURCE_AUTOPROXY;
/**
* The type Global transaction scanner.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/28
+ * @author slievrly
*/
public class GlobalTransactionScanner extends AbstractAutoProxyCreator
implements InitializingBean, ApplicationContextAware,
@@ -84,8 +87,8 @@ public class GlobalTransactionScanner extends AbstractAutoProxyCreator
private final String applicationId;
private final String txServiceGroup;
private final int mode;
- private final boolean disableGlobalTransaction =
- ConfigurationFactory.getInstance().getBoolean("service.disableGlobalTransaction", false);
+ private final boolean disableGlobalTransaction = ConfigurationFactory.getInstance().getBoolean(
+ ConfigurationKeys.DISABLE_GLOBAL_TRANSACTION, false);
private final FailureHandler failureHandlerHook;
@@ -217,7 +220,7 @@ public class GlobalTransactionScanner extends AbstractAutoProxyCreator
interceptor = null;
//check TCC proxy
if (TCCBeanParserUtils.isTccAutoProxy(bean, beanName, applicationContext)) {
- //TCC interceptor， proxy bean of sofa:reference/dubbo:reference, and LocalTCC
+ //TCC interceptor, proxy bean of sofa:reference/dubbo:reference, and LocalTCC
interceptor = new TccActionInterceptor(TCCBeanParserUtils.getRemotingDesc(beanName));
} else {
Class<?> serviceInterface = SpringProxyUtils.findTargetClass(bean);
@@ -230,6 +233,7 @@ public class GlobalTransactionScanner extends AbstractAutoProxyCreator
if (interceptor == null) {
interceptor = new GlobalTransactionalInterceptor(failureHandlerHook);
+ ConfigurationFactory.getInstance().addConfigListener(ConfigurationKeys.DISABLE_GLOBAL_TRANSACTION,(ConfigurationChangeListener)interceptor);
}
}
@@ -305,28 +309,42 @@ public class GlobalTransactionScanner extends AbstractAutoProxyCreator
}
@Override
- public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+ public Object postProcessBeforeInitialization(Object bean, String beanName) {
+ if (bean instanceof DataSourceProxy && ConfigurationFactory.getInstance().getBoolean(DATASOURCE_AUTOPROXY, false)) {
+ throw new ShouldNeverHappenException("Auto proxy of DataSource can't be enabled as you've created a DataSourceProxy bean." +
+ "Please consider removing DataSourceProxy bean or disabling auto proxy of DataSource.");
+ }
+ return super.postProcessBeforeInitialization(bean, beanName);
+ }
+
+ @Override
+ public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
if (bean instanceof DataSource && !(bean instanceof DataSourceProxy) && ConfigurationFactory.getInstance().getBoolean(DATASOURCE_AUTOPROXY, false)) {
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Auto proxy of [" + beanName + "]");
+ LOGGER.info("Auto proxy of [{}]", beanName);
}
DataSourceProxy dataSourceProxy = DataSourceProxyHolder.get().putDataSource((DataSource) bean);
- return Enhancer.create(bean.getClass(), (org.springframework.cglib.proxy.MethodInterceptor) (o, method, args, methodProxy) -> {
- Method m = BeanUtils.findDeclaredMethod(DataSourceProxy.class, method.getName(), method.getParameterTypes());
- if (null != m) {
- return m.invoke(dataSourceProxy, args);
- } else {
- boolean oldAccessible = method.isAccessible();
- try {
- method.setAccessible(true);
- return method.invoke(bean, args);
- } finally {
- //recover the original accessible for security reason
- method.setAccessible(oldAccessible);
+ Class<?>[] interfaces = SpringProxyUtils.getAllInterfaces(bean);
+ return Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), interfaces, new InvocationHandler() {
+ @Override
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
+ Method m = BeanUtils.findDeclaredMethod(DataSourceProxy.class, method.getName(), method.getParameterTypes());
+ if (null != m) {
+ return m.invoke(dataSourceProxy, args);
+ } else {
+ boolean oldAccessible = method.isAccessible();
+ try {
+ method.setAccessible(true);
+ return method.invoke(bean, args);
+ } finally {
+ //recover the original accessible for security reason
+ method.setAccessible(oldAccessible);
+ }
}
}
});
+
}
- return bean;
+ return super.postProcessAfterInitialization(bean, beanName);
}
}
diff --git a/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionalInterceptor.java b/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionalInterceptor.java
index 4b52eb9dca232aeea4d6612565f153eb96e90f12..cc15db755c3f3c295579811058a07424ba99d676 100644
--- a/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionalInterceptor.java
+++ b/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionalInterceptor.java
@@ -15,8 +15,17 @@
*/
package io.seata.spring.annotation;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.LinkedHashSet;
+import java.util.Set;
+
import io.seata.common.exception.ShouldNeverHappenException;
import io.seata.common.util.StringUtils;
+import io.seata.config.ConfigurationChangeEvent;
+import io.seata.config.ConfigurationChangeListener;
+import io.seata.config.ConfigurationFactory;
+import io.seata.core.constants.ConfigurationKeys;
import io.seata.rm.GlobalLockTemplate;
import io.seata.tm.api.DefaultFailureHandlerImpl;
import io.seata.tm.api.FailureHandler;
@@ -33,19 +42,12 @@ import org.springframework.aop.support.AopUtils;
import org.springframework.core.BridgeMethodResolver;
import org.springframework.util.ClassUtils;
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
-
/**
* The type Global transactional interceptor.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
-public class GlobalTransactionalInterceptor implements MethodInterceptor {
+public class GlobalTransactionalInterceptor implements ConfigurationChangeListener,MethodInterceptor {
private static final Logger LOGGER = LoggerFactory.getLogger(GlobalTransactionalInterceptor.class);
private static final FailureHandler DEFAULT_FAIL_HANDLER = new DefaultFailureHandlerImpl();
@@ -53,6 +55,7 @@ public class GlobalTransactionalInterceptor implements MethodInterceptor {
private final TransactionalTemplate transactionalTemplate = new TransactionalTemplate();
private final GlobalLockTemplate<Object> globalLockTemplate = new GlobalLockTemplate<>();
private final FailureHandler failureHandler;
+ private volatile boolean disable;
/**
* Instantiates a new Global transactional interceptor.
@@ -61,20 +64,22 @@ public class GlobalTransactionalInterceptor implements MethodInterceptor {
*/
public GlobalTransactionalInterceptor(FailureHandler failureHandler) {
this.failureHandler = failureHandler == null ? DEFAULT_FAIL_HANDLER : failureHandler;
-
+ this.disable = ConfigurationFactory.getInstance().getBoolean(ConfigurationKeys.DISABLE_GLOBAL_TRANSACTION,
+ false);
}
@Override
public Object invoke(final MethodInvocation methodInvocation) throws Throwable {
- Class<?> targetClass = (methodInvocation.getThis() != null ? AopUtils.getTargetClass(methodInvocation.getThis()) : null);
+ Class<?> targetClass = methodInvocation.getThis() != null ? AopUtils.getTargetClass(methodInvocation.getThis())
+ : null;
Method specificMethod = ClassUtils.getMostSpecificMethod(methodInvocation.getMethod(), targetClass);
final Method method = BridgeMethodResolver.findBridgedMethod(specificMethod);
final GlobalTransactional globalTransactionalAnnotation = getAnnotation(method, GlobalTransactional.class);
final GlobalLock globalLockAnnotation = getAnnotation(method, GlobalLock.class);
- if (globalTransactionalAnnotation != null) {
+ if (!disable && globalTransactionalAnnotation != null) {
return handleGlobalTransaction(methodInvocation, globalTransactionalAnnotation);
- } else if (globalLockAnnotation != null) {
+ } else if (!disable && globalLockAnnotation != null) {
return handleGlobalLock(methodInvocation);
} else {
return methodInvocation.proceed();
@@ -160,9 +165,25 @@ public class GlobalTransactionalInterceptor implements MethodInterceptor {
}
private String formatMethod(Method method) {
- String paramTypes = Arrays.stream(method.getParameterTypes())
- .map(Class::getName)
- .collect(Collectors.joining(", ", "(", ")"));
- return method.getName() + paramTypes;
+ StringBuilder sb = new StringBuilder(method.getName()).append("(");
+
+ Class<?>[] params = method.getParameterTypes();
+ int in = 0;
+ for (Class<?> clazz : params) {
+ sb.append(clazz.getName());
+ if (++in < params.length) {
+ sb.append(", ");
+ }
+ }
+ return sb.append(")").toString();
+ }
+
+ @Override
+ public void onChangeEvent(ConfigurationChangeEvent event) {
+ if (ConfigurationKeys.DISABLE_GLOBAL_TRANSACTION.equals(event.getDataId())) {
+ LOGGER.info("{} config changed, old value:{}, new value:{}", ConfigurationKeys.DISABLE_GLOBAL_TRANSACTION,
+ disable, event.getNewValue());
+ disable = Boolean.parseBoolean(event.getNewValue().trim());
+ }
}
}
diff --git a/spring/src/main/java/io/seata/spring/annotation/MethodDesc.java b/spring/src/main/java/io/seata/spring/annotation/MethodDesc.java
index defecc69a6381aa9137a30f03adc8c385adee6f8..18a50d3b99c6b5299c77fd2532f90cfea7261a27 100644
--- a/spring/src/main/java/io/seata/spring/annotation/MethodDesc.java
+++ b/spring/src/main/java/io/seata/spring/annotation/MethodDesc.java
@@ -20,8 +20,7 @@ import java.lang.reflect.Method;
/**
* The type Method desc.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2018 /12/28
+ * @author slievrly
*/
public class MethodDesc {
private GlobalTransactional transactionAnnotation;
diff --git a/spring/src/main/java/io/seata/spring/annotation/datasource/DataSourceProxyHolder.java b/spring/src/main/java/io/seata/spring/annotation/datasource/DataSourceProxyHolder.java
index b015a78de90197a07d3d642b21eaa8e563746e42..9d1a291a037aca0bb7c1cb0681db54592c6e6963 100644
--- a/spring/src/main/java/io/seata/spring/annotation/datasource/DataSourceProxyHolder.java
+++ b/spring/src/main/java/io/seata/spring/annotation/datasource/DataSourceProxyHolder.java
@@ -24,7 +24,6 @@ import java.util.concurrent.ConcurrentHashMap;
* the type data source proxy holder
*
* @author xingfudeshi@gmail.com
- * @date 2019/08/23
*/
public class DataSourceProxyHolder {
private static final int MAP_INITIAL_CAPACITY = 8;
diff --git a/spring/src/main/java/io/seata/spring/tcc/TccActionInterceptor.java b/spring/src/main/java/io/seata/spring/tcc/TccActionInterceptor.java
index cc8b2699d9e86bb46b761a3cac8c215798528526..b584d113e20b28864bcfd355d0c960dac85cd6f9 100644
--- a/spring/src/main/java/io/seata/spring/tcc/TccActionInterceptor.java
+++ b/spring/src/main/java/io/seata/spring/tcc/TccActionInterceptor.java
@@ -16,8 +16,8 @@
package io.seata.spring.tcc;
import io.seata.common.Constants;
-import io.seata.common.executor.Callback;
import io.seata.core.context.RootContext;
+import io.seata.core.model.BranchType;
import io.seata.rm.tcc.api.TwoPhaseBusinessAction;
import io.seata.rm.tcc.interceptor.ActionInterceptorHandler;
import io.seata.rm.tcc.remoting.RemotingDesc;
@@ -40,7 +40,7 @@ public class TccActionInterceptor implements MethodInterceptor {
private static final Logger LOGGER = LoggerFactory.getLogger(TccActionInterceptor.class);
- private static final String DUBBO_PROXY_NAME_PREFIX="com.alibaba.dubbo.common.bytecode.proxy";
+ private static final String DUBBO_PROXY_NAME_PREFIX = "com.alibaba.dubbo.common.bytecode.proxy";
private ActionInterceptorHandler actionInterceptorHandler = new ActionInterceptorHandler();
@@ -67,7 +67,7 @@ public class TccActionInterceptor implements MethodInterceptor {
@Override
public Object invoke(final MethodInvocation invocation) throws Throwable {
- if(!RootContext.inGlobalTransaction()){
+ if (!RootContext.inGlobalTransaction()) {
//not in transaction
return invocation.proceed();
}
@@ -79,20 +79,17 @@ public class TccActionInterceptor implements MethodInterceptor {
String xid = RootContext.getXID();
//clear the context
RootContext.unbind();
+ RootContext.bindInterceptorType(xid, BranchType.TCC);
try {
Object[] methodArgs = invocation.getArguments();
//Handler the TCC Aspect
Map<String, Object> ret = actionInterceptorHandler.proceed(method, methodArgs, xid, businessAction,
- new Callback<Object>() {
- @Override
- public Object execute() throws Throwable {
- return invocation.proceed();
- }
- });
+ invocation::proceed);
//return the final result
return ret.get(Constants.TCC_METHOD_RESULT);
} finally {
//recovery the context
+ RootContext.unbindInterceptorType();
RootContext.bind(xid);
}
}
diff --git a/spring/src/main/java/io/seata/spring/util/SpringProxyUtils.java b/spring/src/main/java/io/seata/spring/util/SpringProxyUtils.java
index 974065576906aaa6618d3172d04459a1dcb796cd..6797d39c8c350e7bc37c4353c84af8ee59c332c9 100644
--- a/spring/src/main/java/io/seata/spring/util/SpringProxyUtils.java
+++ b/spring/src/main/java/io/seata/spring/util/SpringProxyUtils.java
@@ -17,6 +17,9 @@ package io.seata.spring.util;
import java.lang.reflect.Field;
import java.lang.reflect.Proxy;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
import org.springframework.aop.TargetSource;
import org.springframework.aop.framework.AdvisedSupport;
@@ -48,7 +51,7 @@ public class SpringProxyUtils {
Object target = advised.getTargetSource().getTarget();
return findTargetClass(target);
} else {
- return proxy == null ? null :proxy.getClass();
+ return proxy == null ? null : proxy.getClass();
}
}
@@ -112,8 +115,8 @@ public class SpringProxyUtils {
}
//check dubbo proxy ?
String proxyClassName = bean.getClass().getName();
- if (proxyClassName.startsWith("com.alibaba.dubbo.common.bytecode.proxy")
- || proxyClassName.startsWith("org.apache.dubbo.common.bytecode.proxy")) {
+ if (proxyClassName.startsWith("com.alibaba.dubbo.common.bytecode.proxy") || proxyClassName.startsWith(
+ "org.apache.dubbo.common.bytecode.proxy")) {
return true;
}
return Proxy.class.isAssignableFrom(bean.getClass()) || AopUtils.isAopProxy(bean);
@@ -171,4 +174,22 @@ public class SpringProxyUtils {
}
}
+ /**
+ * get the all interfaces of bean, if the bean is null, then return empty array
+ * @param bean
+ * @return
+ */
+ public static Class<?>[] getAllInterfaces(Object bean) {
+ Set<Class<?>> interfaces = new HashSet<>();
+ if (bean != null) {
+ Class<?> clazz = bean.getClass();
+ while (!Object.class.getName().equalsIgnoreCase(clazz.getName())) {
+ Class<?>[] clazzInterfaces = clazz.getInterfaces();
+ interfaces.addAll(Arrays.asList(clazzInterfaces));
+ clazz = clazz.getSuperclass();
+ }
+ }
+ return interfaces.toArray(new Class[0]);
+ }
+
}
diff --git a/spring/src/main/java/io/seata/spring/util/TCCBeanParserUtils.java b/spring/src/main/java/io/seata/spring/util/TCCBeanParserUtils.java
index e12966d0b427bd46a1833be09bac77bada2b87ba..5e07316b188c032089472e0006bbad9ac4dc05a0 100644
--- a/spring/src/main/java/io/seata/spring/util/TCCBeanParserUtils.java
+++ b/spring/src/main/java/io/seata/spring/util/TCCBeanParserUtils.java
@@ -27,7 +27,6 @@ import org.springframework.context.ApplicationContext;
* parser TCC bean
*
* @author zhangsen
- * @data 2019 /3/18
*/
public class TCCBeanParserUtils {
@@ -88,7 +87,7 @@ public class TCCBeanParserUtils {
if (applicationContext != null && applicationContext.containsBean(factoryBeanName)) {
factoryBean = applicationContext.getBean(factoryBeanName);
}
- //not factory bean，needn't proxy
+ //not factory bean, needn't proxy
if (factoryBean == null) {
return false;
}
@@ -132,11 +131,11 @@ public class TCCBeanParserUtils {
}
/**
- * get remoting bean info: sofa:service、sofa:reference、dubbo:reference、dubbo:service
+ * get remoting bean info: sofa:service, sofa:reference, dubbo:reference, dubbo:service
*
* @param bean the bean
* @param beanName the bean name
- * @return if sofa:service、sofa:reference、dubbo:reference、dubbo:service return true，else return false
+ * @return if sofa:service, sofa:reference, dubbo:reference, dubbo:service return true, else return false
*/
protected static boolean parserRemotingServiceInfo(Object bean, String beanName) {
if (DefaultRemotingParser.get().isRemoting(bean, beanName)) {
diff --git a/spring/src/test/java/io/seata/spring/annotation/MethodDescTest.java b/spring/src/test/java/io/seata/spring/annotation/MethodDescTest.java
index 76e2eaa5e0805723adb158d3bd54ca67089c3c05..0bee38d99577426f9ac9045d89e2dbea5b432828 100644
--- a/spring/src/test/java/io/seata/spring/annotation/MethodDescTest.java
+++ b/spring/src/test/java/io/seata/spring/annotation/MethodDescTest.java
@@ -24,7 +24,6 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author Wu
- * @date 2019/3/8
*/
public class MethodDescTest {
diff --git a/style/seata_checkstyle.xml b/style/seata_checkstyle.xml
index 058a9aeeaa52d1dfa3eaa5d85484b75f5c36a7dd..21150e1549d33d86b409487021d5493a6038467e 100644
--- a/style/seata_checkstyle.xml
+++ b/style/seata_checkstyle.xml
@@ -110,10 +110,14 @@
</module>
<module name="PackageName"/>
<module name="ParameterName"/>
- <module name="StaticVariableName"/>
+ <module name="StaticVariableName">
+ <property name="format" value="^[a-zA-Z0-9_]*$"/>
+ </module>
<module name="TypeName"/>
<!--Checks that there are no import statements that use the * notation-->
<module name="AvoidStarImport"/>
+ <!-- unused imports -->
+ <module name="UnusedImports"/>
<!--whitespace-->
<module name="GenericWhitespace"/>
diff --git a/tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java b/tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java
index d2fb4128ea462667185696b689255d5e50af9735..320a1bf3e84f4915a7a81f3669a1c5af186834c4 100644
--- a/tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java
+++ b/tcc/src/main/java/io/seata/rm/tcc/TCCResourceManager.java
@@ -60,9 +60,6 @@ public class TCCResourceManager extends AbstractResourceManager {
public void registerResource(Resource resource) {
TCCResource tccResource = (TCCResource)resource;
tccResourceCache.put(tccResource.getResourceId(), tccResource);
- synchronized (RESOURCE_LOCK) {
- RESOURCE_LOCK.notifyAll();
- }
super.registerResource(tccResource);
}
diff --git a/tcc/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java b/tcc/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java
index ddd0f84c7cf42e57fe301634c37b06d289cf1a91..8966abc1505f453b80fe81d5f21e548b705f8c8a 100644
--- a/tcc/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java
+++ b/tcc/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java
@@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * the TCC parameters that need to be passed to the BusinessActivityContext；
+ * the TCC parameters that need to be passed to the BusinessActivityContext;
* <p>
* add this annotation on the parameters of the try method, and the parameters will be passed to the
* BusinessActivityContext
diff --git a/tcc/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java b/tcc/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java
index d13fa564ab17027505de78433618d7a3b82e206d..69b3115ab4c4b878f903c4a266465d8ffb502f80 100644
--- a/tcc/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java
+++ b/tcc/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java
@@ -22,7 +22,7 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
/**
- * TCC annotation, Define a TCC interface，which added on the try method
+ * TCC annotation, Define a TCC interface, which added on the try method
*
* @author zhangsen
*/
diff --git a/tcc/src/main/java/io/seata/rm/tcc/interceptor/ActionInterceptorHandler.java b/tcc/src/main/java/io/seata/rm/tcc/interceptor/ActionInterceptorHandler.java
index 5317e67808d0c98f88813e1fc035325195a113ab..76949152ff7cfb089a7ff399d9f9b77bfca82620 100644
--- a/tcc/src/main/java/io/seata/rm/tcc/interceptor/ActionInterceptorHandler.java
+++ b/tcc/src/main/java/io/seata/rm/tcc/interceptor/ActionInterceptorHandler.java
@@ -55,7 +55,7 @@ public class ActionInterceptorHandler {
*/
public Map<String, Object> proceed(Method method, Object[] arguments, String xid, TwoPhaseBusinessAction businessAction,
Callback<Object> targetCallback) throws Throwable {
- Map<String, Object> ret = new HashMap<String, Object>(16);
+ Map<String, Object> ret = new HashMap<String, Object>(4);
//TCC name
String actionName = businessAction.name();
@@ -63,7 +63,6 @@ public class ActionInterceptorHandler {
actionContext.setXid(xid);
//set action anme
actionContext.setActionName(actionName);
- //TODO services
//Creating Branch Record
String branchId = doTccActionLogStore(method, arguments, businessAction, actionContext);
diff --git a/tcc/src/main/java/io/seata/rm/tcc/remoting/RemotingDesc.java b/tcc/src/main/java/io/seata/rm/tcc/remoting/RemotingDesc.java
index bd9b6b5a6e5a78b810d90e59283ff862c872b72a..df91bad93b063b67bea99d2db0a9835a77f74526 100644
--- a/tcc/src/main/java/io/seata/rm/tcc/remoting/RemotingDesc.java
+++ b/tcc/src/main/java/io/seata/rm/tcc/remoting/RemotingDesc.java
@@ -43,7 +43,7 @@ public class RemotingDesc {
private String interfaceClassName;
/**
- * rpc uniqueId: hsf、dubbo's version、sofa-rpc's uniqueId
+ * rpc uniqueId: hsf, dubbo's version, sofa-rpc's uniqueId
*/
private String uniqueId;
@@ -53,7 +53,7 @@ public class RemotingDesc {
private String group;
/**
- * protocol: sofa-rpc、dubbo、injvm etc.
+ * protocol: sofa-rpc, dubbo, injvm etc.
*/
private short protocol;
diff --git a/tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java b/tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java
index a3698c2452193d3be6c0d29f0db1c0015eafe7b7..03360eb89a9788711ea3f40be29eec76ddddb502 100644
--- a/tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java
+++ b/tcc/src/main/java/io/seata/rm/tcc/remoting/parser/DefaultRemotingParser.java
@@ -170,12 +170,11 @@ public class DefaultRemotingParser {
Method[] methods = interfaceClass.getMethods();
if (isService(bean, beanName)) {
try {
- //service bean， registry resource
+ //service bean, registry resource
Object targetBean = remotingBeanDesc.getTargetBean();
for (Method m : methods) {
TwoPhaseBusinessAction twoPhaseBusinessAction = m.getAnnotation(TwoPhaseBusinessAction.class);
if (twoPhaseBusinessAction != null) {
- //
TCCResource tccResource = new TCCResource();
tccResource.setActionName(twoPhaseBusinessAction.name());
tccResource.setTargetBean(targetBean);
@@ -193,11 +192,11 @@ public class DefaultRemotingParser {
}
}
} catch (Throwable t) {
- throw new FrameworkException(t, "parser remting service error");
+ throw new FrameworkException(t, "parser remoting service error");
}
}
if (isReference(bean, beanName)) {
- //reference bean， TCC proxy
+ //reference bean, TCC proxy
remotingBeanDesc.setReference(true);
}
return remotingBeanDesc;
diff --git a/test/src/test/java/io/seata/core/rpc/netty/TmRpcClientTest.java b/test/src/test/java/io/seata/core/rpc/netty/TmRpcClientTest.java
index 9f3a192b98fafcc2a4b3ce7e1d908d4458f2f51a..18c4f7bbcc163b423af4bc3b54b613be7f117c36 100644
--- a/test/src/test/java/io/seata/core/rpc/netty/TmRpcClientTest.java
+++ b/test/src/test/java/io/seata/core/rpc/netty/TmRpcClientTest.java
@@ -32,8 +32,7 @@ import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
/**
- * @author jimin.jm@alibaba-inc.com
- * @date 2019/01/25
+ * @author slievrly
*/
@Disabled
public class TmRpcClientTest {
diff --git a/test/src/test/java/io/seata/saga/engine/StateMachineAsyncTests.java b/test/src/test/java/io/seata/saga/engine/StateMachineAsyncTests.java
index 80fe4a29f3c45d87d38b6c12c6f06db4bdffb25a..5ec0bb89bfd497c90f19e33e2f2cac5b40a2c269 100644
--- a/test/src/test/java/io/seata/saga/engine/StateMachineAsyncTests.java
+++ b/test/src/test/java/io/seata/saga/engine/StateMachineAsyncTests.java
@@ -37,7 +37,7 @@ public class StateMachineAsyncTests {
private static StateMachineEngine stateMachineEngine;
@BeforeAll
- public static void initApplicationContext(){
+ public static void initApplicationContext() {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:saga/spring/statemachine_engine_test.xml");
stateMachineEngine = applicationContext.getBean("stateMachineEngine", StateMachineEngine.class);
}
@@ -45,7 +45,7 @@ public class StateMachineAsyncTests {
@Test
public void testSimpleCatchesStateMachine() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -60,6 +60,28 @@ public class StateMachineAsyncTests {
long cost = System.currentTimeMillis() - start;
System.out.println("====== cost :" + cost);
+ Assertions.assertNotNull(inst.getException());
+ Assertions.assertTrue(ExecutionStatus.FA.equals(inst.getStatus()));
+ }
+
+ @Test
+ public void testSimpleRetryStateMachine() {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+ paramMap.put("barThrowException", "true");
+
+ String stateMachineName = "simpleRetryStateMachine";
+
+ StateMachineInstance inst = stateMachineEngine.startAsync(stateMachineName, null, paramMap, callback);
+
+ waittingForFinish(inst);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
Assertions.assertNotNull(inst.getException());
Assertions.assertTrue(ExecutionStatus.FA.equals(inst.getStatus()));
@@ -68,7 +90,7 @@ public class StateMachineAsyncTests {
@Test
public void testStatusMatchingStateMachine() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -83,7 +105,6 @@ public class StateMachineAsyncTests {
long cost = System.currentTimeMillis() - start;
System.out.println("====== cost :" + cost);
-
Assertions.assertNotNull(inst.getException());
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
}
@@ -91,7 +112,7 @@ public class StateMachineAsyncTests {
@Test
public void testCompensationStateMachine() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -113,7 +134,7 @@ public class StateMachineAsyncTests {
@Test
public void testCompensationAndSubStateMachine() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 2);
@@ -131,10 +152,31 @@ public class StateMachineAsyncTests {
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
}
+ @Test
+ public void testCompensationAndSubStateMachineWithLayout() {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 2);
+ paramMap.put("barThrowException", "true");
+
+ String stateMachineName = "simpleStateMachineWithCompensationAndSubMachine_layout";
+
+ StateMachineInstance inst = stateMachineEngine.startAsync(stateMachineName, null, paramMap, callback);
+
+ waittingForFinish(inst);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
+ }
+
@Test
public void testStateMachineWithComplextParams() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
People people = new People();
@@ -150,7 +192,7 @@ public class StateMachineAsyncTests {
long cost = System.currentTimeMillis() - start;
- People peopleResult = (People)inst.getEndParams().get("complexParameterMethodResult");
+ People peopleResult = (People) inst.getEndParams().get("complexParameterMethodResult");
Assertions.assertNotNull(peopleResult);
Assertions.assertTrue(people.getName().equals(people.getName()));
@@ -159,9 +201,35 @@ public class StateMachineAsyncTests {
Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
}
- private void waittingForFinish(StateMachineInstance inst){
- synchronized (lock){
- if(ExecutionStatus.RU.equals(inst.getStatus())){
+ @Test
+ public void testSimpleStateMachineWithAsyncState() {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+
+ String stateMachineName = "simpleStateMachineWithAsyncState";
+
+ StateMachineInstance inst = stateMachineEngine.startAsync(stateMachineName, null, paramMap, callback);
+
+ waittingForFinish(inst);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
+
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void waittingForFinish(StateMachineInstance inst) {
+ synchronized (lock) {
+ if (ExecutionStatus.RU.equals(inst.getStatus())) {
try {
lock.wait();
} catch (InterruptedException e) {
@@ -171,18 +239,18 @@ public class StateMachineAsyncTests {
}
}
- private volatile Object lock = new Object();
- private AsyncCallback callback = new AsyncCallback() {
+ private volatile Object lock = new Object();
+ private AsyncCallback callback = new AsyncCallback() {
@Override
public void onFinished(ProcessContext context, StateMachineInstance stateMachineInstance) {
- synchronized (lock){
+ synchronized (lock) {
lock.notifyAll();
}
}
@Override
public void onError(ProcessContext context, StateMachineInstance stateMachineInstance, Exception exp) {
- synchronized (lock){
+ synchronized (lock) {
lock.notifyAll();
}
}
diff --git a/test/src/test/java/io/seata/saga/engine/StateMachineTests.java b/test/src/test/java/io/seata/saga/engine/StateMachineTests.java
index 7cbfb4da6ec201c0393679b5eb830a7414fe25f6..42c64d126637f519578de7447560fa1403257e4d 100644
--- a/test/src/test/java/io/seata/saga/engine/StateMachineTests.java
+++ b/test/src/test/java/io/seata/saga/engine/StateMachineTests.java
@@ -38,7 +38,7 @@ public class StateMachineTests {
private static StateMachineEngine stateMachineEngine;
@BeforeAll
- public static void initApplicationContext(){
+ public static void initApplicationContext() {
ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:saga/spring/statemachine_engine_test.xml");
stateMachineEngine = applicationContext.getBean("stateMachineEngine", StateMachineEngine.class);
}
@@ -52,7 +52,7 @@ public class StateMachineTests {
@Test
public void testSimpleStateMachineWithChoice() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("a", 1);
@@ -64,7 +64,7 @@ public class StateMachineTests {
long cost = System.currentTimeMillis() - start;
System.out.println("====== cost :" + cost);
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
paramMap.put("a", 2);
stateMachineEngine.start(stateMachineName, null, paramMap);
@@ -75,7 +75,7 @@ public class StateMachineTests {
@Test
public void testSimpleStateMachineWithChoiceAndEnd() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -87,7 +87,7 @@ public class StateMachineTests {
long cost = System.currentTimeMillis() - start;
System.out.println("====== cost :" + cost);
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
paramMap.put("a", 3);
stateMachineEngine.start(stateMachineName, null, paramMap);
@@ -99,7 +99,7 @@ public class StateMachineTests {
@Test
public void testSimpleInputAssignmentStateMachine() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -112,7 +112,8 @@ public class StateMachineTests {
Assertions.assertNotNull(businessKey);
System.out.println("====== businessKey :" + businessKey);
- String contextBusinessKey = (String)instance.getEndParams().get(instance.getStateList().get(0).getName()+ DomainConstants.VAR_NAME_BUSINESSKEY);
+ String contextBusinessKey = (String) instance.getEndParams().get(
+ instance.getStateList().get(0).getName() + DomainConstants.VAR_NAME_BUSINESSKEY);
Assertions.assertNotNull(contextBusinessKey);
System.out.println("====== context businessKey :" + businessKey);
@@ -123,7 +124,7 @@ public class StateMachineTests {
@Test
public void testSimpleCatchesStateMachine() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -141,7 +142,7 @@ public class StateMachineTests {
}
@Test
- public void testStatusMatchingStateMachine() {
+ public void testSimpleRetryStateMachine() {
long start = System.currentTimeMillis();
@@ -149,6 +150,26 @@ public class StateMachineTests {
paramMap.put("a", 1);
paramMap.put("barThrowException", "true");
+ String stateMachineName = "simpleRetryStateMachine";
+
+ StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertNotNull(inst.getException());
+ Assertions.assertTrue(ExecutionStatus.FA.equals(inst.getStatus()));
+ }
+
+ @Test
+ public void testStatusMatchingStateMachine() {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+ paramMap.put("barThrowException", "true");
+
String stateMachineName = "simpleStatusMatchingStateMachine";
StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
@@ -160,11 +181,10 @@ public class StateMachineTests {
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
}
-
@Test
public void testCompensationStateMachine() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -184,7 +204,7 @@ public class StateMachineTests {
@Test
public void testCompensationAndSubStateMachine() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 2);
@@ -200,10 +220,29 @@ public class StateMachineTests {
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
}
+ @Test
+ public void testCompensationAndSubStateMachineWithLayout() {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 2);
+ paramMap.put("barThrowException", "true");
+
+ String stateMachineName = "simpleStateMachineWithCompensationAndSubMachine_layout";
+
+ StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
+ }
+
@Test
public void testStateMachineWithComplextParams() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
People people = new People();
@@ -219,7 +258,7 @@ public class StateMachineTests {
String stateMachineName = "simpleStateMachineWithComplexParams";
StateMachineInstance instance = stateMachineEngine.start(stateMachineName, null, paramMap);
- People peopleResult = (People)instance.getEndParams().get("complexParameterMethodResult");
+ People peopleResult = (People) instance.getEndParams().get("complexParameterMethodResult");
Assertions.assertNotNull(peopleResult);
Assertions.assertTrue(people.getName().equals(people.getName()));
@@ -228,4 +267,28 @@ public class StateMachineTests {
Assertions.assertTrue(ExecutionStatus.SU.equals(instance.getStatus()));
}
+
+ @Test
+ public void testSimpleStateMachineWithAsyncState() {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+
+ String stateMachineName = "simpleStateMachineWithAsyncState";
+
+ StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
+
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
}
\ No newline at end of file
diff --git a/test/src/test/java/io/seata/saga/engine/db/StateMachineDBTests.java b/test/src/test/java/io/seata/saga/engine/db/StateMachineDBTests.java
index 0af1510245eccc1c3acfd32f8d98710c3bc1aa9f..cb27d88785bf44580f13ca4f974978c1cdc9d86b 100644
--- a/test/src/test/java/io/seata/saga/engine/db/StateMachineDBTests.java
+++ b/test/src/test/java/io/seata/saga/engine/db/StateMachineDBTests.java
@@ -49,10 +49,10 @@ public class StateMachineDBTests extends AbstractServerTest {
stateMachineEngine = applicationContext.getBean("stateMachineEngine", StateMachineEngine.class);
}
- private GlobalTransaction getGlobalTransaction(StateMachineInstance instance){
+ private GlobalTransaction getGlobalTransaction(StateMachineInstance instance) {
Map<String, Object> params = instance.getContext();
- if(params != null){
- return (GlobalTransaction)params.get(DomainConstants.VAR_NAME_GLOBAL_TX);
+ if (params != null) {
+ return (GlobalTransaction) params.get(DomainConstants.VAR_NAME_GLOBAL_TX);
}
return null;
}
@@ -66,7 +66,7 @@ public class StateMachineDBTests extends AbstractServerTest {
@Test
public void testSimpleStateMachineWithChoice() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("a", 1);
@@ -78,7 +78,7 @@ public class StateMachineDBTests extends AbstractServerTest {
long cost = System.currentTimeMillis() - start;
System.out.println("====== cost :" + cost);
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
paramMap.put("a", 2);
stateMachineEngine.start(stateMachineName, null, paramMap);
@@ -89,7 +89,7 @@ public class StateMachineDBTests extends AbstractServerTest {
@Test
public void testSimpleStateMachineWithChoiceAndEnd() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -101,7 +101,7 @@ public class StateMachineDBTests extends AbstractServerTest {
long cost = System.currentTimeMillis() - start;
System.out.println("====== cost :" + cost);
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
paramMap.put("a", 3);
stateMachineEngine.start(stateMachineName, null, paramMap);
@@ -113,7 +113,7 @@ public class StateMachineDBTests extends AbstractServerTest {
@Test
public void testSimpleInputAssignmentStateMachine() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -126,7 +126,8 @@ public class StateMachineDBTests extends AbstractServerTest {
Assertions.assertNotNull(businessKey);
System.out.println("====== businessKey :" + businessKey);
- String contextBusinessKey = (String)instance.getEndParams().get(instance.getStateList().get(0).getName()+ DomainConstants.VAR_NAME_BUSINESSKEY);
+ String contextBusinessKey = (String) instance.getEndParams().get(
+ instance.getStateList().get(0).getName() + DomainConstants.VAR_NAME_BUSINESSKEY);
Assertions.assertNotNull(contextBusinessKey);
System.out.println("====== context businessKey :" + businessKey);
@@ -137,7 +138,7 @@ public class StateMachineDBTests extends AbstractServerTest {
@Test
public void testSimpleCatchesStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -159,7 +160,7 @@ public class StateMachineDBTests extends AbstractServerTest {
}
@Test
- public void testStatusMatchingStateMachine() throws Exception {
+ public void testSimpleRetryStateMachine() {
long start = System.currentTimeMillis();
@@ -167,6 +168,26 @@ public class StateMachineDBTests extends AbstractServerTest {
paramMap.put("a", 1);
paramMap.put("barThrowException", "true");
+ String stateMachineName = "simpleRetryStateMachine";
+
+ StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertNotNull(inst.getException());
+ Assertions.assertTrue(ExecutionStatus.FA.equals(inst.getStatus()));
+ }
+
+ @Test
+ public void testStatusMatchingStateMachine() throws Exception {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+ paramMap.put("barThrowException", "true");
+
String stateMachineName = "simpleStatusMatchingStateMachine";
StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
@@ -183,11 +204,10 @@ public class StateMachineDBTests extends AbstractServerTest {
Assertions.assertTrue(GlobalStatus.CommitRetrying.equals(globalTransaction.getStatus()));
}
-
@Test
public void testCompensationStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -212,7 +232,7 @@ public class StateMachineDBTests extends AbstractServerTest {
@Test
public void testCompensationAndSubStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 2);
@@ -232,10 +252,33 @@ public class StateMachineDBTests extends AbstractServerTest {
Assertions.assertTrue(GlobalStatus.CommitRetrying.equals(globalTransaction.getStatus()));
}
+ @Test
+ public void testCompensationAndSubStateMachineLayout() throws Exception {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 2);
+ paramMap.put("barThrowException", "true");
+
+ String stateMachineName = "simpleStateMachineWithCompensationAndSubMachine_layout";
+
+ StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
+
+ GlobalTransaction globalTransaction = getGlobalTransaction(inst);
+ Assertions.assertNotNull(globalTransaction);
+ Assertions.assertTrue(GlobalStatus.CommitRetrying.equals(globalTransaction.getStatus()));
+ }
+
@Test
public void testCompensationStateMachineForRecovery() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -253,26 +296,51 @@ public class StateMachineDBTests extends AbstractServerTest {
GlobalTransaction globalTransaction = getGlobalTransaction(inst);
Assertions.assertNotNull(globalTransaction);
- System.out.println("====== GlobalStatus: "+globalTransaction.getStatus());
+ System.out.println("====== GlobalStatus: " + globalTransaction.getStatus());
// waiting for global transaction recover
- while (!(ExecutionStatus.SU.equals(inst.getStatus()) || ExecutionStatus.SU.equals(inst.getCompensationStatus()))){
- System.out.println("====== GlobalStatus: "+globalTransaction.getStatus());
+ while (!(ExecutionStatus.SU.equals(inst.getStatus()) || ExecutionStatus.SU.equals(inst.getCompensationStatus()))) {
+ System.out.println("====== GlobalStatus: " + globalTransaction.getStatus());
Thread.sleep(2000);
inst = stateMachineEngine.getStateMachineConfig().getStateLogStore().getStateMachineInstance(inst.getId());
}
}
@Test
- public void testReloadStateMachineInstance(){
- StateMachineInstance instance = stateMachineEngine.getStateMachineConfig().getStateLogStore().getStateMachineInstance("10.15.232.93:8091:2019567124");
+ public void testReloadStateMachineInstance() {
+ StateMachineInstance instance = stateMachineEngine.getStateMachineConfig().getStateLogStore().getStateMachineInstance(
+ "10.15.232.93:8091:2019567124");
System.out.println(instance);
}
+ @Test
+ public void testSimpleStateMachineWithAsyncState() {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+
+ String stateMachineName = "simpleStateMachineWithAsyncState";
+
+ StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
+
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
@Test
public void testSimpleCatchesStateMachineAsync() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -287,7 +355,6 @@ public class StateMachineDBTests extends AbstractServerTest {
long cost = System.currentTimeMillis() - start;
System.out.println("====== cost :" + cost);
-
Assertions.assertNotNull(inst.getException());
Assertions.assertTrue(ExecutionStatus.FA.equals(inst.getStatus()));
@@ -297,7 +364,7 @@ public class StateMachineDBTests extends AbstractServerTest {
}
@Test
- public void testStatusMatchingStateMachineAsync() throws Exception {
+ public void testSimpleRetryStateMachineAsync() {
long start = System.currentTimeMillis();
@@ -305,7 +372,7 @@ public class StateMachineDBTests extends AbstractServerTest {
paramMap.put("a", 1);
paramMap.put("barThrowException", "true");
- String stateMachineName = "simpleStatusMatchingStateMachine";
+ String stateMachineName = "simpleRetryStateMachine";
StateMachineInstance inst = stateMachineEngine.startAsync(stateMachineName, null, paramMap, callback);
@@ -315,6 +382,28 @@ public class StateMachineDBTests extends AbstractServerTest {
System.out.println("====== cost :" + cost);
+ Assertions.assertNotNull(inst.getException());
+ Assertions.assertTrue(ExecutionStatus.FA.equals(inst.getStatus()));
+ }
+
+ @Test
+ public void testStatusMatchingStateMachineAsync() throws Exception {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+ paramMap.put("barThrowException", "true");
+
+ String stateMachineName = "simpleStatusMatchingStateMachine";
+
+ StateMachineInstance inst = stateMachineEngine.startAsync(stateMachineName, null, paramMap, callback);
+
+ waittingForFinish(inst);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
Assertions.assertNotNull(inst.getException());
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
@@ -326,7 +415,7 @@ public class StateMachineDBTests extends AbstractServerTest {
@Test
public void testCompensationStateMachineAsync() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -352,7 +441,7 @@ public class StateMachineDBTests extends AbstractServerTest {
@Test
public void testCompensationAndSubStateMachineAsync() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 2);
@@ -374,9 +463,59 @@ public class StateMachineDBTests extends AbstractServerTest {
Assertions.assertTrue(GlobalStatus.CommitRetrying.equals(globalTransaction.getStatus()));
}
- private void waittingForFinish(StateMachineInstance inst){
- synchronized (lock){
- if(ExecutionStatus.RU.equals(inst.getStatus())){
+ @Test
+ public void testCompensationAndSubStateMachineAsyncWithLayout() throws Exception {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 2);
+ paramMap.put("barThrowException", "true");
+
+ String stateMachineName = "simpleStateMachineWithCompensationAndSubMachine_layout";
+
+ StateMachineInstance inst = stateMachineEngine.startAsync(stateMachineName, null, paramMap, callback);
+
+ waittingForFinish(inst);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
+
+ GlobalTransaction globalTransaction = getGlobalTransaction(inst);
+ Assertions.assertNotNull(globalTransaction);
+ Assertions.assertTrue(GlobalStatus.CommitRetrying.equals(globalTransaction.getStatus()));
+ }
+
+ @Test
+ public void testAsyncStartSimpleStateMachineWithAsyncState() {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+
+ String stateMachineName = "simpleStateMachineWithAsyncState";
+
+ StateMachineInstance inst = stateMachineEngine.startAsync(stateMachineName, null, paramMap, callback);
+
+ waittingForFinish(inst);
+
+ Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void waittingForFinish(StateMachineInstance inst) {
+ synchronized (lock) {
+ if (ExecutionStatus.RU.equals(inst.getStatus())) {
try {
lock.wait();
} catch (InterruptedException e) {
@@ -390,14 +529,14 @@ public class StateMachineDBTests extends AbstractServerTest {
private AsyncCallback callback = new AsyncCallback() {
@Override
public void onFinished(ProcessContext context, StateMachineInstance stateMachineInstance) {
- synchronized (lock){
+ synchronized (lock) {
lock.notifyAll();
}
}
@Override
public void onError(ProcessContext context, StateMachineInstance stateMachineInstance, Exception exp) {
- synchronized (lock){
+ synchronized (lock) {
lock.notifyAll();
}
}
diff --git a/test/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineAsyncDBMockServerTests.java b/test/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineAsyncDBMockServerTests.java
index ef3a522f99904c2fedc98b500374fbd25ac09735..10087333686677d49886f30f4b14a742cae2ee43 100644
--- a/test/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineAsyncDBMockServerTests.java
+++ b/test/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineAsyncDBMockServerTests.java
@@ -40,14 +40,15 @@ public class StateMachineAsyncDBMockServerTests {
@BeforeAll
public static void initApplicationContext() throws InterruptedException {
- ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:saga/spring/statemachine_engine_db_mockserver_test.xml");
+ ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
+ "classpath:saga/spring/statemachine_engine_db_mockserver_test.xml");
stateMachineEngine = applicationContext.getBean("stateMachineEngine", StateMachineEngine.class);
}
@Test
public void testSimpleCatchesStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -62,6 +63,28 @@ public class StateMachineAsyncDBMockServerTests {
long cost = System.currentTimeMillis() - start;
System.out.println("====== cost :" + cost);
+ Assertions.assertNotNull(inst.getException());
+ Assertions.assertTrue(ExecutionStatus.FA.equals(inst.getStatus()));
+ }
+
+ @Test
+ public void testSimpleRetryStateMachine() {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+ paramMap.put("barThrowException", "true");
+
+ String stateMachineName = "simpleRetryStateMachine";
+
+ StateMachineInstance inst = stateMachineEngine.startAsync(stateMachineName, null, paramMap, callback);
+
+ waittingForFinish(inst);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
Assertions.assertNotNull(inst.getException());
Assertions.assertTrue(ExecutionStatus.FA.equals(inst.getStatus()));
@@ -70,7 +93,7 @@ public class StateMachineAsyncDBMockServerTests {
@Test
public void testStatusMatchingStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -85,7 +108,6 @@ public class StateMachineAsyncDBMockServerTests {
long cost = System.currentTimeMillis() - start;
System.out.println("====== cost :" + cost);
-
Assertions.assertNotNull(inst.getException());
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
}
@@ -93,7 +115,7 @@ public class StateMachineAsyncDBMockServerTests {
@Test
public void testCompensationStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -115,7 +137,7 @@ public class StateMachineAsyncDBMockServerTests {
@Test
public void testCompensationAndSubStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 2);
@@ -133,10 +155,31 @@ public class StateMachineAsyncDBMockServerTests {
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
}
+ @Test
+ public void testCompensationAndSubStateMachineWithLayout() throws Exception {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 2);
+ paramMap.put("barThrowException", "true");
+
+ String stateMachineName = "simpleStateMachineWithCompensationAndSubMachine_layout";
+
+ StateMachineInstance inst = stateMachineEngine.startAsync(stateMachineName, null, paramMap, callback);
+
+ waittingForFinish(inst);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
+ }
+
@Test
public void testStateMachineWithComplextParams() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
People people = new People();
@@ -152,7 +195,7 @@ public class StateMachineAsyncDBMockServerTests {
long cost = System.currentTimeMillis() - start;
- People peopleResult = (People)inst.getEndParams().get("complexParameterMethodResult");
+ People peopleResult = (People) inst.getEndParams().get("complexParameterMethodResult");
Assertions.assertNotNull(peopleResult);
Assertions.assertTrue(people.getName().equals(people.getName()));
@@ -161,9 +204,35 @@ public class StateMachineAsyncDBMockServerTests {
Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
}
- private void waittingForFinish(StateMachineInstance inst){
- synchronized (lock){
- if(ExecutionStatus.RU.equals(inst.getStatus())){
+ @Test
+ public void testSimpleStateMachineWithAsyncState() {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+
+ String stateMachineName = "simpleStateMachineWithAsyncState";
+
+ StateMachineInstance inst = stateMachineEngine.startAsync(stateMachineName, null, paramMap, callback);
+
+ waittingForFinish(inst);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
+
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ private void waittingForFinish(StateMachineInstance inst) {
+ synchronized (lock) {
+ if (ExecutionStatus.RU.equals(inst.getStatus())) {
try {
lock.wait();
} catch (InterruptedException e) {
@@ -173,18 +242,18 @@ public class StateMachineAsyncDBMockServerTests {
}
}
- private volatile Object lock = new Object();
- private AsyncCallback callback = new AsyncCallback() {
+ private volatile Object lock = new Object();
+ private AsyncCallback callback = new AsyncCallback() {
@Override
public void onFinished(ProcessContext context, StateMachineInstance stateMachineInstance) {
- synchronized (lock){
+ synchronized (lock) {
lock.notifyAll();
}
}
@Override
public void onError(ProcessContext context, StateMachineInstance stateMachineInstance, Exception exp) {
- synchronized (lock){
+ synchronized (lock) {
lock.notifyAll();
}
}
diff --git a/test/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineDBMockServerTests.java b/test/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineDBMockServerTests.java
index 03709794880e7558f63e2b75bf3f32f283be907a..2cdf62feae8bdd05786f3c8c2f2c789e75574c76 100644
--- a/test/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineDBMockServerTests.java
+++ b/test/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineDBMockServerTests.java
@@ -21,6 +21,7 @@ import io.seata.saga.engine.mock.DemoService.People;
import io.seata.saga.statelang.domain.DomainConstants;
import io.seata.saga.statelang.domain.ExecutionStatus;
import io.seata.saga.statelang.domain.StateMachineInstance;
+import io.seata.saga.statelang.parser.utils.DesignerJsonTransformer;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
@@ -40,7 +41,8 @@ public class StateMachineDBMockServerTests {
@BeforeAll
public static void initApplicationContext() throws InterruptedException {
- ApplicationContext applicationContext = new ClassPathXmlApplicationContext("classpath:saga/spring/statemachine_engine_db_mockserver_test.xml");
+ ApplicationContext applicationContext = new ClassPathXmlApplicationContext(
+ "classpath:saga/spring/statemachine_engine_db_mockserver_test.xml");
stateMachineEngine = applicationContext.getBean("stateMachineEngine", StateMachineEngine.class);
}
@@ -53,7 +55,7 @@ public class StateMachineDBMockServerTests {
@Test
public void testSimpleStateMachineWithChoice() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -71,7 +73,7 @@ public class StateMachineDBMockServerTests {
Assertions.assertNotNull(inst);
Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
paramMap.put("a", 2);
inst = stateMachineEngine.start(stateMachineName, null, paramMap);
@@ -84,7 +86,7 @@ public class StateMachineDBMockServerTests {
@Test
public void testSimpleStateMachineWithChoiceAndEnd() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -96,7 +98,7 @@ public class StateMachineDBMockServerTests {
long cost = System.currentTimeMillis() - start;
System.out.println("====== cost :" + cost);
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
paramMap.put("a", 3);
stateMachineEngine.start(stateMachineName, null, paramMap);
@@ -108,7 +110,7 @@ public class StateMachineDBMockServerTests {
@Test
public void testSimpleInputAssignmentStateMachine() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -121,7 +123,8 @@ public class StateMachineDBMockServerTests {
Assertions.assertNotNull(businessKey);
System.out.println("====== businessKey :" + businessKey);
- String contextBusinessKey = (String)instance.getEndParams().get(instance.getStateList().get(0).getName()+ DomainConstants.VAR_NAME_BUSINESSKEY);
+ String contextBusinessKey = (String) instance.getEndParams().get(
+ instance.getStateList().get(0).getName() + DomainConstants.VAR_NAME_BUSINESSKEY);
Assertions.assertNotNull(contextBusinessKey);
System.out.println("====== context businessKey :" + businessKey);
@@ -132,7 +135,7 @@ public class StateMachineDBMockServerTests {
@Test
public void testSimpleCatchesStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -150,7 +153,7 @@ public class StateMachineDBMockServerTests {
}
@Test
- public void testStatusMatchingStateMachine() throws Exception {
+ public void testSimpleRetryStateMachine() {
long start = System.currentTimeMillis();
@@ -158,6 +161,26 @@ public class StateMachineDBMockServerTests {
paramMap.put("a", 1);
paramMap.put("barThrowException", "true");
+ String stateMachineName = "simpleRetryStateMachine";
+
+ StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertNotNull(inst.getException());
+ Assertions.assertTrue(ExecutionStatus.FA.equals(inst.getStatus()));
+ }
+
+ @Test
+ public void testStatusMatchingStateMachine() throws Exception {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+ paramMap.put("barThrowException", "true");
+
String stateMachineName = "simpleStatusMatchingStateMachine";
StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
@@ -169,11 +192,10 @@ public class StateMachineDBMockServerTests {
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
}
-
@Test
public void testCompensationStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -193,7 +215,7 @@ public class StateMachineDBMockServerTests {
@Test
public void testSubStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 2);
@@ -208,7 +230,36 @@ public class StateMachineDBMockServerTests {
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
+
+ paramMap.put("barThrowException", "false");
+ inst = stateMachineEngine.forward(inst.getId(), paramMap);
+
+ cost = System.currentTimeMillis() - start;
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
+ }
+
+ @Test
+ public void testSubStateMachineWithLayout() throws Exception {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 2);
+ paramMap.put("barThrowException", "true");
+
+ String stateMachineName = "simpleStateMachineWithCompensationAndSubMachine_layout";
+
+ StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
+
+ start = System.currentTimeMillis();
paramMap.put("barThrowException", "false");
inst = stateMachineEngine.forward(inst.getId(), paramMap);
@@ -222,7 +273,7 @@ public class StateMachineDBMockServerTests {
@Test
public void testForwardSubStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 2);
@@ -237,7 +288,7 @@ public class StateMachineDBMockServerTests {
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
paramMap.put("fooThrowException", "false");
inst = stateMachineEngine.forward(inst.getId(), paramMap);
@@ -248,10 +299,47 @@ public class StateMachineDBMockServerTests {
Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
}
+ @Test
+ public void testForwardSubStateMachineWithLayout() throws Exception {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 2);
+ paramMap.put("fooThrowException", "true");
+
+ String stateMachineName = "simpleStateMachineWithCompensationAndSubMachine_layout";
+
+ StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
+
+ String graphJson = DesignerJsonTransformer.generateTracingGraphJson(inst);
+ Assertions.assertNotNull(graphJson);
+ System.out.println(graphJson);
+
+ start = System.currentTimeMillis();
+
+ paramMap.put("fooThrowException", "false");
+ inst = stateMachineEngine.forward(inst.getId(), paramMap);
+
+ cost = System.currentTimeMillis() - start;
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
+
+ String graphJson2 = DesignerJsonTransformer.generateTracingGraphJson(inst);
+ Assertions.assertNotNull(graphJson2);
+ System.out.println(graphJson2);
+ }
+
@Test
public void testCompensateSubStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 2);
@@ -267,7 +355,40 @@ public class StateMachineDBMockServerTests {
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
+
+ inst = stateMachineEngine.compensate(inst.getId(), paramMap);
+
+ cost = System.currentTimeMillis() - start;
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getCompensationStatus()));
+ }
+
+ @Test
+ public void testCompensateSubStateMachineWithLayout() throws Exception {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 2);
+ paramMap.put("barThrowException", "true");
+ paramMap.put("compensateFooThrowException", "true");
+
+ String stateMachineName = "simpleStateMachineWithCompensationAndSubMachine_layout";
+
+ StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
+
+ String graphJson = DesignerJsonTransformer.generateTracingGraphJson(inst);
+ Assertions.assertNotNull(graphJson);
+ System.out.println(graphJson);
+
+ start = System.currentTimeMillis();
inst = stateMachineEngine.compensate(inst.getId(), paramMap);
@@ -275,12 +396,16 @@ public class StateMachineDBMockServerTests {
System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getCompensationStatus()));
+
+ String graphJson2 = DesignerJsonTransformer.generateTracingGraphJson(inst);
+ Assertions.assertNotNull(graphJson2);
+ System.out.println(graphJson2);
}
@Test
public void testUserDefCompensateSubStateMachine() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 2);
@@ -296,7 +421,7 @@ public class StateMachineDBMockServerTests {
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
paramMap.put("compensateFooThrowException", "false");
inst = stateMachineEngine.compensate(inst.getId(), paramMap);
@@ -310,7 +435,7 @@ public class StateMachineDBMockServerTests {
@Test
public void testCommitRetryingThenRetryCommitted() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -321,19 +446,18 @@ public class StateMachineDBMockServerTests {
StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
long cost = System.currentTimeMillis() - start;
- System.out.println("====== XID: "+ inst.getId() +" cost :" + cost);
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
-
paramMap.put("fooThrowException", "false");
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
inst = stateMachineEngine.forward(inst.getId(), paramMap);
cost = System.currentTimeMillis() - start;
- System.out.println("====== XID: "+ inst.getId() +" cost :" + cost);
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
}
@@ -341,7 +465,7 @@ public class StateMachineDBMockServerTests {
@Test
public void testCommitRetryingThenRetryRollbacked() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -352,20 +476,19 @@ public class StateMachineDBMockServerTests {
StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
long cost = System.currentTimeMillis() - start;
- System.out.println("====== XID: "+ inst.getId() +" cost :" + cost);
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
-
paramMap.put("fooThrowException", "false");
paramMap.put("barThrowException", "true");
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
inst = stateMachineEngine.forward(inst.getId(), paramMap);
cost = System.currentTimeMillis() - start;
- System.out.println("====== XID: "+ inst.getId() +" cost :" + cost);
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getCompensationStatus()));
}
@@ -373,7 +496,7 @@ public class StateMachineDBMockServerTests {
@Test
public void testRollbackRetryingThenRetryRollbacked() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -385,21 +508,20 @@ public class StateMachineDBMockServerTests {
StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
long cost = System.currentTimeMillis() - start;
- System.out.println("====== XID: "+ inst.getId() +" cost :" + cost);
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getCompensationStatus()));
-
paramMap.put("barThrowException", "false");
paramMap.put("compensateFooThrowException", "false");
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
inst = stateMachineEngine.compensate(inst.getId(), paramMap);
cost = System.currentTimeMillis() - start;
- System.out.println("====== XID: "+ inst.getId() +" cost :" + cost);
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getCompensationStatus()));
}
@@ -407,7 +529,7 @@ public class StateMachineDBMockServerTests {
@Test
public void testRollbackRetryingTwiceThenRetryRollbacked() throws Exception {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
paramMap.put("a", 1);
@@ -419,17 +541,17 @@ public class StateMachineDBMockServerTests {
StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
long cost = System.currentTimeMillis() - start;
- System.out.println("====== XID: "+ inst.getId() +" cost :" + cost);
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getCompensationStatus()));
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
inst = stateMachineEngine.compensate(inst.getId(), paramMap);
cost = System.currentTimeMillis() - start;
- System.out.println("====== XID: "+ inst.getId() +" cost :" + cost);
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getStatus()));
Assertions.assertTrue(ExecutionStatus.UN.equals(inst.getCompensationStatus()));
@@ -437,12 +559,12 @@ public class StateMachineDBMockServerTests {
paramMap.put("barThrowException", "false");
paramMap.put("compensateFooThrowException", "false");
- start = System.currentTimeMillis();
+ start = System.currentTimeMillis();
inst = stateMachineEngine.compensate(inst.getId(), paramMap);
cost = System.currentTimeMillis() - start;
- System.out.println("====== XID: "+ inst.getId() +" cost :" + cost);
+ System.out.println("====== XID: " + inst.getId() + " cost :" + cost);
Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getCompensationStatus()));
}
@@ -450,7 +572,7 @@ public class StateMachineDBMockServerTests {
@Test
public void testStateMachineWithComplextParams() {
- long start = System.currentTimeMillis();
+ long start = System.currentTimeMillis();
Map<String, Object> paramMap = new HashMap<>(1);
People people = new People();
@@ -467,19 +589,44 @@ public class StateMachineDBMockServerTests {
StateMachineInstance instance = stateMachineEngine.start(stateMachineName, null, paramMap);
- People peopleResult = (People)instance.getEndParams().get("complexParameterMethodResult");
+ People peopleResult = (People) instance.getEndParams().get("complexParameterMethodResult");
Assertions.assertNotNull(peopleResult);
Assertions.assertTrue(people.getName().equals(people.getName()));
long cost = System.currentTimeMillis() - start;
- System.out.println("====== XID: "+ instance.getId() +" cost :" + cost);
+ System.out.println("====== XID: " + instance.getId() + " cost :" + cost);
Assertions.assertTrue(ExecutionStatus.SU.equals(instance.getStatus()));
}
@Test
- public void testReloadStateMachineInstance(){
- StateMachineInstance instance = stateMachineEngine.getStateMachineConfig().getStateLogStore().getStateMachineInstance("10.15.232.93:8091:2019567124");
+ public void testSimpleStateMachineWithAsyncState() {
+
+ long start = System.currentTimeMillis();
+
+ Map<String, Object> paramMap = new HashMap<>(1);
+ paramMap.put("a", 1);
+
+ String stateMachineName = "simpleStateMachineWithAsyncState";
+
+ StateMachineInstance inst = stateMachineEngine.start(stateMachineName, null, paramMap);
+
+ long cost = System.currentTimeMillis() - start;
+ System.out.println("====== cost :" + cost);
+
+ Assertions.assertTrue(ExecutionStatus.SU.equals(inst.getStatus()));
+
+ try {
+ Thread.sleep(500);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testReloadStateMachineInstance() {
+ StateMachineInstance instance = stateMachineEngine.getStateMachineConfig().getStateLogStore().getStateMachineInstance(
+ "10.15.232.93:8091:2019567124");
System.out.println(instance);
}
}
\ No newline at end of file
diff --git a/test/src/test/java/io/seata/saga/engine/mock/DemoException.java b/test/src/test/java/io/seata/saga/engine/mock/DemoException.java
new file mode 100644
index 0000000000000000000000000000000000000000..709b0bf77e883b619cdd5d1c45cea5db364741f7
--- /dev/null
+++ b/test/src/test/java/io/seata/saga/engine/mock/DemoException.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.saga.engine.mock;
+
+/**
+ *
+ * @author lorne.cl
+ */
+public class DemoException extends RuntimeException {
+
+ public DemoException() {
+ }
+
+ public DemoException(String message) {
+ super(message);
+ }
+
+ public DemoException(String message, Throwable cause) {
+ super(message, cause);
+ }
+
+ public DemoException(Throwable cause) {
+ super(cause);
+ }
+
+ public DemoException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ }
+}
\ No newline at end of file
diff --git a/test/src/test/java/io/seata/saga/engine/mock/DemoService.java b/test/src/test/java/io/seata/saga/engine/mock/DemoService.java
index 5c1ebbff6ad7b618ac25be105ad62ff051cd2d2e..bd83d12a9f2a543eec10ec7323e32d3314ce6907 100644
--- a/test/src/test/java/io/seata/saga/engine/mock/DemoService.java
+++ b/test/src/test/java/io/seata/saga/engine/mock/DemoService.java
@@ -15,9 +15,7 @@
*/
package io.seata.saga.engine.mock;
-import io.seata.saga.engine.exception.EngineExecutionException;
-
-import java.util.HashMap;
+import java.net.ConnectException;
import java.util.List;
import java.util.Map;
@@ -28,14 +26,14 @@ public class DemoService {
public Map<String, Object> foo(Map<String, Object> input) {
if(input == null){
- return new HashMap<>(0);
+ return null;
}
if("true".equals(input.get("throwException"))){
- throw new EngineExecutionException("foo execute failed");
+ throw new DemoException("foo execute failed");
}
if("true".equals(input.get("throwExceptionRandomly"))){
if(Math.random() > 0.5){
- throw new EngineExecutionException("foo execute failed");
+ throw new DemoException("foo execute failed");
}
}
return input;
@@ -43,14 +41,14 @@ public class DemoService {
public Map<String, Object> compensateFoo(Map<String, Object> input) {
if(input == null){
- return new HashMap<>(0);
+ return null;
}
if("true".equals(input.get("throwException"))){
- throw new EngineExecutionException("compensateFoo execute failed");
+ throw new DemoException("compensateFoo execute failed");
}
if("true".equals(input.get("throwExceptionRandomly"))){
if(Math.random() > 0.8){
- throw new EngineExecutionException("compensateFoo execute failed");
+ throw new DemoException("compensateFoo execute failed");
}
}
return input;
@@ -58,14 +56,14 @@ public class DemoService {
public Map<String, Object> bar(Map<String, Object> input) {
if(input == null){
- return new HashMap<>(0);
+ return null;
}
if("true".equals(input.get("throwException"))){
- throw new EngineExecutionException("bar execute failed");
+ throw new DemoException("bar execute failed");
}
if("true".equals(input.get("throwExceptionRandomly"))){
if(Math.random() > 0.5){
- throw new EngineExecutionException("bar execute failed");
+ throw new DemoException("bar execute failed");
}
}
return input;
@@ -73,14 +71,14 @@ public class DemoService {
public Map<String, Object> compensateBar(Map<String, Object> input) {
if(input == null){
- return new HashMap<>(0);
+ return null;
}
if("true".equals(input.get("throwException"))){
- throw new EngineExecutionException("compensateBar execute failed");
+ throw new DemoException("compensateBar execute failed");
}
if("true".equals(input.get("throwExceptionRandomly"))){
if(Math.random() > 0.8){
- throw new EngineExecutionException("compensateBar execute failed");
+ throw new DemoException("compensateBar execute failed");
}
}
return input;
@@ -94,6 +92,17 @@ public class DemoService {
return career;
}
+ public Map<String, Object> randomExceptionMethod(Map<String, Object> input) {
+
+ double random = Math.random();
+ if (random > 0.5) {
+ throw new DemoException("randomExceptionMethod execute failed");
+ }
+ else {
+ throw new RuntimeException(new ConnectException("Connect Exception"));
+ }
+ }
+
public static class People {
private String name;
@@ -159,4 +168,4 @@ public class DemoService {
this.name = name;
}
}
-}
+}
\ No newline at end of file
diff --git a/test/src/test/java/io/seata/saga/engine/mock/MockGlobalTransaction.java b/test/src/test/java/io/seata/saga/engine/mock/MockGlobalTransaction.java
index 664ccb3123ac3f60d0e0888d80238aeab385569b..c24a3f4f6c96681e1f023a169b7785a3606a7652 100644
--- a/test/src/test/java/io/seata/saga/engine/mock/MockGlobalTransaction.java
+++ b/test/src/test/java/io/seata/saga/engine/mock/MockGlobalTransaction.java
@@ -31,6 +31,17 @@ public class MockGlobalTransaction implements GlobalTransaction {
private static SpringJvmUUIDSeqGenerator uuidSeqGenerator = new SpringJvmUUIDSeqGenerator();
+ public MockGlobalTransaction() {}
+
+ public MockGlobalTransaction(String xid) {
+ this.xid = xid;
+ }
+
+ public MockGlobalTransaction(String xid, GlobalStatus status) {
+ this.xid = xid;
+ this.status = status;
+ }
+
@Override
public void begin() throws TransactionException {
begin(60000);
diff --git a/test/src/test/java/io/seata/saga/engine/mock/MockSagaTransactionTemplate.java b/test/src/test/java/io/seata/saga/engine/mock/MockSagaTransactionTemplate.java
index e2092ce274f7aec6661a15f7202be2d5115a0a02..3a939cb922fa9d269072923523360dfa554294f6 100644
--- a/test/src/test/java/io/seata/saga/engine/mock/MockSagaTransactionTemplate.java
+++ b/test/src/test/java/io/seata/saga/engine/mock/MockSagaTransactionTemplate.java
@@ -30,6 +30,10 @@ import io.seata.tm.api.transaction.TransactionInfo;
*/
public class MockSagaTransactionTemplate implements SagaTransactionalTemplate {
+ static {
+ UUIDGenerator.init(0);
+ }
+
@Override
public void commitTransaction(GlobalTransaction tx) throws ExecutionException {
@@ -51,6 +55,11 @@ public class MockSagaTransactionTemplate implements SagaTransactionalTemplate {
return globalTransaction;
}
+ @Override
+ public GlobalTransaction reloadTransaction(String xid) throws ExecutionException, TransactionException {
+ return new MockGlobalTransaction(xid, GlobalStatus.UnKnown);
+ }
+
@Override
public void reportTransaction(GlobalTransaction tx, GlobalStatus globalStatus) throws ExecutionException {
diff --git a/test/src/test/resources/basic-test-context.xml b/test/src/test/resources/basic-test-context.xml
index a41f78bfa40c695fb7a2116ab799bff35199cecd..7a5b11585f23be8bbf968ef88b48045d836839ba 100644
--- a/test/src/test/resources/basic-test-context.xml
+++ b/test/src/test/resources/basic-test-context.xml
@@ -50,5 +50,4 @@
<property name="dataSource" ref="mysqlDataSource" />
</bean>
- <bean id="clientTest" class="DataSourceBasicTest"/>
</beans>
diff --git a/test/src/test/resources/file.conf b/test/src/test/resources/file.conf
index 4fe50f1a002f00111d78ff5c72eb25b518220373..65fe8554e354f86c63f57fc6cabaa9aeba731ee4 100644
--- a/test/src/test/resources/file.conf
+++ b/test/src/test/resources/file.conf
@@ -1,65 +1,8 @@
-transport {
- # tcp udt unix-domain-socket
- type = "TCP"
- #NIO NATIVE
- server = "NIO"
- #enable heartbeat
- heartbeat = true
- #thread factory for netty
- thread-factory {
- boss-thread-prefix = "NettyBoss"
- worker-thread-prefix = "NettyServerNIOWorker"
- server-executor-thread-prefix = "NettyServerBizHandler"
- share-boss-worker = false
- client-selector-thread-prefix = "NettyClientSelector"
- client-selector-thread-size = 1
- client-worker-thread-prefix = "NettyClientWorkerThread"
- # netty boss thread size,will not be used for UDT
- boss-thread-size = 1
- #auto default pin or 8
- worker-thread-size = 8
- }
- shutdown {
- # when destroy server, wait seconds
- wait = 3
- }
- serialization = "seata"
- compressor = "none"
-}
service {
- #vgroup->rgroup
+ #transaction service group mapping
vgroup_mapping.my_test_tx_group = "default"
- #only support single node
+ #only support when registry.type=file, please don't set multiple addresses
default.grouplist = "127.0.0.1:8091"
- #degrade current not support
- enableDegrade = false
- #disable
- disable = false
-}
-
-client {
- async.commit.buffer.limit = 10000
- lock {
- retry.internal = 10
- retry.times = 30
- }
- report.retry.count = 5
- tm.commit.retry.count = 1
- tm.rollback.retry.count = 1
-}
-transaction {
- undo.data.validation = true
- undo.log.serialization = "jackson"
- undo.log.save.days = 7
- #schedule delete expired undo_log in milliseconds
- undo.log.delete.period = 86400000
- undo.log.table = "undo_log"
-}
-
-support {
- ## spring
- spring {
- # auto proxy the DataSource bean
- datasource.autoproxy = false
- }
+ #disable seata
+ disableGlobalTransaction = false
}
\ No newline at end of file
diff --git a/test/src/test/resources/saga/sql/db2_init.sql b/test/src/test/resources/saga/sql/db2_init.sql
index 33fd52a88b116bc97a90494330512bd18241da7d..cd50a6267e4b17ccd40c815fdf56ddcd408ff212 100644
--- a/test/src/test/resources/saga/sql/db2_init.sql
+++ b/test/src/test/resources/saga/sql/db2_init.sql
@@ -16,7 +16,7 @@ create table seata_state_machine_def
create table seata_state_machine_inst
(
- id varchar(32) not null,
+ id varchar(46) not null,
machine_id varchar(32) not null,
tenant_id varchar(32) not null,
parent_id varchar(46),
@@ -43,7 +43,7 @@ create unique index state_machine_inst_unibuzkey on seata_state_machine_inst(uni
create table seata_state_inst
(
id varchar(32) not null,
- machine_inst_id varchar(32) not null,
+ machine_inst_id varchar(46) not null,
name varchar(255) not null,
type varchar(20),
service_name varchar(255),
diff --git a/test/src/test/resources/saga/sql/h2_init.sql b/test/src/test/resources/saga/sql/h2_init.sql
index d06749870bac3dc99359e1630ef9d1c25ecd1e1d..6a151fa1d4b503ba2c832a60c86f1d7ef0916722 100644
--- a/test/src/test/resources/saga/sql/h2_init.sql
+++ b/test/src/test/resources/saga/sql/h2_init.sql
@@ -16,10 +16,10 @@ create table if not exists seata_state_machine_def
create table if not exists seata_state_machine_inst
(
- id varchar(32) not null comment 'id',
+ id varchar(46) not null comment 'id',
machine_id varchar(32) not null comment 'state machine definition id',
tenant_id varchar(32) not null comment 'tenant id',
- parent_id varchar(46) comment 'parentid',
+ parent_id varchar(46) comment 'parent id',
gmt_started timestamp not null comment 'start time',
business_key varchar(48) comment 'business key',
start_params clob comment 'start parameters',
@@ -37,7 +37,7 @@ create table if not exists seata_state_machine_inst
create table if not exists seata_state_inst
(
id varchar(32) not null comment 'id',
- machine_inst_id varchar(32) not null comment 'state machine instance id',
+ machine_inst_id varchar(46) not null comment 'state machine instance id',
name varchar(255) not null comment 'state name',
type varchar(20) comment 'state type',
service_name varchar(255) comment 'service name',
diff --git a/test/src/test/resources/saga/sql/mysql_init.sql b/test/src/test/resources/saga/sql/mysql_init.sql
index 63bc0a273944c455b08a119b5d55dfb5faff643f..de32af2f8e303bcde139746ad8087c4f978cb987 100644
--- a/test/src/test/resources/saga/sql/mysql_init.sql
+++ b/test/src/test/resources/saga/sql/mysql_init.sql
@@ -16,10 +16,10 @@ create table if not exists seata_state_machine_def
create table if not exists seata_state_machine_inst
(
- id varchar(32) not null comment 'id',
+ id varchar(46) not null comment 'id',
machine_id varchar(32) not null comment 'state machine definition id',
tenant_id varchar(32) not null comment 'tenant id',
- parent_id varchar(46) comment 'parentid',
+ parent_id varchar(46) comment 'parent id',
gmt_started datetime(3) not null comment 'start time',
business_key varchar(48) comment 'business key',
start_params longtext comment 'start parameters',
@@ -37,7 +37,7 @@ create table if not exists seata_state_machine_inst
create table if not exists seata_state_inst
(
id varchar(32) not null comment 'id',
- machine_inst_id varchar(32) not null comment 'state machine instance id',
+ machine_inst_id varchar(46) not null comment 'state machine instance id',
name varchar(255) not null comment 'state name',
type varchar(20) comment 'state type',
service_name varchar(255) comment 'service name',
diff --git a/test/src/test/resources/saga/sql/oracle_init.sql b/test/src/test/resources/saga/sql/oracle_init.sql
index 8e691a21b5090a6efbbc86fc18f1e5d997a3d89b..28c7a3efa96c04796fdb15ce640b2f78fc92993f 100644
--- a/test/src/test/resources/saga/sql/oracle_init.sql
+++ b/test/src/test/resources/saga/sql/oracle_init.sql
@@ -16,7 +16,7 @@ create table seata_state_machine_def
create table seata_state_machine_inst
(
- id varchar(32) not null,
+ id varchar(46) not null,
machine_id varchar(32) not null,
tenant_id varchar(32) not null,
parent_id varchar(46),
@@ -43,7 +43,7 @@ create unique index state_machine_inst_unibuzkey on seata_state_machine_inst(uni
create table seata_state_inst
(
id varchar(32) not null,
- machine_inst_id varchar(32) not null,
+ machine_inst_id varchar(46) not null,
name varchar(255) not null,
type varchar(20),
service_name varchar(255),
diff --git a/test/src/test/resources/saga/statelang/designer_statelang_with_compensation_and_sub_machine.json b/test/src/test/resources/saga/statelang/designer_statelang_with_compensation_and_sub_machine.json
new file mode 100644
index 0000000000000000000000000000000000000000..4d886a02c363aa0d9dcd3f1fc65a1a3bb4c31672
--- /dev/null
+++ b/test/src/test/resources/saga/statelang/designer_statelang_with_compensation_and_sub_machine.json
@@ -0,0 +1,288 @@
+{
+ "nodes": [
+ {
+ "type": "node",
+ "size": "72*72",
+ "shape": "flow-circle",
+ "color": "#FA8C16",
+ "label": "Start",
+ "stateId": "Start",
+ "stateType": "Start",
+ "stateProps": {
+ "StateMachine": {
+ "Name": "simpleStateMachineWithCompensationAndSubMachine_layout",
+ "Comment": "带补偿定义和调用子状态机",
+ "Version": "0.0.1"
+ }
+ },
+ "x": 199.875,
+ "y": 95,
+ "id": "e2d86441"
+ },
+ {
+ "type": "node",
+ "size": "110*48",
+ "shape": "flow-rect",
+ "color": "#1890FF",
+ "label": "FirstState",
+ "stateId": "FirstState",
+ "stateType": "ServiceTask",
+ "stateProps": {
+ "ServiceName": "demoService",
+ "ServiceMethod": "foo",
+ "Input": [
+ {
+ "fooInput": "$.[a]"
+ }
+ ],
+ "Output": {
+ "fooResult": "$.#root"
+ }
+ },
+ "x": 199.875,
+ "y": 213,
+ "id": "6111bf54"
+ },
+ {
+ "type": "node",
+ "size": "80*72",
+ "shape": "flow-rhombus",
+ "color": "#13C2C2",
+ "label": "ChoiceState",
+ "stateId": "ChoiceState",
+ "stateType": "Choice",
+ "x": 199.875,
+ "y": 341.5,
+ "id": "5610fa37"
+ },
+ {
+ "type": "node",
+ "size": "110*48",
+ "shape": "flow-rect",
+ "color": "#1890FF",
+ "label": "SecondState",
+ "stateId": "SecondState",
+ "stateType": "ServiceTask",
+ "stateProps": {
+ "ServiceName": "demoService",
+ "ServiceMethod": "bar",
+ "Input": [
+ {
+ "barInput": "$.[fooResult]",
+ "throwException": "$.[barThrowException]"
+ }
+ ],
+ "Output": {
+ "barResult": "$.#root"
+ },
+ "Status": {
+ "#root != null": "SU",
+ "#root == null": "FA",
+ "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN"
+ }
+ },
+ "x": 199.375,
+ "y": 468,
+ "id": "af5591f9"
+ },
+ {
+ "type": "node",
+ "size": "72*72",
+ "shape": "flow-circle",
+ "color": "#05A465",
+ "label": "Succeed",
+ "stateId": "Succeed",
+ "stateType": "Succeed",
+ "x": 199.375,
+ "y": 609,
+ "id": "2fd4c8de"
+ },
+ {
+ "type": "node",
+ "size": "110*48",
+ "shape": "flow-rect",
+ "color": "#FA8C16",
+ "label": "SubStateMachine",
+ "stateId": "CallSubStateMachine",
+ "stateType": "SubStateMachine",
+ "stateProps": {
+ "StateMachineName": "simpleCompensationStateMachine",
+ "Input": [
+ {
+ "a": "$.1",
+ "barThrowException": "$.[barThrowException]",
+ "fooThrowException": "$.[fooThrowException]",
+ "compensateFooThrowException": "$.[compensateFooThrowException]"
+ }
+ ],
+ "Output": {
+ "fooResult": "$.#root"
+ }
+ },
+ "x": 55.875,
+ "y": 467,
+ "id": "04ea55a5"
+ },
+ {
+ "type": "node",
+ "size": "110*48",
+ "shape": "flow-capsule",
+ "color": "#722ED1",
+ "label": "CompenFirstState",
+ "stateId": "CompensateFirstState",
+ "stateType": "Compensation",
+ "stateProps": {
+ "ServiceName": "demoService",
+ "ServiceMethod": "compensateFoo",
+ "Input": [
+ {
+ "compensateFooInput": "$.[fooResult]"
+ }
+ ]
+ },
+ "x": 68.875,
+ "y": 126,
+ "id": "6a09a5c2"
+ },
+ {
+ "type": "node",
+ "size": "39*39",
+ "shape": "flow-circle",
+ "color": "red",
+ "label": "Catch",
+ "stateId": "Catch",
+ "stateType": "Catch",
+ "x": 257.875,
+ "y": 492,
+ "id": "e28af1c2"
+ },
+ {
+ "type": "node",
+ "size": "110*48",
+ "shape": "flow-capsule",
+ "color": "red",
+ "label": "Compensation\nTrigger",
+ "stateId": "CompensationTrigger",
+ "stateType": "CompensationTrigger",
+ "x": 366.875,
+ "y": 491.5,
+ "id": "e32417a0"
+ },
+ {
+ "type": "node",
+ "size": "72*72",
+ "shape": "flow-circle",
+ "color": "red",
+ "label": "Fail",
+ "stateId": "Fail",
+ "stateType": "Fail",
+ "stateProps": {
+ "ErrorCode": "NOT_FOUND",
+ "Message": "not found"
+ },
+ "x": 513.375,
+ "y": 491.5,
+ "id": "d21d24c9"
+ }
+ ],
+ "edges": [
+ {
+ "source": "e2d86441",
+ "sourceAnchor": 2,
+ "target": "6111bf54",
+ "targetAnchor": 0,
+ "id": "51f30b96"
+ },
+ {
+ "source": "6111bf54",
+ "sourceAnchor": 2,
+ "target": "5610fa37",
+ "targetAnchor": 0,
+ "id": "8c3029b1"
+ },
+ {
+ "source": "5610fa37",
+ "sourceAnchor": 2,
+ "target": "af5591f9",
+ "targetAnchor": 0,
+ "id": "a9e7d5b4",
+ "stateProps": {
+ "Expression": "[a] == 1",
+ "Default": false
+ },
+ "label": "",
+ "shape": "flow-smooth"
+ },
+ {
+ "source": "af5591f9",
+ "sourceAnchor": 2,
+ "target": "2fd4c8de",
+ "targetAnchor": 0,
+ "id": "61f34a49"
+ },
+ {
+ "source": "6111bf54",
+ "sourceAnchor": 3,
+ "target": "6a09a5c2",
+ "targetAnchor": 2,
+ "id": "553384ab",
+ "style": {
+ "lineDash": "4"
+ }
+ },
+ {
+ "source": "5610fa37",
+ "sourceAnchor": 3,
+ "target": "04ea55a5",
+ "targetAnchor": 0,
+ "id": "2ee91c33",
+ "stateProps": {
+ "Expression": "[a] == 2",
+ "Default": false
+ },
+ "label": "",
+ "shape": "flow-smooth"
+ },
+ {
+ "source": "e28af1c2",
+ "sourceAnchor": 1,
+ "target": "e32417a0",
+ "targetAnchor": 3,
+ "id": "d854a4d0",
+ "stateProps": {
+ "Exceptions": [
+ "io.seata.common.exception.FrameworkException"
+ ]
+ },
+ "label": "",
+ "shape": "flow-smooth"
+ },
+ {
+ "source": "04ea55a5",
+ "sourceAnchor": 2,
+ "target": "2fd4c8de",
+ "targetAnchor": 3,
+ "id": "28734ad2"
+ },
+ {
+ "source": "5610fa37",
+ "sourceAnchor": 1,
+ "target": "d21d24c9",
+ "targetAnchor": 0,
+ "id": "7c7595c0",
+ "stateProps": {
+ "Expression": "",
+ "Default": true
+ },
+ "label": "",
+ "shape": "flow-smooth"
+ },
+ {
+ "source": "e32417a0",
+ "sourceAnchor": 1,
+ "target": "d21d24c9",
+ "targetAnchor": 3,
+ "id": "16d809ce"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/test/src/test/resources/saga/statelang/simple_statelang_with_async_state.json b/test/src/test/resources/saga/statelang/simple_statelang_with_async_state.json
new file mode 100644
index 0000000000000000000000000000000000000000..f2bc3dd41aa0e62032990f56526be95e0c52683c
--- /dev/null
+++ b/test/src/test/resources/saga/statelang/simple_statelang_with_async_state.json
@@ -0,0 +1,50 @@
+{
+ "Name": "simpleStateMachineWithAsyncState",
+ "Comment": "带异步执行节点的测试状态机定义",
+ "StartState": "FirstState",
+ "Version": "0.0.1",
+ "States": {
+ "FirstState": {
+ "Type": "ServiceTask",
+ "ServiceName": "demoService",
+ "ServiceMethod": "foo",
+ "Next": "ChoiceState"
+ },
+ "ChoiceState":{
+ "Type": "Choice",
+ "Choices":[
+ {
+ "Expression":"[a] == 1",
+ "Next":"SecondState"
+ },
+ {
+ "Expression":"[a] == 2",
+ "Next":"ThirdState"
+ }
+ ],
+ "Default":"Fail"
+ },
+ "SecondState": {
+ "Type": "ServiceTask",
+ "ServiceName": "demoService",
+ "ServiceMethod": "bar",
+ "IsAsync": true,
+ "Next": "Succeed"
+ },
+ "ThirdState": {
+ "Type": "ServiceTask",
+ "ServiceName": "demoService",
+ "ServiceMethod": "foo",
+ "IsAsync": true,
+ "Next": "Succeed"
+ },
+ "Succeed": {
+ "Type":"Succeed"
+ },
+ "Fail": {
+ "Type":"Fail",
+ "ErrorCode": "NOT_FOUND",
+ "Message": "not found"
+ }
+ }
+}
\ No newline at end of file
diff --git a/test/src/test/resources/saga/statelang/simple_statelang_with_catches.json b/test/src/test/resources/saga/statelang/simple_statelang_with_catches.json
index b35471c6cb40c9d898e31dd3a83b463dd3e012f1..3db4e386ec2d4aa8035286186d659caa5d55603d 100644
--- a/test/src/test/resources/saga/statelang/simple_statelang_with_catches.json
+++ b/test/src/test/resources/saga/statelang/simple_statelang_with_catches.json
@@ -48,7 +48,7 @@
"Catch": [
{
"Exceptions": [
- "io.seata.common.exception.FrameworkException"
+ "io.seata.saga.engine.mock.DemoException"
],
"Next": "Fail"
}
diff --git a/test/src/test/resources/saga/statelang/simple_statelang_with_compensation.json b/test/src/test/resources/saga/statelang/simple_statelang_with_compensation.json
index bde8aec40d5bdcf517bf336a0659d449f82faa3b..7d85862e835ad39f2155471f0a71195597286ab6 100644
--- a/test/src/test/resources/saga/statelang/simple_statelang_with_compensation.json
+++ b/test/src/test/resources/saga/statelang/simple_statelang_with_compensation.json
@@ -51,12 +51,12 @@
"Status": {
"#root != null": "SU",
"#root == null": "FA",
- "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN"
+ "$Exception{io.seata.saga.engine.mock.DemoException}": "UN"
},
"Catch": [
{
"Exceptions": [
- "io.seata.common.exception.FrameworkException"
+ "io.seata.saga.engine.mock.DemoException"
],
"Next": "CompensationTrigger"
}
diff --git a/test/src/test/resources/saga/statelang/simple_statelang_with_compensation_and_sub_machine.json b/test/src/test/resources/saga/statelang/simple_statelang_with_compensation_and_sub_machine.json
index 2d3cbdaf72d8696fdb9b47fff7f32921b575e782..279d1efe957a3a5e1a1b8639f7d3a23ae75852ef 100644
--- a/test/src/test/resources/saga/statelang/simple_statelang_with_compensation_and_sub_machine.json
+++ b/test/src/test/resources/saga/statelang/simple_statelang_with_compensation_and_sub_machine.json
@@ -37,7 +37,6 @@
"Type": "ServiceTask",
"ServiceName": "demoService",
"ServiceMethod": "bar",
- "CompensateState": "CompensateSecondState",
"Input": [
{
"barInput": "$.[fooResult]",
@@ -50,12 +49,12 @@
"Status": {
"#root != null": "SU",
"#root == null": "FA",
- "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN"
+ "$Exception{io.seata.saga.engine.mock.DemoException}": "UN"
},
"Catch": [
{
"Exceptions": [
- "io.seata.common.exception.FrameworkException"
+ "io.seata.saga.engine.mock.DemoException"
],
"Next": "CompensationTrigger"
}
diff --git a/test/src/test/resources/saga/statelang/simple_statelang_with_compensation_for_recovery.json b/test/src/test/resources/saga/statelang/simple_statelang_with_compensation_for_recovery.json
index 379423f92ecd588aa0a58fe8875b8117a7a8b52f..a8a7f2b2576e43934ac0a3a4f8d09841c9dfda40 100644
--- a/test/src/test/resources/saga/statelang/simple_statelang_with_compensation_for_recovery.json
+++ b/test/src/test/resources/saga/statelang/simple_statelang_with_compensation_for_recovery.json
@@ -21,7 +21,7 @@
"fooResult": "$.#root"
},
"Status": {
- "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN",
+ "$Exception{io.seata.saga.engine.mock.DemoException}": "UN",
"#root != null && #root.size() > 0": "SU",
"#root == null || #root.size() == 0": "FA"
}
@@ -56,14 +56,14 @@
"barResult": "$.#root"
},
"Status": {
- "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN",
+ "$Exception{io.seata.saga.engine.mock.DemoException}": "UN",
"#root != null && #root.size() > 0": "SU",
"#root == null || #root.size() == 0": "FA"
},
"Catch": [
{
"Exceptions": [
- "io.seata.common.exception.FrameworkException"
+ "io.seata.saga.engine.mock.DemoException"
],
"Next": "CompensationTrigger"
}
@@ -83,7 +83,7 @@
"fooResult": "$.#root"
},
"Status": {
- "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN",
+ "$Exception{io.seata.saga.engine.mock.DemoException}": "UN",
"#root != null && #root.size() > 0": "SU",
"#root == null || #root.size() == 0": "FA"
},
@@ -101,7 +101,7 @@
}
],
"Status": {
- "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN",
+ "$Exception{io.seata.saga.engine.mock.DemoException}": "UN",
"#root != null && #root.size() > 0": "SU",
"#root == null || #root.size() == 0": "FA"
}
@@ -118,7 +118,7 @@
}
],
"Status": {
- "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN",
+ "$Exception{io.seata.saga.engine.mock.DemoException}": "UN",
"#root != null && #root.size() > 0": "SU",
"#root == null || #root.size() == 0": "FA"
}
diff --git a/test/src/test/resources/saga/statelang/simple_statelang_with_retry.json b/test/src/test/resources/saga/statelang/simple_statelang_with_retry.json
new file mode 100644
index 0000000000000000000000000000000000000000..f813cd5e4c9a5d7816cb062a022a35563920dca0
--- /dev/null
+++ b/test/src/test/resources/saga/statelang/simple_statelang_with_retry.json
@@ -0,0 +1,94 @@
+{
+ "Name": "simpleRetryStateMachine",
+ "Comment": "带异常重试的测试状态机定义",
+ "StartState": "FirstState",
+ "Version": "0.0.1",
+ "States": {
+ "FirstState": {
+ "Type": "ServiceTask",
+ "ServiceName": "demoService",
+ "ServiceMethod": "foo",
+ "Next": "ChoiceState",
+ "Input": [
+ {
+ "fooInput": "$.[a]"
+ }
+ ],
+ "output": {
+ "fooResult": "$.#root"
+ }
+ },
+ "ChoiceState":{
+ "Type": "Choice",
+ "Choices":[
+ {
+ "Expression":"[a] == 1",
+ "Next":"SecondState"
+ },
+ {
+ "Expression":"[a] == 2",
+ "Next":"ThirdState"
+ }
+ ],
+ "Default":"Fail"
+ },
+ "SecondState": {
+ "Type": "ServiceTask",
+ "ServiceName": "demoService",
+ "ServiceMethod": "randomExceptionMethod",
+ "Input": [
+ {
+ "barInput": "$.[fooResult]",
+ "throwException": "$.[barThrowException]"
+ }
+ ],
+ "output": {
+ "barResult": "$.#root"
+ },
+ "Retry": [
+ {
+ "Exceptions": ["io.seata.saga.engine.mock.DemoException"],
+ "IntervalSeconds": 1.5,
+ "MaxAttempts": 3,
+ "BackoffRate": 1.5
+ },
+ {
+ "IntervalSeconds": 1,
+ "MaxAttempts": 3,
+ "BackoffRate": 1.5
+ }
+ ],
+ "Catch": [
+ {
+ "Exceptions": [
+ "io.seata.saga.engine.mock.DemoException"
+ ],
+ "Next": "Fail"
+ }
+ ],
+ "Next": "Succeed"
+ },
+ "ThirdState": {
+ "Type": "ServiceTask",
+ "ServiceName": "demoService",
+ "ServiceMethod": "foo",
+ "Input": [
+ {
+ "fooInput": "$.[fooResult]"
+ }
+ ],
+ "output": {
+ "fooResult": "$.#root"
+ },
+ "Next": "Succeed"
+ },
+ "Succeed": {
+ "Type":"Succeed"
+ },
+ "Fail": {
+ "Type":"Fail",
+ "ErrorCode": "NOT_FOUND",
+ "Message": "not found"
+ }
+ }
+}
\ No newline at end of file
diff --git a/test/src/test/resources/saga/statelang/simple_statelang_with_status_matches.json b/test/src/test/resources/saga/statelang/simple_statelang_with_status_matches.json
index 9bce1ccddd622db2b1111bc6806dbb366d647b14..7d58592d08201189811d5b173d565eb9a3c32507 100644
--- a/test/src/test/resources/saga/statelang/simple_statelang_with_status_matches.json
+++ b/test/src/test/resources/saga/statelang/simple_statelang_with_status_matches.json
@@ -8,7 +8,7 @@
"Type": "ServiceTask",
"ServiceName": "demoService",
"ServiceMethod": "foo",
- "Next": "ChoiceState",
+ "Next": "ReturnNullState",
"Input": [
{
"fooInput": "$.[a]"
@@ -18,6 +18,18 @@
"fooResult": "$.#root"
}
},
+ "ReturnNullState": {
+ "Type": "ServiceTask",
+ "ServiceName": "demoService",
+ "ServiceMethod": "foo",
+ "Next": "ChoiceState",
+ "Status": {
+ "$Exception{io.seata.saga.engine.mock.DemoException}": "UN",
+ "$Exception{java.lang.Exception}": "FA",
+ "#root != null && #root.size() > 0": "SU",
+ "#root == null || #root.size() == 0": "FA"
+ }
+ },
"ChoiceState":{
"Type": "Choice",
"Choices":[
@@ -46,7 +58,7 @@
"barResult": "$.#root"
},
"Status": {
- "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN",
+ "$Exception{io.seata.saga.engine.mock.DemoException}": "UN",
"$Exception{java.lang.Exception}": "FA",
"#root != null && #root.size() > 0": "SU",
"#root == null || #root.size() == 0": "FA"
@@ -54,7 +66,7 @@
"Catch": [
{
"Exceptions": [
- "io.seata.common.exception.FrameworkException"
+ "io.seata.saga.engine.mock.DemoException"
],
"Next": "Fail"
}
diff --git a/test/src/test/resources/saga/statelang/simple_statelang_with_userdef_sub_machine_compensation.json b/test/src/test/resources/saga/statelang/simple_statelang_with_userdef_sub_machine_compensation.json
index 813ca222aa8a575d5cb34967cb9e97ffe3b77790..cefecb785b2fd97f8bc850a55ce5f255a6aa1e4a 100644
--- a/test/src/test/resources/saga/statelang/simple_statelang_with_userdef_sub_machine_compensation.json
+++ b/test/src/test/resources/saga/statelang/simple_statelang_with_userdef_sub_machine_compensation.json
@@ -21,7 +21,7 @@
"Status": {
"#root != null": "SU",
"#root == null": "FA",
- "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN"
+ "$Exception{io.seata.saga.engine.mock.DemoException}": "UN"
}
},
"ChoiceState":{
@@ -55,12 +55,12 @@
"Status": {
"#root != null": "SU",
"#root == null": "FA",
- "$Exception{io.seata.saga.engine.exception.EngineExecutionException}": "UN"
+ "$Exception{io.seata.saga.engine.mock.DemoException}": "UN"
},
"Catch": [
{
"Exceptions": [
- "io.seata.common.exception.FrameworkException"
+ "io.seata.saga.engine.mock.DemoException"
],
"Next": "CompensationTrigger"
}
diff --git a/tm/src/main/java/io/seata/tm/TMClient.java b/tm/src/main/java/io/seata/tm/TMClient.java
index 4987dc85ecb2e8297e60671df44ec7f5f9f72f66..bf7ad17ca6e8181e352256cc3174782a2baf5aef 100644
--- a/tm/src/main/java/io/seata/tm/TMClient.java
+++ b/tm/src/main/java/io/seata/tm/TMClient.java
@@ -20,7 +20,7 @@ import io.seata.core.rpc.netty.TmRpcClient;
/**
* The type Tm client.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public class TMClient {
diff --git a/tm/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java b/tm/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java
index 8a00e9171b9185c014310a0a2a2a01ea373ce029..e2bcb66df51433e9f644a0ec9573f7d44e435952 100644
--- a/tm/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java
+++ b/tm/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java
@@ -29,8 +29,7 @@ import org.slf4j.LoggerFactory;
/**
* The type Default failure handler.
*
- * @author jimin.jm @alibaba-inc.com
- * @date 2019 /1/8
+ * @author slievrly
*/
public class DefaultFailureHandlerImpl implements FailureHandler {
diff --git a/tm/src/main/java/io/seata/tm/api/DefaultGlobalTransaction.java b/tm/src/main/java/io/seata/tm/api/DefaultGlobalTransaction.java
index e860ff7d516944050a5d2a913aa1ba3492593c90..a0830f0f081b692b3e58813b8464d002a9434ce8 100644
--- a/tm/src/main/java/io/seata/tm/api/DefaultGlobalTransaction.java
+++ b/tm/src/main/java/io/seata/tm/api/DefaultGlobalTransaction.java
@@ -89,7 +89,7 @@ public class DefaultGlobalTransaction implements GlobalTransaction {
if (role != GlobalTransactionRole.Launcher) {
check();
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Ignore Begin(): just involved in global transaction [" + xid + "]");
+ LOGGER.debug("Ignore Begin(): just involved in global transaction [{}]", xid);
}
return;
}
@@ -103,7 +103,7 @@ public class DefaultGlobalTransaction implements GlobalTransaction {
status = GlobalStatus.Begin;
RootContext.bind(xid);
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("Begin new global transaction [" + xid + "]");
+ LOGGER.info("Begin new global transaction [{}]", xid);
}
}
@@ -113,7 +113,7 @@ public class DefaultGlobalTransaction implements GlobalTransaction {
if (role == GlobalTransactionRole.Participant) {
// Participant has no responsibility of committing
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Ignore Commit(): just involved in global transaction [" + xid + "]");
+ LOGGER.debug("Ignore Commit(): just involved in global transaction [{}]", xid);
}
return;
}
@@ -142,7 +142,7 @@ public class DefaultGlobalTransaction implements GlobalTransaction {
}
}
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("[" + xid + "] commit status:" + status);
+ LOGGER.info("[{}] commit status: {}", xid, status);
}
}
@@ -150,9 +150,9 @@ public class DefaultGlobalTransaction implements GlobalTransaction {
@Override
public void rollback() throws TransactionException {
if (role == GlobalTransactionRole.Participant) {
- // Participant has no responsibility of committing
+ // Participant has no responsibility of rollback
if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Ignore Rollback(): just involved in global transaction [" + xid + "]");
+ LOGGER.debug("Ignore Rollback(): just involved in global transaction [{}]", xid);
}
return;
}
@@ -182,7 +182,7 @@ public class DefaultGlobalTransaction implements GlobalTransaction {
}
}
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("[" + xid + "] rollback status:" + status);
+ LOGGER.info("[{}] rollback status: {}", xid, status);
}
}
@@ -211,7 +211,7 @@ public class DefaultGlobalTransaction implements GlobalTransaction {
status = transactionManager.globalReport(xid, globalStatus);
if (LOGGER.isInfoEnabled()) {
- LOGGER.info("[" + xid + "] report status:" + status);
+ LOGGER.info("[{}] report status: {}", xid, status);
}
if (RootContext.getXID() != null) {
diff --git a/tm/src/main/java/io/seata/tm/api/FailureHandler.java b/tm/src/main/java/io/seata/tm/api/FailureHandler.java
index 84c544ed9250d9d63725d92f2d7fa3e8d4f470b3..130bf0ac50fa13e083ac7e93b0a7963e51fd59dc 100644
--- a/tm/src/main/java/io/seata/tm/api/FailureHandler.java
+++ b/tm/src/main/java/io/seata/tm/api/FailureHandler.java
@@ -18,7 +18,7 @@ package io.seata.tm.api;
/**
* Callback on failure.
*
- * @author jimin.jm @alibaba-inc.com
+ * @author slievrly
*/
public interface FailureHandler {
diff --git a/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java b/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java
index 957b658b9074e7e9670686a5a8f61bbc42bbecb7..b916dd7c2787de868d80c02b796cec3da2a5a178 100644
--- a/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java
+++ b/tm/src/main/java/io/seata/tm/api/TransactionalTemplate.java
@@ -134,7 +134,7 @@ public class TransactionalTemplate {
try {
hook.beforeBegin();
} catch (Exception e) {
- LOGGER.error("Failed execute beforeBegin in hook " + e.getMessage());
+ LOGGER.error("Failed execute beforeBegin in hook {}",e.getMessage(),e);
}
}
}
@@ -144,7 +144,7 @@ public class TransactionalTemplate {
try {
hook.afterBegin();
} catch (Exception e) {
- LOGGER.error("Failed execute afterBegin in hook " + e.getMessage());
+ LOGGER.error("Failed execute afterBegin in hook {}",e.getMessage(),e);
}
}
}
@@ -154,7 +154,7 @@ public class TransactionalTemplate {
try {
hook.beforeRollback();
} catch (Exception e) {
- LOGGER.error("Failed execute beforeRollback in hook " + e.getMessage());
+ LOGGER.error("Failed execute beforeRollback in hook {}",e.getMessage(),e);
}
}
}
@@ -164,7 +164,7 @@ public class TransactionalTemplate {
try {
hook.afterRollback();
} catch (Exception e) {
- LOGGER.error("Failed execute afterRollback in hook " + e.getMessage());
+ LOGGER.error("Failed execute afterRollback in hook {}",e.getMessage(),e);
}
}
}
@@ -174,7 +174,7 @@ public class TransactionalTemplate {
try {
hook.beforeCommit();
} catch (Exception e) {
- LOGGER.error("Failed execute beforeCommit in hook " + e.getMessage());
+ LOGGER.error("Failed execute beforeCommit in hook {}",e.getMessage(),e);
}
}
}
@@ -184,7 +184,7 @@ public class TransactionalTemplate {
try {
hook.afterCommit();
} catch (Exception e) {
- LOGGER.error("Failed execute afterCommit in hook " + e.getMessage());
+ LOGGER.error("Failed execute afterCommit in hook {}",e.getMessage(),e);
}
}
}
@@ -194,7 +194,7 @@ public class TransactionalTemplate {
try {
hook.afterCompletion();
} catch (Exception e) {
- LOGGER.error("Failed execute afterCompletion in hook " + e.getMessage());
+ LOGGER.error("Failed execute afterCompletion in hook {}",e.getMessage(),e);
}
}
}
diff --git a/tm/src/main/java/io/seata/tm/api/transaction/NoRollbackRule.java b/tm/src/main/java/io/seata/tm/api/transaction/NoRollbackRule.java
index 4c2ee4bb043be99392457248dd7a69aab9c9b7b8..f2b4a9bc3398289b5434500aea3a06dddc7e3277 100644
--- a/tm/src/main/java/io/seata/tm/api/transaction/NoRollbackRule.java
+++ b/tm/src/main/java/io/seata/tm/api/transaction/NoRollbackRule.java
@@ -18,10 +18,11 @@ package io.seata.tm.api.transaction;
/**
* @author guoyao
- * @date 2019/4/17
*/
public class NoRollbackRule extends RollbackRule {
+ public static final NoRollbackRule DEFAULT_NO_ROLLBACK_RULE = new NoRollbackRule(Throwable.class);
+
public NoRollbackRule(Class<?> clazz) {
super(clazz);
diff --git a/tm/src/main/java/io/seata/tm/api/transaction/RollbackRule.java b/tm/src/main/java/io/seata/tm/api/transaction/RollbackRule.java
index 8f99b36d78070f5b65def0681abd8359a76407e4..c6c80b460aff9bfeabb9dffd713fc0b2d59091d2 100644
--- a/tm/src/main/java/io/seata/tm/api/transaction/RollbackRule.java
+++ b/tm/src/main/java/io/seata/tm/api/transaction/RollbackRule.java
@@ -21,7 +21,6 @@ import java.io.Serializable;
/**
* @author guoyao
- * @date 2019/4/17
*/
public class RollbackRule implements Serializable {
diff --git a/tm/src/main/java/io/seata/tm/api/transaction/TransactionHook.java b/tm/src/main/java/io/seata/tm/api/transaction/TransactionHook.java
index 3f945379190a3826b0b6c6f5b4a0e8f366ca4e41..c7f7239f097532fd8b4e0387bde1ad1701afb403 100644
--- a/tm/src/main/java/io/seata/tm/api/transaction/TransactionHook.java
+++ b/tm/src/main/java/io/seata/tm/api/transaction/TransactionHook.java
@@ -17,7 +17,6 @@ package io.seata.tm.api.transaction;
/**
* @author guoyao
- * @date 2019/3/4
*/
public interface TransactionHook {
diff --git a/tm/src/main/java/io/seata/tm/api/transaction/TransactionHookAdapter.java b/tm/src/main/java/io/seata/tm/api/transaction/TransactionHookAdapter.java
index 72fe45bf9de7f310db7669af6beced80dcf60d18..a13f9bfd4232cff649a6c30578ad5706af42907b 100644
--- a/tm/src/main/java/io/seata/tm/api/transaction/TransactionHookAdapter.java
+++ b/tm/src/main/java/io/seata/tm/api/transaction/TransactionHookAdapter.java
@@ -17,7 +17,6 @@ package io.seata.tm.api.transaction;
/**
* @author guoyao
- * @date 2019/3/5
*/
public class TransactionHookAdapter implements TransactionHook {
diff --git a/tm/src/main/java/io/seata/tm/api/transaction/TransactionHookManager.java b/tm/src/main/java/io/seata/tm/api/transaction/TransactionHookManager.java
index b6e8a01dd65baefcd6243020ffa8d8d37b9258cd..2b9ea2359f118dcd6b0fb68d236b6e59e9da6348 100644
--- a/tm/src/main/java/io/seata/tm/api/transaction/TransactionHookManager.java
+++ b/tm/src/main/java/io/seata/tm/api/transaction/TransactionHookManager.java
@@ -21,7 +21,6 @@ import java.util.List;
/**
* @author guoyao
- * @date 2019/3/4
*/
public final class TransactionHookManager {
diff --git a/tm/src/main/java/io/seata/tm/api/transaction/TransactionInfo.java b/tm/src/main/java/io/seata/tm/api/transaction/TransactionInfo.java
index a444ff65dccc11dc9904b606b37d4b3a922336c1..e6e3b383b6f85a5c223b5379c5153d0847340661 100644
--- a/tm/src/main/java/io/seata/tm/api/transaction/TransactionInfo.java
+++ b/tm/src/main/java/io/seata/tm/api/transaction/TransactionInfo.java
@@ -15,12 +15,13 @@
*/
package io.seata.tm.api.transaction;
+import io.seata.common.util.CollectionUtils;
+
import java.io.Serializable;
import java.util.Set;
/**
* @author guoyao
- * @date 2019/4/17
*/
public final class TransactionInfo implements Serializable {
@@ -61,7 +62,8 @@ public final class TransactionInfo implements Serializable {
RollbackRule winner = null;
int deepest = Integer.MAX_VALUE;
- if (this.rollbackRules != null) {
+ if (CollectionUtils.isNotEmpty(rollbackRules)) {
+ winner = NoRollbackRule.DEFAULT_NO_ROLLBACK_RULE;
for (RollbackRule rule : this.rollbackRules) {
int depth = rule.getDepth(ex);
if (depth >= 0 && depth < deepest) {
diff --git a/tm/src/test/java/io/seata/tm/TransactionManagerHolderTest.java b/tm/src/test/java/io/seata/tm/TransactionManagerHolderTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..ea098f82312acb7c2bd38924fd67544897e8811c
--- /dev/null
+++ b/tm/src/test/java/io/seata/tm/TransactionManagerHolderTest.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.tm;
+
+
+import io.seata.common.exception.ShouldNeverHappenException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author wangwei
+ */
+class TransactionManagerHolderTest {
+
+
+ @Test
+ void getTest() {
+ Assertions.assertThrows(ShouldNeverHappenException.class, () -> { TransactionManagerHolder.set(null);
+ TransactionManagerHolder.get();});
+ }
+
+}
diff --git a/tm/src/test/java/io/seata/tm/api/APITest.java b/tm/src/test/java/io/seata/tm/api/APITest.java
index ed399b0e71100cda10a1d7946d1a06395e2fdc51..e23e94aea58b5bf8210cb476525ab7387f297cc8 100644
--- a/tm/src/test/java/io/seata/tm/api/APITest.java
+++ b/tm/src/test/java/io/seata/tm/api/APITest.java
@@ -20,6 +20,7 @@ import io.seata.core.exception.TransactionException;
import io.seata.core.model.GlobalStatus;
import io.seata.core.model.TransactionManager;
import io.seata.tm.TransactionManagerHolder;
+import io.seata.tm.api.transaction.RollbackRule;
import io.seata.tm.api.transaction.TransactionInfo;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assertions;
@@ -197,6 +198,25 @@ public class APITest {
}
}
+ @Test
+ public void testGlobalReport() throws Exception {
+ RootContext.bind(DEFAULT_XID);
+ GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
+ tx.globalReport(tx.getStatus());
+
+ Assertions.assertThrows(IllegalStateException.class, () -> tx.globalReport(null));
+ Assertions.assertThrows(IllegalStateException.class, () -> {
+ RootContext.unbind();
+ GlobalTransaction tx2 = GlobalTransactionContext.getCurrentOrCreate();
+ tx2.globalReport(tx2.getStatus());
+ });
+
+ Assertions.assertEquals(tx.getStatus(), GlobalStatus.Begin);
+ Assertions.assertNotNull(tx.getXid());
+
+ }
+
+
private static abstract class AbstractTransactionalExecutor implements TransactionalExecutor {
@Override
diff --git a/tm/src/test/java/io/seata/tm/api/DefaultFailureHandlerImplTest.java b/tm/src/test/java/io/seata/tm/api/DefaultFailureHandlerImplTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..fd2ffda6bc01a4385be0e20dbb36a2cd9f4270b6
--- /dev/null
+++ b/tm/src/test/java/io/seata/tm/api/DefaultFailureHandlerImplTest.java
@@ -0,0 +1,137 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.tm.api;
+
+
+import io.netty.util.HashedWheelTimer;
+import io.seata.core.context.RootContext;
+import io.seata.core.exception.TransactionException;
+import io.seata.core.model.GlobalStatus;
+import io.seata.core.model.TransactionManager;
+import io.seata.tm.TransactionManagerHolder;
+import io.seata.tm.api.transaction.MyRuntimeException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.Field;
+
+/**
+ * @author wangwei
+ */
+class DefaultFailureHandlerImplTest {
+ private static final Logger LOGGER = LoggerFactory.getLogger(DefaultFailureHandlerImplTest.class);
+
+ private static final String DEFAULT_XID = "1234567890";
+ private static GlobalStatus globalStatus = GlobalStatus.Begin;
+
+ @BeforeAll
+ public static void init() {
+
+ TransactionManagerHolder.set(new TransactionManager() {
+ @Override
+ public String begin(String applicationId, String transactionServiceGroup, String name, int timeout)
+ throws TransactionException {
+ return DEFAULT_XID;
+ }
+
+ @Override
+ public GlobalStatus commit(String xid) throws TransactionException {
+ return GlobalStatus.Committed;
+ }
+
+ @Override
+ public GlobalStatus rollback(String xid) throws TransactionException {
+ return GlobalStatus.Rollbacked;
+ }
+
+ @Override
+ public GlobalStatus getStatus(String xid) throws TransactionException {
+ return globalStatus;
+ }
+
+ @Override
+ public GlobalStatus globalReport(String xid, GlobalStatus globalStatus) throws TransactionException {
+ return globalStatus;
+ }
+ });
+ }
+
+ @Test
+ void onBeginFailure() {
+ RootContext.bind(DEFAULT_XID);
+ GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
+ FailureHandler failureHandler = new DefaultFailureHandlerImpl();
+ failureHandler.onBeginFailure(tx, new MyRuntimeException("").getCause());
+ }
+
+ @Test
+ void onCommitFailure() throws Exception{
+
+ RootContext.bind(DEFAULT_XID);
+ GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
+ FailureHandler failureHandler = new DefaultFailureHandlerImpl();
+ failureHandler.onCommitFailure(tx, new MyRuntimeException("").getCause());
+
+ // get timer
+ Class c = Class.forName("io.seata.tm.api.DefaultFailureHandlerImpl");
+ Field field = c.getDeclaredField("timer");
+ field.setAccessible(true);
+ HashedWheelTimer timer = (HashedWheelTimer) field.get(failureHandler);
+ // assert timer pendingCount: first time is 1
+ Long pendingTimeout = timer.pendingTimeouts();
+ Assertions.assertEquals(pendingTimeout,1L);
+ //set globalStatus
+ globalStatus= GlobalStatus.Committed;
+ Thread.sleep(25*1000L);
+ pendingTimeout = timer.pendingTimeouts();
+ LOGGER.info("pendingTimeout {}" ,pendingTimeout);
+ //all timer is done
+ Assertions.assertEquals(pendingTimeout,0L);
+ }
+
+ @Test
+ void onRollbackFailure() throws Exception {
+
+
+ RootContext.bind(DEFAULT_XID);
+ GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
+ FailureHandler failureHandler = new DefaultFailureHandlerImpl();
+ failureHandler.onRollbackFailure(tx, new MyRuntimeException("").getCause());
+
+ // get timer
+ Class c = Class.forName("io.seata.tm.api.DefaultFailureHandlerImpl");
+ Field field = c.getDeclaredField("timer");
+ field.setAccessible(true);
+ HashedWheelTimer timer = (HashedWheelTimer) field.get(failureHandler);
+ // assert timer pendingCount: first time is 1
+ Long pendingTimeout = timer.pendingTimeouts();
+ Assertions.assertEquals(pendingTimeout,1L);
+ //set globalStatus
+ globalStatus= GlobalStatus.Rollbacked;
+ Thread.sleep(25*1000L);
+ pendingTimeout = timer.pendingTimeouts();
+ LOGGER.info("pendingTimeout {}" ,pendingTimeout);
+ //all timer is done
+ Assertions.assertEquals(pendingTimeout,0L);
+
+
+ }
+
+
+}
diff --git a/tm/src/test/java/io/seata/tm/api/DefaultGlobalTransactionTest.java b/tm/src/test/java/io/seata/tm/api/DefaultGlobalTransactionTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5a9c9cc31283169cb96d58dbeeb6acb1a00d9750
--- /dev/null
+++ b/tm/src/test/java/io/seata/tm/api/DefaultGlobalTransactionTest.java
@@ -0,0 +1,101 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.tm.api;
+
+
+import io.seata.core.context.RootContext;
+import io.seata.core.exception.TransactionException;
+import io.seata.core.model.GlobalStatus;
+import io.seata.core.model.TransactionManager;
+import io.seata.tm.TransactionManagerHolder;
+import io.seata.tm.api.transaction.MyRuntimeException;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author wangwei
+ */
+class DefaultGlobalTransactionTest {
+ private static final String DEFAULT_XID = "1234567890";
+
+ @BeforeAll
+ public static void init() {
+
+ TransactionManagerHolder.set(new TransactionManager() {
+ @Override
+ public String begin(String applicationId, String transactionServiceGroup, String name, int timeout)
+ throws TransactionException {
+ return DEFAULT_XID;
+ }
+
+ @Override
+ public GlobalStatus commit(String xid) throws TransactionException {
+ throw new MyRuntimeException("");
+ }
+
+ @Override
+ public GlobalStatus rollback(String xid) throws TransactionException {
+ throw new MyRuntimeException("");
+ }
+
+ @Override
+ public GlobalStatus getStatus(String xid) throws TransactionException {
+ throw new MyRuntimeException("");
+ }
+
+ @Override
+ public GlobalStatus globalReport(String xid, GlobalStatus globalStatus) throws TransactionException {
+ return globalStatus;
+ }
+ });
+ }
+
+
+ @Test
+ public void commitRetryExceptionTest() throws TransactionException {
+ RootContext.unbind();
+ GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
+ tx.begin();
+ Assertions.assertThrows(TransactionException.class, () -> {
+ tx.commit();});
+ }
+
+ @Test
+ public void commitNoXIDExceptionTest() throws TransactionException {
+ RootContext.unbind();
+ GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
+ Assertions.assertThrows(IllegalStateException.class, () -> tx.commit());
+ }
+
+
+ @Test
+ public void rollBackRetryExceptionTest() throws TransactionException {
+ RootContext.unbind();
+ GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
+ tx.begin();
+ Assertions.assertThrows(TransactionException.class, () -> tx.rollback());
+ }
+
+ @Test
+ public void rollBackNoXIDExceptionTest() throws TransactionException {
+ RootContext.unbind();
+ GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
+ tx.begin();
+ Assertions.assertThrows(TransactionException.class, () -> tx.rollback());
+ }
+
+}
diff --git a/tm/src/test/java/io/seata/tm/api/GlobalTransactionContextTest.java b/tm/src/test/java/io/seata/tm/api/GlobalTransactionContextTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..3ebad0b2a362d94174f0316af9db75d53af5fe36
--- /dev/null
+++ b/tm/src/test/java/io/seata/tm/api/GlobalTransactionContextTest.java
@@ -0,0 +1,73 @@
+/*
+ * Copyright 1999-2019 Seata.io Group.
+ *
+ * Licensed 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 io.seata.tm.api;
+
+
+import io.seata.core.exception.TransactionException;
+import io.seata.core.model.GlobalStatus;
+import io.seata.core.model.TransactionManager;
+import io.seata.tm.TransactionManagerHolder;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+
+/**
+ * @author wangwei
+ */
+class GlobalTransactionContextTest {
+ private static final String DEFAULT_XID = "1234567890";
+
+ @BeforeAll
+ public static void init() {
+
+ TransactionManagerHolder.set(new TransactionManager() {
+ @Override
+ public String begin(String applicationId, String transactionServiceGroup, String name, int timeout)
+ throws TransactionException {
+ return DEFAULT_XID;
+ }
+
+ @Override
+ public GlobalStatus commit(String xid) throws TransactionException {
+ return GlobalStatus.Committed;
+ }
+
+ @Override
+ public GlobalStatus rollback(String xid) throws TransactionException {
+ return GlobalStatus.Rollbacked;
+ }
+
+ @Override
+ public GlobalStatus getStatus(String xid) throws TransactionException {
+ return GlobalStatus.Begin;
+ }
+
+ @Override
+ public GlobalStatus globalReport(String xid, GlobalStatus globalStatus) throws TransactionException {
+ return globalStatus;
+ }
+ });
+ }
+
+ @Test
+ void reloadTest() throws TransactionException {
+ GlobalTransaction tx = GlobalTransactionContext.getCurrentOrCreate();
+ tx = GlobalTransactionContext.reload(DEFAULT_XID);
+ GlobalTransaction finalTx = tx;
+ Assertions.assertThrows(IllegalStateException.class, () -> finalTx.begin());
+
+ }
+}
diff --git a/tm/src/test/java/io/seata/tm/api/TransactionTemplateTest.java b/tm/src/test/java/io/seata/tm/api/TransactionTemplateTest.java
index 17dc2a73f5c21837e67f4a66fc5f3ffb6a52d97e..f7f85cbf11046ea85eedc9ddbb4e1c42827777ca 100644
--- a/tm/src/test/java/io/seata/tm/api/TransactionTemplateTest.java
+++ b/tm/src/test/java/io/seata/tm/api/TransactionTemplateTest.java
@@ -38,7 +38,6 @@ import static org.mockito.Mockito.when;
/**
* @author guoyao
- * @date 2019/3/6
*/
public class TransactionTemplateTest {
diff --git a/tm/src/test/java/io/seata/tm/api/transaction/MyRuntimeException.java b/tm/src/test/java/io/seata/tm/api/transaction/MyRuntimeException.java
index 479476c28e81b6f0af19e24698bedb11762b0acf..5c901c14241cc67d73188e278d10f6deebeaac64 100644
--- a/tm/src/test/java/io/seata/tm/api/transaction/MyRuntimeException.java
+++ b/tm/src/test/java/io/seata/tm/api/transaction/MyRuntimeException.java
@@ -17,7 +17,6 @@ package io.seata.tm.api.transaction;
/**
* @author guoyao
- * @date 2019/4/18
*/
public class MyRuntimeException extends RuntimeException {
diff --git a/tm/src/test/java/io/seata/tm/api/transaction/NoRollbackRuleTest.java b/tm/src/test/java/io/seata/tm/api/transaction/NoRollbackRuleTest.java
index 1ef98bbcfa1dd335aea7b3b76041de561b990b98..5dbc2c0a7832c52d38cc5ce98bc4ade38f8a05f6 100644
--- a/tm/src/test/java/io/seata/tm/api/transaction/NoRollbackRuleTest.java
+++ b/tm/src/test/java/io/seata/tm/api/transaction/NoRollbackRuleTest.java
@@ -20,7 +20,6 @@ import org.junit.jupiter.api.Test;
/**
* @author l81893521
- * @date 2019/8/9
*/
public class NoRollbackRuleTest {
@@ -32,5 +31,9 @@ public class NoRollbackRuleTest {
RollbackRule rollbackRuleByName = new NoRollbackRule(Exception.class.getName());
RollbackRule otherRollbackRuleByName = new NoRollbackRule(Exception.class.getName());
Assertions.assertEquals(rollbackRuleByName, otherRollbackRuleByName);
+ NoRollbackRule otherRollbackRuleByName3 = new NoRollbackRule(Exception.class.getName());
+ Assertions.assertEquals(otherRollbackRuleByName3.toString(),"NoRollbackRule with pattern [" + Exception.class.getName() + "]");
+
+
}
}
diff --git a/tm/src/test/java/io/seata/tm/api/transaction/RollbackRuleTest.java b/tm/src/test/java/io/seata/tm/api/transaction/RollbackRuleTest.java
index c36d44ca9313f661d78032b3c6a7ac6d27eaa1a1..0755faa6897d213ad35f2ba9c258f6a63a03b4a0 100644
--- a/tm/src/test/java/io/seata/tm/api/transaction/RollbackRuleTest.java
+++ b/tm/src/test/java/io/seata/tm/api/transaction/RollbackRuleTest.java
@@ -25,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author guoyao
- * @date 2019/4/18
*/
public class RollbackRuleTest {
@@ -77,5 +76,20 @@ public class RollbackRuleTest {
public void ctorArgExceptionStringNameVersionWithNull() {
Assertions.assertThrows(IllegalArgumentException.class, () -> new RollbackRule((String) null));
}
+ @Test
+ public void toStringTest(){
+ RollbackRule otherRollbackRuleByName = new RollbackRule(Exception.class.getName());
+ Assertions.assertEquals(otherRollbackRuleByName.toString(),"RollbackRule with pattern [" + Exception.class.getName() + "]");
+ }
+
+ @Test
+ public void equalsTest(){
+ RollbackRule otherRollbackRuleByName = new RollbackRule(Exception.class.getName());
+ RollbackRule otherRollbackRuleByName2 = new NoRollbackRule(Exception.class.getName());
+
+ Assertions.assertFalse(otherRollbackRuleByName.equals(""));
+ Assertions.assertTrue(otherRollbackRuleByName.equals(otherRollbackRuleByName));
+ Assertions.assertTrue(otherRollbackRuleByName.equals(otherRollbackRuleByName2));
+ }
}
diff --git a/tm/src/test/java/io/seata/tm/api/transaction/TransactionHookManagerTest.java b/tm/src/test/java/io/seata/tm/api/transaction/TransactionHookManagerTest.java
index 55942e4cb49dee1cb11632c552d4696a7c0fe4d1..4ba476c2e2d73e989fa023541fee2541f5c4f8a4 100644
--- a/tm/src/test/java/io/seata/tm/api/transaction/TransactionHookManagerTest.java
+++ b/tm/src/test/java/io/seata/tm/api/transaction/TransactionHookManagerTest.java
@@ -16,6 +16,7 @@
package io.seata.tm.api.transaction;
import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import java.util.List;
@@ -24,7 +25,6 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author guoyao
- * @date 2019/3/5
*/
public class TransactionHookManagerTest {
@@ -57,5 +57,8 @@ public class TransactionHookManagerTest {
TransactionHookManager.clear();
assertThat(TransactionHookManager.getHooks()).isEmpty();
}
-
+ @Test
+ public void testNPE() {
+ Assertions.assertThrows(NullPointerException.class, () -> TransactionHookManager.registerHook(null));
+ }
}
diff --git a/tm/src/test/java/io/seata/tm/api/transaction/TransactionInfoTest.java b/tm/src/test/java/io/seata/tm/api/transaction/TransactionInfoTest.java
index 81372d2eb11b6c5d36e282d71b36d91e282539fb..8f4de72b160ca71999c5b1f20b0a83b5598be4ca 100644
--- a/tm/src/test/java/io/seata/tm/api/transaction/TransactionInfoTest.java
+++ b/tm/src/test/java/io/seata/tm/api/transaction/TransactionInfoTest.java
@@ -16,9 +16,6 @@
package io.seata.tm.api.transaction;
import com.alibaba.fastjson.JSON;
-import io.seata.tm.api.transaction.NoRollbackRule;
-import io.seata.tm.api.transaction.RollbackRule;
-import io.seata.tm.api.transaction.TransactionInfo;
import org.junit.jupiter.api.Test;
import java.io.IOException;
@@ -29,7 +26,6 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author guoyao
- * @date 2019/4/17
*/
public class TransactionInfoTest {
@@ -46,7 +42,7 @@ public class TransactionInfoTest {
String fromJson = "{\n" +
"\t\"name\":\""+ NAME +"\",\n" +
"\t\"rollbackRules\":[{\n" +
- "\t\t\"exceptionName\":\""+ Exception.class.getName() +"\"\n" +
+ "\t\t\"exceptionName\":\""+ IllegalStateException.class.getName() +"\"\n" +
"\t},{\n" +
"\t\t\"exceptionName\":\""+ IllegalArgumentException.class.getName() +"\"\n" +
"\t},{\n" +
@@ -84,17 +80,19 @@ public class TransactionInfoTest {
txInfo.setRollbackRules(sets);
assertThat(txInfo.rollbackOn(new IllegalArgumentException())).isTrue();
- assertThat(txInfo.rollbackOn(new Exception())).isTrue();
+ assertThat(txInfo.rollbackOn(new IllegalStateException())).isTrue();
assertThat(txInfo.rollbackOn(new IOException())).isFalse();
assertThat(txInfo.rollbackOn(new NullPointerException())).isFalse();
- // not found return true
- assertThat(txInfo.rollbackOn(new RuntimeException())).isTrue();
+ // not found return false
+ assertThat(txInfo.rollbackOn(new MyRuntimeException("test"))).isFalse();
+ assertThat(txInfo.rollbackOn(new RuntimeException())).isFalse();
+ assertThat(txInfo.rollbackOn(new Throwable())).isFalse();
}
private Set<RollbackRule> getRollbackRules() {
Set<RollbackRule> sets = new LinkedHashSet<>();
- sets.add(new RollbackRule(Exception.class.getName()));
+ sets.add(new RollbackRule(IllegalStateException.class.getName()));
sets.add(new RollbackRule(IllegalArgumentException.class));
sets.add(new NoRollbackRule(IO_EXCEPTION_SHORT_NAME));
sets.add(new NoRollbackRule(NullPointerException.class));