feature: saga-remove spring #6370

wt-better · 2024-02-22T02:39:51Z

I have registered the PR changes.

Ⅰ. Describe what this PR did

Seata saga current is strong dependency on spring. such as:

code was dependency spring beans (InitializingBean ..etc)
expression evaluation dependency spring el
spring bean service Task dependency spring ioc

This is not conducive to saga's multilanguage building, so I has decouple saga with spring.

To ensure code compatibility, make new module named 'seata-saga-spring' and move related classes(not modified path) to this module.
'seata-saga-tm' has spring dependency, this module is not necessary. First I removed this module and move class to 'seata-saga-spring' , I will sink TM's core capabilities ‘seata-saga-engine’ module later pr.
'seata-saga-engine-store' remove the implementation of serialization and make it more pure
'seata-saga-rm' has class named StateMachineEngineHolder, i moved to ‘seata-saga-engine’ module, and package name change, it`s not compatible. why ? I think it is inner use, users rarely use it.

funky-eyes

code style need change

funky-eyes · 2024-02-27T09:11:31Z

...ga-engine/src/main/java/org/apache/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java

+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;


Suggested change

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;

funky-eyes · 2024-02-27T09:11:56Z

...ga-engine/src/main/java/org/apache/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java

-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
 import org.apache.seata.common.exception.FrameworkErrorCode;


Suggested change

import org.apache.seata.common.exception.FrameworkErrorCode;

import java.util.Date;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import java.util.concurrent.ConcurrentHashMap;

import org.apache.seata.common.exception.FrameworkErrorCode;

funky-eyes · 2024-02-27T09:13:02Z

...ngine/src/main/java/org/apache/seata/saga/engine/pcext/handlers/ServiceTaskStateHandler.java

+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;


Suggested change

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

funky-eyes · 2024-02-27T09:13:11Z

...ngine/src/main/java/org/apache/seata/saga/engine/pcext/handlers/ServiceTaskStateHandler.java

-import java.util.List;
-import java.util.Map;
-
 import org.apache.seata.common.exception.FrameworkErrorCode;


Suggested change

import org.apache.seata.common.exception.FrameworkErrorCode;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import org.apache.seata.common.exception.FrameworkErrorCode;

funky-eyes · 2024-02-27T09:13:31Z

...engine/src/main/java/org/apache/seata/saga/engine/pcext/handlers/SubStateMachineHandler.java

+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;


Suggested change

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

funky-eyes · 2024-02-27T09:17:20Z

...eata-saga-spring/src/main/java/org/apache/seata/saga/engine/config/DbStateMachineConfig.java

-import java.sql.DatabaseMetaData;
-import java.sql.SQLException;
-
+import org.apache.seata.common.ConfigurationKeys;


Suggested change

import org.apache.seata.common.ConfigurationKeys;

import javax.sql.DataSource;

import java.sql.Connection;

import java.sql.DatabaseMetaData;

import java.sql.SQLException;

import org.apache.seata.common.ConfigurationKeys;

funky-eyes · 2024-02-27T09:20:11Z

...a-saga-spring/src/main/java/org/apache/seata/saga/engine/impl/DefaultStateMachineConfig.java

+import java.io.IOException;
+import java.io.InputStream;


Suggested change

import java.io.IOException;

import java.io.InputStream;

funky-eyes · 2024-02-27T09:20:19Z

...a-saga-spring/src/main/java/org/apache/seata/saga/engine/impl/DefaultStateMachineConfig.java

+ */
+package org.apache.seata.saga.engine.impl;
+
+import org.apache.seata.saga.engine.config.AbstractStateMachineConfig;


Suggested change

import org.apache.seata.saga.engine.config.AbstractStateMachineConfig;

import java.io.IOException;

import java.io.InputStream;

import org.apache.seata.saga.engine.config.AbstractStateMachineConfig;

funky-eyes · 2024-02-27T09:21:56Z

...ta-saga-statelang/src/test/java/org/apache/seata/saga/statelang/parser/StateParserTests.java

+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Date;
+import java.util.Map;


Suggested change

import java.io.IOException;

import java.io.InputStream;

import java.util.Date;

import java.util.Map;

funky-eyes · 2024-02-27T09:22:04Z

...ta-saga-statelang/src/test/java/org/apache/seata/saga/statelang/parser/StateParserTests.java

@@ -16,29 +16,27 @@
 */
 package org.apache.seata.saga.statelang.parser;



Suggested change

import java.io.IOException;

import java.io.InputStream;

import java.util.Date;

import java.util.Map;

codecov-commenter · 2024-02-28T08:29:27Z

Codecov Report

Attention: Patch coverage is 5.55556% with 51 lines in your changes are missing coverage. Please review.

Project coverage is 51.06%. Comparing base (87b6e5f) to head (21822f0).
Report is 1 commits behind head on 2.x.

Additional details and impacted files

@@             Coverage Diff              @@
##                2.x    #6370      +/-   ##
============================================
- Coverage     52.39%   51.06%   -1.33%     
- Complexity     5242     5262      +20     
============================================
  Files           924      934      +10     
  Lines         32068    33029     +961     
  Branches       3833     4002     +169     
============================================
+ Hits          16801    16866      +65     
- Misses        13611    14495     +884     
- Partials       1656     1668      +12

Files	Coverage Δ
...tion/tx/api/interceptor/InvocationHandlerType.java	`100.00% <100.00%> (ø)`
...aga/engine/expression/spel/SpringELExpression.java	`0.00% <ø> (ø)`
.../engine/invoker/impl/SpringBeanServiceInvoker.java	`0.00% <ø> (ø)`
...ga/engine/store/db/DbAndReportTcStateLogStore.java	`0.00% <ø> (ø)`
...g/apache/seata/saga/engine/utils/ResourceUtil.java	`66.66% <100.00%> (ø)`
...ser/impl/CompensateSubStateMachineStateParser.java	`66.66% <ø> (ø)`
...a/statelang/parser/impl/SubStateMachineParser.java	`90.90% <ø> (ø)`
...tatelang/parser/utils/DesignerJsonTransformer.java	`54.65% <ø> (ø)`
...boot/autoconfigure/SeataSagaAutoConfiguration.java	`0.00% <0.00%> (ø)`
...ga/engine/tm/DefaultSagaTransactionalTemplate.java	`0.00% <0.00%> (ø)`
... and 4 more

... and 9 files with indirect coverage changes

wt-better · 2024-02-29T06:25:57Z

code style need change

i think not need change, history layout is not standard.

standard layout

seata-core etc .. other moudle also keep this layout

…spring

funky-eyes

LGTM

wt-better added 5 commits February 22, 2024 10:33

saga-remove spring

04383e3

add change note

84d38db

fix check style

e5caf57

fix compile error

2985103

fix pmd

34b8fe6

funky-eyes reviewed Feb 27, 2024

View reviewed changes

funky-eyes added this to the 2.1.0 milestone Feb 28, 2024

funky-eyes added type: feature Category issues or prs related to feature request. module/saga saga module labels Feb 28, 2024

wt-better added 4 commits February 29, 2024 14:46

修改import格式

49b7f00

Merge remote-tracking branch 'origin/2.x' into feature/saga-decouple-…

4711ac2

…spring

Merge remote-tracking branch 'origin/2.x' into feature/saga-decouple-…

56b88ae

…spring

fix pmd

21822f0

funky-eyes approved these changes Feb 29, 2024

View reviewed changes

funky-eyes merged commit 709bd30 into apache:2.x Feb 29, 2024

ptyin mentioned this pull request May 16, 2024

bugfix: fix saga "cannot matching status" #6553

Merged

1 task

YvCeung pushed a commit to YvCeung/incubator-seata that referenced this pull request Dec 25, 2025

feature: saga-remove spring (apache#6370)

f658766

		@@ -16,29 +16,27 @@
		*/
		package org.apache.seata.saga.statelang.parser;

feature: saga-remove spring #6370

feature: saga-remove spring #6370

Uh oh!

Conversation

wt-better commented Feb 22, 2024

Ⅰ. Describe what this PR did

Uh oh!

funky-eyes left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov-commenter commented Feb 28, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

wt-better commented Feb 29, 2024

Uh oh!

funky-eyes left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov-commenter commented Feb 28, 2024 •

edited

Loading