feature: saga remove spring #6017

wt-better · 2023-11-11T04:27:41Z

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' was removed, because It is the core function of the engine ,should not be separated.
'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.

so the architecture will be：

history architecture was:

…ring

…ta into feature/saga-remove-spring

...engine/src/main/java/io/seata/saga/engine/pcext/interceptors/LoopTaskHandlerInterceptor.java

wt-better · 2023-11-14T17:41:36Z

...ine/src/main/java/io/seata/saga/engine/pcext/interceptors/ServiceTaskHandlerInterceptor.java

                    } else {
-                        elContext = context.getVariables();
+                        elContext = context.getVariable(DomainConstants.VAR_NAME_OUTPUT_PARAMS);


需要测试下这里是否兼容

codecov · 2023-11-14T18:34:50Z

Codecov Report

Merging #6017 (48d865e) into 2.x (abfafc3) will decrease coverage by 0.87%.
The diff coverage is 0.50%.

Additional details and impacted files

@@             Coverage Diff              @@
##                2.x    #6017      +/-   ##
============================================
- Coverage     49.56%   48.70%   -0.87%     
- Complexity     4748     4762      +14     
============================================
  Files           907      914       +7     
  Lines         31284    31857     +573     
  Branches       3770     3862      +92     
============================================
+ Hits          15506    15515       +9     
- Misses        14246    14811     +565     
+ Partials       1532     1531       -1

Files	Coverage Δ
...aga/engine/expression/spel/SpringELExpression.java	`0.00% <ø> (ø)`
.../engine/invoker/impl/SpringBeanServiceInvoker.java	`0.00% <ø> (ø)`
...src/main/java/io/seata/saga/util/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%> (ø)`
...eata/saga/tm/DefaultSagaTransactionalTemplate.java	`0.00% <0.00%> (ø)`
...ine/expression/spel/SpringELExpressionFactory.java	`0.00% <0.00%> (ø)`
...seata/saga/engine/config/DbStateMachineConfig.java	`0.00% <0.00%> (ø)`
... and 3 more

... and 3 files with indirect coverage changes

ptyin

I think @wt-better have done a really fantastic refactoring job! The changes are HHHUGE though ;)

ptyin · 2023-11-29T14:04:37Z

common/src/main/java/io/seata/common/util/StringUtils.java

@@ -373,4 +372,22 @@ public static boolean hasUpperCase(String str) {
        return false;
    }

+    public static boolean hasText(String str) {


I think hasText and containsText are redundant, as it completely identical to isNotBlank.

this named with history spring naming, for less change. It can also be changed to ‘ containsText’

ptyin · 2023-11-29T14:28:47Z

.../seata-saga-engine/src/main/java/io/seata/saga/engine/config/AbstractStateMachineConfig.java

+    /**
+     * Init StateLogStore by subClass
+     *
+     * @return StateLogStore
+     */
+    public abstract StateLangStore initStateLogStoreStore() throws Exception;
+
+    /**
+     * Init StateLogStore by subClass
+     *
+     * @return StateLogStore
+     */
+    public abstract StateLogStore initStateLogStore() throws Exception;
+


I dont get the point of having these two abstract methods. I see the only implementation to these two methods merely return null.

P.S., there is a typo. Should change initStateLogStoreStore to initStateLangStore in method signature and code comments

This is redundant

ptyin · 2023-11-29T14:33:08Z

saga/seata-saga-engine/src/main/java/io/seata/saga/engine/store/db/AbstractStore.java

I see we remove seata-saga-engine-store module, and replace it to seata-saga-engine/store/db. I'd like to know the underlying reasons.

seata-saga-engine-store module was engine strongly relevant.

less module can reduce complexity

ptyin · 2023-11-29T14:35:33Z

.../seata-saga-engine/src/main/java/io/seata/saga/engine/pcext/handlers/ChoiceStateHandler.java

@@ -15,6 +15,7 @@
 */
 package io.seata.saga.engine.pcext.handlers;

+import io.seata.common.util.StringUtils;


This import is misplaced.

ptyin · 2023-11-29T14:37:21Z

...engine/src/main/java/io/seata/saga/engine/pcext/interceptors/LoopTaskHandlerInterceptor.java

@@ -15,6 +15,7 @@
 */
 package io.seata.saga.engine.pcext.interceptors;

+import io.seata.saga.engine.pcext.handlers.ServiceTaskStateHandler;


There are more misplaced imports, please check.

ptyin · 2023-11-29T14:41:35Z

...seata-saga-engine/src/main/java/io/seata/saga/engine/sequence/AlternativeJdkIdGenerator.java

It looks like this file is copied from spring-framework, right? I wonder if there is a copyright issue.

this was fixed to jre uuid

ptyin · 2023-11-29T14:49:35Z

saga/seata-saga-statelang/src/test/java/io/seata/saga/statelang/parser/StateParserTests.java

@@ -52,14 +50,13 @@ public void testParser() throws IOException {
        System.out.println(fastjsonOutputJson);

        Assertions.assertEquals("simpleTestStateMachine", stateMachine.getName());
-        Assertions.assertTrue(stateMachine.getStates().size() > 0);
+        Assertions.assertFalse(stateMachine.getStates().isEmpty());


I think we should avoid these non-related changes so to reduce CR complexity

…ring # Conflicts: # common/src/main/java/io/seata/common/util/StringUtils.java # saga/seata-saga-engine-store/pom.xml # saga/seata-saga-engine/src/main/java/io/seata/saga/engine/config/AbstractStateMachineConfig.java # saga/seata-saga-engine/src/main/java/io/seata/saga/engine/repo/StateMachineRepository.java # saga/seata-saga-engine/src/main/java/io/seata/saga/engine/store/db/DbStateLogStore.java # saga/seata-saga-spring/src/test/java/io/seata/saga/util/ResourceUtilTests.java # saga/seata-saga-statelang/src/test/java/io/seata/saga/statelang/parser/StateParserTests.java # saga/seata-saga-tm/pom.xml # test/src/test/resources/saga/spring/statemachine_engine_db_mockserver_test.xml # test/src/test/resources/saga/spring/statemachine_engine_db_test.xml # test/src/test/resources/saga/spring/statemachine_engine_test.xml

wt-better and others added 4 commits November 6, 2023 22:41

1、解耦spring 2、去除saga-tm模块 3、优化部分接口声明

0bae661

fix ut

fec7ad7

优化rm模块

d807e56

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

5005706

…ring

wt-better requested review from slievrly and wangliang181230 November 11, 2023 04:28

add changes

c42f243

wt-better added mode: SAGA SAGA transaction mode type: feature Category issues or prs related to feature request. labels Nov 12, 2023

fix ut and add licence

0747b45

wt-better requested review from funky-eyes and long187 November 13, 2023 09:43

leizhiyuan and others added 4 commits November 13, 2023 17:46

Merge branch '2.x' into feature/saga-remove-spring

7477a7c

pom xml add license

d638467

Merge branch 'feature/saga-remove-spring' of github.com:wt-better/sea…

5510324

…ta into feature/saga-remove-spring

fix check stype

1bdadc8

wt-better commented Nov 13, 2023

View reviewed changes

...engine/src/main/java/io/seata/saga/engine/pcext/interceptors/LoopTaskHandlerInterceptor.java Outdated Show resolved Hide resolved

wt-better requested a review from leezongjie November 14, 2023 11:19

wt-better added 2 commits November 15, 2023 00:55

serviceTask移动到base包，以serviceType类型区分

33e6491

优化代码 & format code

e9dfe83

wt-better commented Nov 14, 2023

View reviewed changes

wt-better added 5 commits November 15, 2023 01:48

fix code style

f409759

Merge branch '2.x' into feature/saga-remove-spring

6affce3

spring包只保留serviceTask的spring实现，基础的serviceTask声明和处理器作为基础定义移动到engine包

a3d16ab

fix conflict

1c674cf

fix checkstyle

48d865e

wt-better requested review from leizhiyuan, sharajava and l81893521 November 14, 2023 18:27

ptyin reviewed Nov 29, 2023

View reviewed changes

funky-eyes changed the title ~~Feature/saga remove spring~~ feature: saga remove spring Dec 23, 2023

wt-better added 5 commits December 25, 2023 12:06

UUIDSeqGenerator impl to native.uuid

9e68e35

fix conflict and op code style

929e04b

remove unuse import

3ce399c

fix licence

1be5a27

wt-better closed this Feb 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feature: saga remove spring #6017

feature: saga remove spring #6017

wt-better commented Nov 11, 2023 •

edited

Loading

wt-better Nov 14, 2023

codecov bot commented Nov 14, 2023

ptyin left a comment

ptyin Nov 29, 2023

wt-better Jan 15, 2024

ptyin Nov 29, 2023

wt-better Jan 15, 2024

ptyin Nov 29, 2023

wt-better Jan 15, 2024

ptyin Nov 29, 2023

ptyin Nov 29, 2023

ptyin Nov 29, 2023

wt-better Jan 15, 2024

ptyin Nov 29, 2023

feature: saga remove spring #6017

feature: saga remove spring #6017

Conversation

wt-better commented Nov 11, 2023 • edited Loading

Ⅰ. Describe what this PR did

Choose a reason for hiding this comment

codecov bot commented Nov 14, 2023

Codecov Report

ptyin left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wt-better commented Nov 11, 2023 •

edited

Loading