This is an automated email from the ASF dual-hosted git repository.
songxiaosheng pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-spi-extensions.git
The following commit(s) were added to refs/heads/master by this push:
new f46efa39 support apache seata 2.1.0 (#509)
f46efa39 is described below
commit f46efa39a11778880cb0a4d5f283caa32f5678d9
Author: funkye <[email protected]>
AuthorDate: Mon Sep 16 16:24:48 2024 +0800
support apache seata 2.1.0 (#509)
* support apache seata 2.1.0
* support apache seata 2.1.0
* support apache seata 2.1.0
---
.../examples-provider-sca/pom.xml | 1 +
.../examples-provider/pom.xml | 1 +
dubbo-extensions-dependencies-bom/pom.xml | 4 ++--
dubbo-filter-extensions/dubbo-filter-seata/pom.xml | 2 +-
.../SeataTransactionPropagationConsumerFilter.java | 27 +++++++++++-----------
.../SeataTransactionPropagationProviderFilter.java | 9 ++++----
...taTransactionPropagationConsumerFilterTest.java | 4 ++--
...taTransactionPropagationProviderFilterTest.java | 4 ++--
8 files changed, 27 insertions(+), 25 deletions(-)
diff --git
a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
index 1bab0e59..1b1177ba 100644
--- a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider-sca/pom.xml
@@ -67,6 +67,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
<configuration>
<mainClass>org.apache.dubbo.apidocs.examples.ExampleScaApplication</mainClass>
<classifier>exec</classifier>
diff --git a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
index 56995e9a..a60c2f70 100644
--- a/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
+++ b/dubbo-api-docs/dubbo-api-docs-examples/examples-provider/pom.xml
@@ -113,6 +113,7 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>${spring-boot.version}</version>
<configuration>
<mainClass>org.apache.dubbo.apidocs.examples.ExampleApplication</mainClass>
<classifier>exec</classifier>
diff --git a/dubbo-extensions-dependencies-bom/pom.xml
b/dubbo-extensions-dependencies-bom/pom.xml
index 69280f74..664e6869 100644
--- a/dubbo-extensions-dependencies-bom/pom.xml
+++ b/dubbo-extensions-dependencies-bom/pom.xml
@@ -129,7 +129,7 @@
<consul_version>1.4.5</consul_version>
<consul_client_version>1.3.7</consul_client_version>
<test_container_version>1.20.1</test_container_version>
- <seata_version>1.8.0</seata_version>
+ <seata_version>2.1.0</seata_version>
<eureka.version>1.10.18</eureka.version>
<sofa_registry_version>5.4.3</sofa_registry_version>
<logback_version>1.5.8</logback_version>
@@ -483,7 +483,7 @@
<version>${test_container_version}</version>
</dependency>
<dependency>
- <groupId>io.seata</groupId>
+ <groupId>org.apache.seata</groupId>
<artifactId>seata-core</artifactId>
<version>${seata_version}</version>
</dependency>
diff --git a/dubbo-filter-extensions/dubbo-filter-seata/pom.xml
b/dubbo-filter-extensions/dubbo-filter-seata/pom.xml
index dd777029..cba95c00 100644
--- a/dubbo-filter-extensions/dubbo-filter-seata/pom.xml
+++ b/dubbo-filter-extensions/dubbo-filter-seata/pom.xml
@@ -32,7 +32,7 @@
<dependencies>
<dependency>
- <groupId>io.seata</groupId>
+ <groupId>org.apache.seata</groupId>
<artifactId>seata-core</artifactId>
<optional>true</optional>
</dependency>
diff --git
a/dubbo-filter-extensions/dubbo-filter-seata/src/main/java/org/apache/dubbo/seata/SeataTransactionPropagationConsumerFilter.java
b/dubbo-filter-extensions/dubbo-filter-seata/src/main/java/org/apache/dubbo/seata/SeataTransactionPropagationConsumerFilter.java
index 4af06223..d6f1da04 100644
---
a/dubbo-filter-extensions/dubbo-filter-seata/src/main/java/org/apache/dubbo/seata/SeataTransactionPropagationConsumerFilter.java
+++
b/dubbo-filter-extensions/dubbo-filter-seata/src/main/java/org/apache/dubbo/seata/SeataTransactionPropagationConsumerFilter.java
@@ -24,10 +24,9 @@ import org.apache.dubbo.rpc.Invocation;
import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Result;
import org.apache.dubbo.rpc.RpcException;
-
-import io.seata.core.constants.DubboConstants;
-import io.seata.core.context.RootContext;
-import io.seata.core.model.BranchType;
+import org.apache.seata.core.constants.DubboConstants;
+import org.apache.seata.core.context.RootContext;
+import org.apache.seata.core.model.BranchType;
/**
* The type Transaction propagation consumer filter.
@@ -38,16 +37,18 @@ public class SeataTransactionPropagationConsumerFilter
implements Filter {
@Override
public Result invoke(Invoker<?> invoker, Invocation invocation) throws
RpcException {
- String xid = RootContext.getXID();
- BranchType branchType = RootContext.getBranchType();
+ if (RootContext.inGlobalTransaction()) {
+ String xid = RootContext.getXID();
+ BranchType branchType = RootContext.getBranchType();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug(String.format("Client side xid in RootContext[%s]",
xid));
- }
- if (xid != null) {
- invocation.setAttachment(RootContext.KEY_XID, xid);
- if (branchType != null) {
- invocation.setAttachment(RootContext.KEY_BRANCH_TYPE,
branchType.name());
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug(String.format("Client side xid in
RootContext[%s]", xid));
+ }
+ if (xid != null) {
+ invocation.setAttachment(RootContext.KEY_XID, xid);
+ if (branchType != null) {
+ invocation.setAttachment(RootContext.KEY_BRANCH_TYPE,
branchType.name());
+ }
}
}
return invoker.invoke(invocation);
diff --git
a/dubbo-filter-extensions/dubbo-filter-seata/src/main/java/org/apache/dubbo/seata/SeataTransactionPropagationProviderFilter.java
b/dubbo-filter-extensions/dubbo-filter-seata/src/main/java/org/apache/dubbo/seata/SeataTransactionPropagationProviderFilter.java
index a319fbab..f94eb54c 100644
---
a/dubbo-filter-extensions/dubbo-filter-seata/src/main/java/org/apache/dubbo/seata/SeataTransactionPropagationProviderFilter.java
+++
b/dubbo-filter-extensions/dubbo-filter-seata/src/main/java/org/apache/dubbo/seata/SeataTransactionPropagationProviderFilter.java
@@ -25,11 +25,10 @@ import org.apache.dubbo.rpc.Invoker;
import org.apache.dubbo.rpc.Result;
import org.apache.dubbo.rpc.RpcException;
import org.apache.dubbo.rpc.Constants;
-
-import io.seata.common.util.StringUtils;
-import io.seata.core.constants.DubboConstants;
-import io.seata.core.context.RootContext;
-import io.seata.core.model.BranchType;
+import org.apache.seata.common.util.StringUtils;
+import org.apache.seata.core.constants.DubboConstants;
+import org.apache.seata.core.context.RootContext;
+import org.apache.seata.core.model.BranchType;
/**
* The type Transaction propagation provider filter.
diff --git
a/dubbo-filter-extensions/dubbo-filter-seata/src/test/java/org/apache/dubbo/seata/SeataTransactionPropagationConsumerFilterTest.java
b/dubbo-filter-extensions/dubbo-filter-seata/src/test/java/org/apache/dubbo/seata/SeataTransactionPropagationConsumerFilterTest.java
index 93261be6..d56f77ef 100644
---
a/dubbo-filter-extensions/dubbo-filter-seata/src/test/java/org/apache/dubbo/seata/SeataTransactionPropagationConsumerFilterTest.java
+++
b/dubbo-filter-extensions/dubbo-filter-seata/src/test/java/org/apache/dubbo/seata/SeataTransactionPropagationConsumerFilterTest.java
@@ -23,8 +23,8 @@ import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.FrameworkModel;
import org.apache.dubbo.rpc.model.ModuleModel;
-import io.seata.core.context.RootContext;
-import io.seata.core.model.BranchType;
+import org.apache.seata.core.context.RootContext;
+import org.apache.seata.core.model.BranchType;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
diff --git
a/dubbo-filter-extensions/dubbo-filter-seata/src/test/java/org/apache/dubbo/seata/SeataTransactionPropagationProviderFilterTest.java
b/dubbo-filter-extensions/dubbo-filter-seata/src/test/java/org/apache/dubbo/seata/SeataTransactionPropagationProviderFilterTest.java
index 88d05c58..d3e24f05 100644
---
a/dubbo-filter-extensions/dubbo-filter-seata/src/test/java/org/apache/dubbo/seata/SeataTransactionPropagationProviderFilterTest.java
+++
b/dubbo-filter-extensions/dubbo-filter-seata/src/test/java/org/apache/dubbo/seata/SeataTransactionPropagationProviderFilterTest.java
@@ -26,8 +26,8 @@ import org.apache.dubbo.rpc.model.ApplicationModel;
import org.apache.dubbo.rpc.model.FrameworkModel;
import org.apache.dubbo.rpc.model.ModuleModel;
-import io.seata.core.context.RootContext;
-import io.seata.core.model.BranchType;
+import org.apache.seata.core.context.RootContext;
+import org.apache.seata.core.model.BranchType;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.mockito.Mockito;
