diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index 9803bcd060b..bc99f91a0aa 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -36,7 +36,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6385](https://github.com/apache/incubator-seata/pull/6385)] fix the bug where Role.participant does not execute hooks but clears them. - [[#6465](https://github.com/apache/incubator-seata/pull/6465)] fix(6257): fix saga mode replay context lost start in 2.x - [[#6469](https://github.com/apache/incubator-seata/pull/6469)] fix Error in insert sql of [lock_table] data table to sqlserver database -- [[#6492](https://github.com/apache/incubator-seata/pull/6492)] fix XA did not rollback but close when executing a long-running SQL(or deadlock SQL) +- [[#6496](https://github.com/apache/incubator-seata/pull/6496)] fix XA did not rollback but close when executing a long-running SQL(or deadlock SQL) - [[#6493](https://github.com/apache/incubator-seata/pull/6493)] fix SQLServer-related SQL error in seata server when using database of SQLServer - [[#6497](https://github.com/apache/incubator-seata/pull/6497)] fix tcc properties class when autoconfigure @@ -127,6 +127,8 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6405](https://github.com/apache/incubator-seata/pull/6405)] fix kotlin compile failure - [[#6412](https://github.com/apache/incubator-seata/pull/6412)] optimize core compatible module - [[#6429](https://github.com/apache/incubator-seata/pull/6429)] remove repetitive words +- [[#6458](https://github.com/apache/incubator-seata/pull/6458)] add null value check for MAC address +- [[#6516](https://github.com/apache/incubator-seata/pull/6516)] optimize code format ### security: - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] Upgrade Guava dependencies to fix security vulnerabilities @@ -190,5 +192,7 @@ Thanks to these contributors for their code commits. Please report an unintended - [tanyaofei](https://github.com/tanyaofei) - [xjlgod](https://github.com/xjlgod) - [TakeActionNow2019](https://github.com/TakeActionNow2019) +- [sunxunle](https://github.com/sunxunle) +- [bageyang](https://github.com/bageyang) Also, we receive many valuable issues, questions and advices from our community. Thanks for you all. diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index be31a7043dd..f3e54c5f897 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -36,7 +36,7 @@ - [[#6385](https://github.com/apache/incubator-seata/pull/6385)] 修复Role.Participant不执行hook但会清理的问题 - [[#6465](https://github.com/apache/incubator-seata/pull/6465)] 修复2.0下saga模式的context replay丢失start问题 - [[#6469](https://github.com/apache/incubator-seata/pull/6469)] 修复在sqlserver数据库下[lock_table]数据表的插入操作sql中存在的错误 -- [[#6492](https://github.com/apache/incubator-seata/pull/6492)] 修复XA执行长时间SQL(或死锁SQL)没有完成回滚就释放连接 +- [[#6496](https://github.com/apache/incubator-seata/pull/6496)] 修复XA执行长时间SQL(或死锁SQL)没有完成回滚就释放连接 - [[#6493](https://github.com/apache/incubator-seata/pull/6493)] 修复当使用数据库为SQLServer时seata server的SQL报错 - [[#6497](https://github.com/apache/incubator-seata/pull/6497)] 修复自动装配时的seata tcc 配置类 @@ -123,13 +123,11 @@ - [[#6427](https://github.com/apache/incubator-seata/pull/6427)] 支持spi、saga、spring模块的向下兼容 - [[#6442](https://github.com/apache/incubator-seata/pull/6442)] 阐明 if - [[#6487](https://github.com/apache/incubator-seata/pull/6487)] 修复错误包名以及单词 - -### refactor: -- [[#6269](https://github.com/apache/incubator-seata/pull/6269)] 统一Seata异常规范 +- [[#6458](https://github.com/apache/incubator-seata/pull/6458)] 增加MAC地址null值检查 +- [[#6516](https://github.com/apache/incubator-seata/pull/6516)] 优化代码格式 +- [[#6429](https://github.com/apache/incubator-seata/pull/6429)] 移除重复注释 - [[#6405](https://github.com/apache/incubator-seata/pull/6405)] 修复 kotlin 编译失败 - [[#6412](https://github.com/apache/incubator-seata/pull/6412)] 优化 core 兼容模块 -- [[#6429](https://github.com/apache/incubator-seata/pull/6429)] 移除重复注释 - ### security: - [[#6069](https://github.com/apache/incubator-seata/pull/6069)] 升级Guava依赖版本，修复安全漏洞 @@ -156,7 +154,6 @@ - [[#6280](https://github.com/apache/incubator-seata/pull/6280)] 使用diagram-js重构Saga设计器 - [[#6269](https://github.com/apache/incubator-seata/pull/6269)] 统一Seata异常规范 - [[#6420](https://github.com/apache/incubator-seata/pull/6420)] 优化配置缓存 -- [[#6269](https://github.com/apache/incubator-seata/pull/6269)] 统一Seata异常规范 非常感谢以下 contributors 的代码贡献。若有无意遗漏，请报告。 @@ -192,5 +189,7 @@ - [tanyaofei](https://github.com/tanyaofei) - [xjlgod](https://github.com/xjlgod) - [TakeActionNow2019](https://github.com/TakeActionNow2019) +- [sunxunle](https://github.com/sunxunle) +- [bageyang](https://github.com/bageyang) 同时，我们收到了社区反馈的很多有价值的issue和建议，非常感谢大家。 diff --git a/common/src/main/java/org/apache/seata/common/exception/RepeatRegistrationException.java b/common/src/main/java/org/apache/seata/common/exception/RepeatRegistrationException.java index 127d544c9c6..91d601f340a 100644 --- a/common/src/main/java/org/apache/seata/common/exception/RepeatRegistrationException.java +++ b/common/src/main/java/org/apache/seata/common/exception/RepeatRegistrationException.java @@ -48,4 +48,4 @@ public RepeatRegistrationException(String message, Throwable cause) { public RepeatRegistrationException(Throwable cause) { super(cause); } -} \ No newline at end of file +} diff --git a/common/src/test/java/org/apache/seata/common/exception/RepeatRegistrationExceptionTest.java b/common/src/test/java/org/apache/seata/common/exception/RepeatRegistrationExceptionTest.java index 9c56c338041..fefe1e5724f 100644 --- a/common/src/test/java/org/apache/seata/common/exception/RepeatRegistrationExceptionTest.java +++ b/common/src/test/java/org/apache/seata/common/exception/RepeatRegistrationExceptionTest.java @@ -38,4 +38,4 @@ void testRepeatRegistrationException() { }) ); } -} \ No newline at end of file +} diff --git a/common/src/test/java/org/apache/seata/common/exception/ResourceBundleUtilTest.java b/common/src/test/java/org/apache/seata/common/exception/ResourceBundleUtilTest.java index 918ac5f85e4..6ae8ce2de6d 100644 --- a/common/src/test/java/org/apache/seata/common/exception/ResourceBundleUtilTest.java +++ b/common/src/test/java/org/apache/seata/common/exception/ResourceBundleUtilTest.java @@ -130,4 +130,4 @@ public void execute() throws Throwable { Assertions.assertEquals("str val with placeholder ERR NEST TEST", parseValue); Assertions.assertEquals(0, placeholderSet.size()); } -} \ No newline at end of file +} diff --git a/common/src/test/java/org/apache/seata/common/exception/SkipCallbackWrapperExceptionTest.java b/common/src/test/java/org/apache/seata/common/exception/SkipCallbackWrapperExceptionTest.java index f51a0bce8bc..ea258918124 100644 --- a/common/src/test/java/org/apache/seata/common/exception/SkipCallbackWrapperExceptionTest.java +++ b/common/src/test/java/org/apache/seata/common/exception/SkipCallbackWrapperExceptionTest.java @@ -37,4 +37,4 @@ void testFillInStackTrace() { assertNull(skipCallbackWrapperException.fillInStackTrace()); } -} \ No newline at end of file +} diff --git a/common/src/test/java/org/apache/seata/common/util/LambdaUtilsTest.java b/common/src/test/java/org/apache/seata/common/util/LambdaUtilsTest.java index ccb7979be43..5a24a36dd24 100644 --- a/common/src/test/java/org/apache/seata/common/util/LambdaUtilsTest.java +++ b/common/src/test/java/org/apache/seata/common/util/LambdaUtilsTest.java @@ -33,4 +33,4 @@ void shouldReturnTrueForDistinctKeys() { boolean result = distinctByKey.test(new Object()); assertTrue(result); } -} \ No newline at end of file +} diff --git a/compatible/src/main/java/io/seata/common/LockStrategyMode.java b/compatible/src/main/java/io/seata/common/LockStrategyMode.java index 530c95ddeda..52e7cf94280 100644 --- a/compatible/src/main/java/io/seata/common/LockStrategyMode.java +++ b/compatible/src/main/java/io/seata/common/LockStrategyMode.java @@ -16,6 +16,7 @@ */ package io.seata.common; +@Deprecated public enum LockStrategyMode { /** * Optimistic lock mode is recommended when resources are not reused in the current global transaction. diff --git a/compatible/src/main/java/io/seata/common/util/StringUtils.java b/compatible/src/main/java/io/seata/common/util/StringUtils.java index 7cbba83a7a6..e096af4dfc5 100644 --- a/compatible/src/main/java/io/seata/common/util/StringUtils.java +++ b/compatible/src/main/java/io/seata/common/util/StringUtils.java @@ -28,6 +28,7 @@ * https://github.com/apache/dubbo-spi-extensions/blob/master/dubbo-filter-extensions/dubbo-filter-seata/src/main * /java/org/apache/dubbo/seata/SeataTransactionPropagationProviderFilter.java */ +@Deprecated public class StringUtils { /** * Is empty boolean. diff --git a/compatible/src/main/java/io/seata/core/auth/AuthSigner.java b/compatible/src/main/java/io/seata/core/auth/AuthSigner.java index 58ee5dbf930..b647cb664bc 100644 --- a/compatible/src/main/java/io/seata/core/auth/AuthSigner.java +++ b/compatible/src/main/java/io/seata/core/auth/AuthSigner.java @@ -20,6 +20,7 @@ * The type AuthSigner * Notes: used for io.seata SPI interface */ +@Deprecated public interface AuthSigner extends org.apache.seata.core.auth.AuthSigner { } diff --git a/compatible/src/main/java/io/seata/core/compressor/Compressor.java b/compatible/src/main/java/io/seata/core/compressor/Compressor.java index 74dba051135..8e6a0475b57 100644 --- a/compatible/src/main/java/io/seata/core/compressor/Compressor.java +++ b/compatible/src/main/java/io/seata/core/compressor/Compressor.java @@ -20,6 +20,7 @@ * The type Compressor * Notes: used for io.seata SPI interface */ +@Deprecated public interface Compressor extends org.apache.seata.core.compressor.Compressor { } diff --git a/compatible/src/main/java/io/seata/core/constants/DubboConstants.java b/compatible/src/main/java/io/seata/core/constants/DubboConstants.java index f0d728fd724..bb5c81acd68 100644 --- a/compatible/src/main/java/io/seata/core/constants/DubboConstants.java +++ b/compatible/src/main/java/io/seata/core/constants/DubboConstants.java @@ -20,5 +20,6 @@ /** * Compatible for dubbo dubbo-filter-seata */ +@Deprecated public class DubboConstants extends org.apache.seata.core.constants.DubboConstants { } diff --git a/compatible/src/main/java/io/seata/core/context/ContextCore.java b/compatible/src/main/java/io/seata/core/context/ContextCore.java index 2d2c99fa071..60e4cce910e 100644 --- a/compatible/src/main/java/io/seata/core/context/ContextCore.java +++ b/compatible/src/main/java/io/seata/core/context/ContextCore.java @@ -21,5 +21,6 @@ * The interface Context core. * Notes: used for io.seata SPI interface */ +@Deprecated public interface ContextCore extends org.apache.seata.core.context.ContextCore { } diff --git a/compatible/src/main/java/io/seata/core/context/RootContext.java b/compatible/src/main/java/io/seata/core/context/RootContext.java index 72a33daad37..707af622ef9 100644 --- a/compatible/src/main/java/io/seata/core/context/RootContext.java +++ b/compatible/src/main/java/io/seata/core/context/RootContext.java @@ -26,6 +26,7 @@ /** * The type Root context. */ +@Deprecated public class RootContext { /** diff --git a/compatible/src/main/java/io/seata/core/exception/TransactionException.java b/compatible/src/main/java/io/seata/core/exception/TransactionException.java index 5616d0b103c..6d86bc12ebf 100644 --- a/compatible/src/main/java/io/seata/core/exception/TransactionException.java +++ b/compatible/src/main/java/io/seata/core/exception/TransactionException.java @@ -19,6 +19,7 @@ /** * The type Transaction exception. */ +@Deprecated public class TransactionException extends org.apache.seata.core.exception.TransactionException { public TransactionException(TransactionExceptionCode code) { diff --git a/compatible/src/main/java/io/seata/core/exception/TransactionExceptionCode.java b/compatible/src/main/java/io/seata/core/exception/TransactionExceptionCode.java index 9b17e854f7c..21c91fcd8ac 100644 --- a/compatible/src/main/java/io/seata/core/exception/TransactionExceptionCode.java +++ b/compatible/src/main/java/io/seata/core/exception/TransactionExceptionCode.java @@ -20,6 +20,7 @@ * The enum Transaction exception code. * */ +@Deprecated public enum TransactionExceptionCode { /** diff --git a/compatible/src/main/java/io/seata/core/model/BranchType.java b/compatible/src/main/java/io/seata/core/model/BranchType.java index 4f8992b46cd..ef32e3f7866 100644 --- a/compatible/src/main/java/io/seata/core/model/BranchType.java +++ b/compatible/src/main/java/io/seata/core/model/BranchType.java @@ -21,6 +21,7 @@ * Compatible for dubbo dubbo-filter-seata * */ +@Deprecated public enum BranchType { /** diff --git a/compatible/src/main/java/io/seata/core/model/GlobalStatus.java b/compatible/src/main/java/io/seata/core/model/GlobalStatus.java index d429015a164..4fc0a7aa3d9 100644 --- a/compatible/src/main/java/io/seata/core/model/GlobalStatus.java +++ b/compatible/src/main/java/io/seata/core/model/GlobalStatus.java @@ -20,6 +20,7 @@ * Status of global transaction. * */ +@Deprecated public enum GlobalStatus { /** diff --git a/compatible/src/main/java/io/seata/core/model/ResourceManager.java b/compatible/src/main/java/io/seata/core/model/ResourceManager.java index 7ae82e49cca..d54f1685b74 100644 --- a/compatible/src/main/java/io/seata/core/model/ResourceManager.java +++ b/compatible/src/main/java/io/seata/core/model/ResourceManager.java @@ -22,5 +22,6 @@ /** * @see EnhancedServiceLoader.InnerEnhancedServiceLoader#findAllExtensionDefinition(ClassLoader) */ +@Deprecated public interface ResourceManager extends org.apache.seata.core.model.ResourceManager { } diff --git a/compatible/src/main/java/io/seata/core/rpc/netty/RmNettyRemotingClient.java b/compatible/src/main/java/io/seata/core/rpc/netty/RmNettyRemotingClient.java index 4e06c840e40..6b23a6c2fab 100644 --- a/compatible/src/main/java/io/seata/core/rpc/netty/RmNettyRemotingClient.java +++ b/compatible/src/main/java/io/seata/core/rpc/netty/RmNettyRemotingClient.java @@ -21,6 +21,7 @@ * RmNettyRemotingClient * Notes: used for Apache ShardingSphere integration */ +@Deprecated public class RmNettyRemotingClient { private static final org.apache.seata.core.rpc.netty.RmNettyRemotingClient INSTANCE = org.apache.seata.core.rpc.netty.RmNettyRemotingClient.getInstance(); diff --git a/compatible/src/main/java/io/seata/core/rpc/netty/TmNettyRemotingClient.java b/compatible/src/main/java/io/seata/core/rpc/netty/TmNettyRemotingClient.java index ed893a18b53..b66d18f5e3b 100644 --- a/compatible/src/main/java/io/seata/core/rpc/netty/TmNettyRemotingClient.java +++ b/compatible/src/main/java/io/seata/core/rpc/netty/TmNettyRemotingClient.java @@ -20,6 +20,7 @@ * TmNettyRemotingClient * Notes: used for Apache ShardingSphere integration */ +@Deprecated public class TmNettyRemotingClient { private static final org.apache.seata.core.rpc.netty.TmNettyRemotingClient INSTANCE = org.apache.seata.core.rpc.netty.TmNettyRemotingClient.getInstance(); diff --git a/compatible/src/main/java/io/seata/core/serializer/Serializer.java b/compatible/src/main/java/io/seata/core/serializer/Serializer.java index c9375b5adff..2c20b2f433b 100644 --- a/compatible/src/main/java/io/seata/core/serializer/Serializer.java +++ b/compatible/src/main/java/io/seata/core/serializer/Serializer.java @@ -20,5 +20,6 @@ * The interface Codec. * Notes: used for io.seata SPI interface */ +@Deprecated public interface Serializer extends org.apache.seata.core.serializer.Serializer { } diff --git a/compatible/src/main/java/io/seata/core/store/db/sql/lock/LockStoreSql.java b/compatible/src/main/java/io/seata/core/store/db/sql/lock/LockStoreSql.java index df10c9ce252..8e981ddcdc6 100644 --- a/compatible/src/main/java/io/seata/core/store/db/sql/lock/LockStoreSql.java +++ b/compatible/src/main/java/io/seata/core/store/db/sql/lock/LockStoreSql.java @@ -22,6 +22,7 @@ * @since 1.2.0 * Notes: used for io.seata SPI interface */ +@Deprecated public interface LockStoreSql extends org.apache.seata.core.store.db.sql.lock.LockStoreSql { } diff --git a/compatible/src/main/java/io/seata/core/store/db/sql/log/LogStoreSqls.java b/compatible/src/main/java/io/seata/core/store/db/sql/log/LogStoreSqls.java index f8758689480..bbf2d25f7d4 100644 --- a/compatible/src/main/java/io/seata/core/store/db/sql/log/LogStoreSqls.java +++ b/compatible/src/main/java/io/seata/core/store/db/sql/log/LogStoreSqls.java @@ -20,5 +20,6 @@ * The interface Log store sqls. * Notes: used for io.seata SPI interface */ +@Deprecated public interface LogStoreSqls extends org.apache.seata.core.store.db.sql.log.LogStoreSqls { } diff --git a/compatible/src/main/java/io/seata/discovery/loadbalance/LoadBalance.java b/compatible/src/main/java/io/seata/discovery/loadbalance/LoadBalance.java index ccee8727711..75ec268bb4f 100644 --- a/compatible/src/main/java/io/seata/discovery/loadbalance/LoadBalance.java +++ b/compatible/src/main/java/io/seata/discovery/loadbalance/LoadBalance.java @@ -21,5 +21,6 @@ * The interface Load balance. * Notes: used for io.seata SPI interface */ +@Deprecated public interface LoadBalance extends org.apache.seata.discovery.loadbalance.LoadBalance { } diff --git a/compatible/src/main/java/io/seata/discovery/registry/RegistryProvider.java b/compatible/src/main/java/io/seata/discovery/registry/RegistryProvider.java index 63f50ac5faf..275d061155a 100644 --- a/compatible/src/main/java/io/seata/discovery/registry/RegistryProvider.java +++ b/compatible/src/main/java/io/seata/discovery/registry/RegistryProvider.java @@ -20,6 +20,7 @@ * the interface registry provider * Notes: used for io.seata SPI interface */ +@Deprecated public interface RegistryProvider extends org.apache.seata.discovery.registry.RegistryProvider{ /** * provide a registry implementation instance diff --git a/compatible/src/main/java/io/seata/discovery/registry/RegistryService.java b/compatible/src/main/java/io/seata/discovery/registry/RegistryService.java index c5142e2352f..1c61c12b6c2 100644 --- a/compatible/src/main/java/io/seata/discovery/registry/RegistryService.java +++ b/compatible/src/main/java/io/seata/discovery/registry/RegistryService.java @@ -16,5 +16,10 @@ */ package io.seata.discovery.registry; - +/** + * The interface Registry service. + * + * @param the type parameter + */ +@Deprecated public interface RegistryService extends org.apache.seata.discovery.registry.RegistryService{} diff --git a/compatible/src/main/java/io/seata/integration/grpc/interceptor/client/ClientTransactionInterceptor.java b/compatible/src/main/java/io/seata/integration/grpc/interceptor/client/ClientTransactionInterceptor.java index 8699b72796b..92241d7676f 100644 --- a/compatible/src/main/java/io/seata/integration/grpc/interceptor/client/ClientTransactionInterceptor.java +++ b/compatible/src/main/java/io/seata/integration/grpc/interceptor/client/ClientTransactionInterceptor.java @@ -16,6 +16,10 @@ */ package io.seata.integration.grpc.interceptor.client; +/** + * The type Client transaction interceptor. + */ +@Deprecated public class ClientTransactionInterceptor extends org.apache.seata.integration.grpc.interceptor.client.ClientTransactionInterceptor { diff --git a/compatible/src/main/java/io/seata/integration/grpc/interceptor/server/ServerTransactionInterceptor.java b/compatible/src/main/java/io/seata/integration/grpc/interceptor/server/ServerTransactionInterceptor.java index 21644d08969..659d127f1cf 100644 --- a/compatible/src/main/java/io/seata/integration/grpc/interceptor/server/ServerTransactionInterceptor.java +++ b/compatible/src/main/java/io/seata/integration/grpc/interceptor/server/ServerTransactionInterceptor.java @@ -16,4 +16,8 @@ */ package io.seata.integration.grpc.interceptor.server; +/** + * The type Server transaction interceptor. + */ +@Deprecated public class ServerTransactionInterceptor extends org.apache.seata.integration.grpc.interceptor.server.ServerTransactionInterceptor{} diff --git a/compatible/src/main/java/io/seata/integration/http/DefaultHttpExecutor.java b/compatible/src/main/java/io/seata/integration/http/DefaultHttpExecutor.java index c3fd8d7d587..3a55b4f9942 100644 --- a/compatible/src/main/java/io/seata/integration/http/DefaultHttpExecutor.java +++ b/compatible/src/main/java/io/seata/integration/http/DefaultHttpExecutor.java @@ -22,6 +22,10 @@ import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; +/** + * The type Default http executor. + */ +@Deprecated public class DefaultHttpExecutor { private static final org.apache.seata.integration.http.DefaultHttpExecutor INSTANCE @@ -33,30 +37,80 @@ private DefaultHttpExecutor(final org.apache.seata.integration.http.DefaultHttpE this.targetDefaultHttpExecutor = innerInstance; } + /** + * Gets instance. + * + * @return the instance + */ public static DefaultHttpExecutor getInstance() { return new DefaultHttpExecutor(INSTANCE); } + /** + * Build client entity. + * + * @param the type parameter + * @param httpClient the http client + * @param paramObject the param object + */ public void buildClientEntity(CloseableHttpClient httpClient, T paramObject) { this.targetDefaultHttpExecutor.buildClientEntity(httpClient, paramObject); } + /** + * Build get headers. + * + * @param the type parameter + * @param headers the headers + * @param paramObject the param object + */ public void buildGetHeaders(Map headers, T paramObject) { this.targetDefaultHttpExecutor.buildGetHeaders(headers, paramObject); } + /** + * Init get url string. + * + * @param host the host + * @param path the path + * @param querys the querys + * @return the string + */ public String initGetUrl(String host, String path, Map querys) { return this.targetDefaultHttpExecutor.initGetUrl(host, path, querys); } + /** + * Build post headers. + * + * @param the type parameter + * @param headers the headers + * @param t the t + */ public void buildPostHeaders(Map headers, T t) { this.targetDefaultHttpExecutor.buildPostHeaders(headers, t); } + /** + * Build entity string entity. + * + * @param the type parameter + * @param entity the entity + * @param t the t + * @return the string entity + */ public StringEntity buildEntity(StringEntity entity, T t) { return this.targetDefaultHttpExecutor.buildEntity(entity, t); } + /** + * Convert result k. + * + * @param the type parameter + * @param response the response + * @param clazz the clazz + * @return the k + */ public K convertResult(HttpResponse response, Class clazz) { return this.targetDefaultHttpExecutor.convertResult(response, clazz); } diff --git a/compatible/src/main/java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java b/compatible/src/main/java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java index 888819cc63c..c07f06028b1 100644 --- a/compatible/src/main/java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java +++ b/compatible/src/main/java/io/seata/integration/http/JakartaSeataWebMvcConfigurer.java @@ -16,4 +16,8 @@ */ package io.seata.integration.http; -public class JakartaSeataWebMvcConfigurer extends org.apache.seata.integration.http.JakartaSeataWebMvcConfigurer{} \ No newline at end of file +/** + * The type Jakarta seata web mvc configurer. + */ +@Deprecated +public class JakartaSeataWebMvcConfigurer extends org.apache.seata.integration.http.JakartaSeataWebMvcConfigurer{} diff --git a/compatible/src/main/java/io/seata/integration/http/JakartaTransactionPropagationInterceptor.java b/compatible/src/main/java/io/seata/integration/http/JakartaTransactionPropagationInterceptor.java index 468f4dd539c..ebe4fa590b4 100644 --- a/compatible/src/main/java/io/seata/integration/http/JakartaTransactionPropagationInterceptor.java +++ b/compatible/src/main/java/io/seata/integration/http/JakartaTransactionPropagationInterceptor.java @@ -16,4 +16,8 @@ */ package io.seata.integration.http; +/** + * The type Jakarta transaction propagation interceptor. + */ +@Deprecated public class JakartaTransactionPropagationInterceptor extends org.apache.seata.integration.http.JakartaTransactionPropagationInterceptor{} diff --git a/compatible/src/main/java/io/seata/integration/http/SeataWebMvcConfigurer.java b/compatible/src/main/java/io/seata/integration/http/SeataWebMvcConfigurer.java index 160f1873fe6..f2aa00b03c1 100644 --- a/compatible/src/main/java/io/seata/integration/http/SeataWebMvcConfigurer.java +++ b/compatible/src/main/java/io/seata/integration/http/SeataWebMvcConfigurer.java @@ -16,4 +16,8 @@ */ package io.seata.integration.http; +/** + * The type Seata web mvc configurer. + */ +@Deprecated public class SeataWebMvcConfigurer extends org.apache.seata.integration.http.SeataWebMvcConfigurer {} diff --git a/compatible/src/main/java/io/seata/integration/http/TransactionPropagationInterceptor.java b/compatible/src/main/java/io/seata/integration/http/TransactionPropagationInterceptor.java index 7fd5f6e84a0..19cbca5a52d 100644 --- a/compatible/src/main/java/io/seata/integration/http/TransactionPropagationInterceptor.java +++ b/compatible/src/main/java/io/seata/integration/http/TransactionPropagationInterceptor.java @@ -16,6 +16,10 @@ */ package io.seata.integration.http; +/** + * The type Transaction propagation interceptor. + */ +@Deprecated public class TransactionPropagationInterceptor extends org.apache.seata.integration.http.TransactionPropagationInterceptor { diff --git a/compatible/src/main/java/io/seata/integration/tx/api/interceptor/ActionContextUtil.java b/compatible/src/main/java/io/seata/integration/tx/api/interceptor/ActionContextUtil.java index 3fefc5e6859..14da1912564 100644 --- a/compatible/src/main/java/io/seata/integration/tx/api/interceptor/ActionContextUtil.java +++ b/compatible/src/main/java/io/seata/integration/tx/api/interceptor/ActionContextUtil.java @@ -16,6 +16,12 @@ */ package io.seata.integration.tx.api.interceptor; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; + import io.seata.rm.tcc.api.BusinessActionContext; import io.seata.rm.tcc.api.BusinessActionContextParameter; import org.apache.seata.common.util.CollectionUtils; @@ -24,11 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import java.util.List; -import java.util.Map; - /** * Extracting TCC Context from Method */ diff --git a/compatible/src/main/java/io/seata/integration/tx/api/interceptor/ActionInterceptorHandler.java b/compatible/src/main/java/io/seata/integration/tx/api/interceptor/ActionInterceptorHandler.java index 2a765ad9436..cb6cb6aa583 100644 --- a/compatible/src/main/java/io/seata/integration/tx/api/interceptor/ActionInterceptorHandler.java +++ b/compatible/src/main/java/io/seata/integration/tx/api/interceptor/ActionInterceptorHandler.java @@ -16,15 +16,15 @@ */ package io.seata.integration.tx.api.interceptor; -import io.seata.rm.tcc.api.BusinessActionContext; -import io.seata.rm.tcc.api.BusinessActionContextParameter; -import org.apache.seata.rm.tcc.api.ParamType; - import java.lang.annotation.Annotation; import java.lang.reflect.Method; import java.util.HashMap; import java.util.Map; +import io.seata.rm.tcc.api.BusinessActionContext; +import io.seata.rm.tcc.api.BusinessActionContextParameter; +import org.apache.seata.rm.tcc.api.ParamType; + /** * Handler the Tx Participant Aspect : Setting Context, Creating Branch Record */ diff --git a/compatible/src/main/java/io/seata/integration/tx/api/interceptor/handler/GlobalTransactionalInterceptorHandler.java b/compatible/src/main/java/io/seata/integration/tx/api/interceptor/handler/GlobalTransactionalInterceptorHandler.java index 7dd3a32f810..bdb1082c7d7 100644 --- a/compatible/src/main/java/io/seata/integration/tx/api/interceptor/handler/GlobalTransactionalInterceptorHandler.java +++ b/compatible/src/main/java/io/seata/integration/tx/api/interceptor/handler/GlobalTransactionalInterceptorHandler.java @@ -16,6 +16,10 @@ */ package io.seata.integration.tx.api.interceptor.handler; +import java.lang.reflect.Method; +import java.util.Objects; +import java.util.Set; + import io.seata.spring.annotation.GlobalLock; import io.seata.spring.annotation.GlobalTransactional; import org.apache.seata.common.LockStrategyMode; @@ -23,10 +27,6 @@ import org.apache.seata.integration.tx.api.annotation.AspectTransactional; import org.apache.seata.tm.api.transaction.Propagation; -import java.lang.reflect.Method; -import java.util.Objects; -import java.util.Set; - /** * The type Global transactional interceptor handler. */ @@ -92,4 +92,4 @@ private LockStrategyMode lockStrategyMode2ApacheSeataLockStrategyMode(io.seata.c return LockStrategyMode.PESSIMISTIC; } -} \ No newline at end of file +} diff --git a/compatible/src/main/java/io/seata/integration/tx/api/interceptor/parser/GlobalTransactionalInterceptorParser.java b/compatible/src/main/java/io/seata/integration/tx/api/interceptor/parser/GlobalTransactionalInterceptorParser.java index 974fd66eb43..964ccc8e700 100644 --- a/compatible/src/main/java/io/seata/integration/tx/api/interceptor/parser/GlobalTransactionalInterceptorParser.java +++ b/compatible/src/main/java/io/seata/integration/tx/api/interceptor/parser/GlobalTransactionalInterceptorParser.java @@ -16,6 +16,8 @@ */ package io.seata.integration.tx.api.interceptor.parser; +import java.lang.reflect.Method; + import io.seata.integration.tx.api.interceptor.handler.GlobalTransactionalInterceptorHandler; import io.seata.spring.annotation.GlobalLock; import io.seata.spring.annotation.GlobalTransactional; @@ -23,8 +25,9 @@ import org.apache.seata.integration.tx.api.interceptor.handler.ProxyInvocationHandler; import org.apache.seata.tm.api.FailureHandlerHolder; -import java.lang.reflect.Method; - +/** + * The type Global transactional interceptor parser. + */ @Deprecated public class GlobalTransactionalInterceptorParser extends org.apache.seata.integration.tx.api.interceptor.parser.GlobalTransactionalInterceptorParser { diff --git a/compatible/src/main/java/io/seata/integration/tx/api/json/JsonParser.java b/compatible/src/main/java/io/seata/integration/tx/api/json/JsonParser.java index 5a4395bbef0..f1b9e866aea 100644 --- a/compatible/src/main/java/io/seata/integration/tx/api/json/JsonParser.java +++ b/compatible/src/main/java/io/seata/integration/tx/api/json/JsonParser.java @@ -16,6 +16,9 @@ */ package io.seata.integration.tx.api.json; +/** + * The interface Json parser. + */ @Deprecated public interface JsonParser extends org.apache.seata.integration.tx.api.json.JsonParser { } diff --git a/compatible/src/main/java/io/seata/rm/RMClient.java b/compatible/src/main/java/io/seata/rm/RMClient.java index c5b2df00671..e9c480618bf 100644 --- a/compatible/src/main/java/io/seata/rm/RMClient.java +++ b/compatible/src/main/java/io/seata/rm/RMClient.java @@ -20,6 +20,7 @@ * The Rm client Initiator. * */ +@Deprecated public class RMClient extends org.apache.seata.rm.RMClient { } diff --git a/compatible/src/main/java/io/seata/rm/datasource/DataSourceProxy.java b/compatible/src/main/java/io/seata/rm/datasource/DataSourceProxy.java index 06280e71aaa..fdcc05f9d59 100644 --- a/compatible/src/main/java/io/seata/rm/datasource/DataSourceProxy.java +++ b/compatible/src/main/java/io/seata/rm/datasource/DataSourceProxy.java @@ -21,7 +21,9 @@ import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; import java.util.logging.Logger; + import javax.sql.DataSource; + import org.apache.seata.core.model.BranchType; import org.apache.seata.rm.datasource.SeataDataSourceProxy; diff --git a/compatible/src/main/java/io/seata/rm/datasource/exec/InsertExecutor.java b/compatible/src/main/java/io/seata/rm/datasource/exec/InsertExecutor.java index cd92c299fc9..385c81c36d3 100644 --- a/compatible/src/main/java/io/seata/rm/datasource/exec/InsertExecutor.java +++ b/compatible/src/main/java/io/seata/rm/datasource/exec/InsertExecutor.java @@ -22,6 +22,7 @@ * * @param the type parameter */ +@Deprecated public interface InsertExecutor extends org.apache.seata.rm.datasource.exec.InsertExecutor { } diff --git a/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/JacksonSerializer.java b/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/JacksonSerializer.java index 1922e6e0b23..b8e896222f2 100644 --- a/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/JacksonSerializer.java +++ b/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/JacksonSerializer.java @@ -22,6 +22,7 @@ * * @param the type parameter */ +@Deprecated public interface JacksonSerializer extends org.apache.seata.rm.datasource.undo.parser.spi.JacksonSerializer { } diff --git a/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/KryoTypeSerializer.java b/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/KryoTypeSerializer.java index 6f80a30edc5..f1b353bbcb0 100644 --- a/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/KryoTypeSerializer.java +++ b/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/KryoTypeSerializer.java @@ -22,6 +22,7 @@ * * @param the type parameter */ +@Deprecated public interface KryoTypeSerializer extends org.apache.seata.rm.datasource.undo.parser.spi.KryoTypeSerializer { } diff --git a/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/ProtostuffDelegate.java b/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/ProtostuffDelegate.java index 8ef05155cc0..bd84dba62ff 100644 --- a/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/ProtostuffDelegate.java +++ b/compatible/src/main/java/io/seata/rm/datasource/undo/parser/spi/ProtostuffDelegate.java @@ -22,5 +22,6 @@ * * @param the type parameter */ +@Deprecated public interface ProtostuffDelegate extends org.apache.seata.rm.datasource.undo.parser.spi.ProtostuffDelegate { } diff --git a/compatible/src/main/java/io/seata/rm/datasource/xa/DataSourceProxyXA.java b/compatible/src/main/java/io/seata/rm/datasource/xa/DataSourceProxyXA.java index 182ea547ca1..dedce394a0d 100644 --- a/compatible/src/main/java/io/seata/rm/datasource/xa/DataSourceProxyXA.java +++ b/compatible/src/main/java/io/seata/rm/datasource/xa/DataSourceProxyXA.java @@ -21,7 +21,9 @@ import java.sql.SQLException; import java.sql.SQLFeatureNotSupportedException; import java.util.logging.Logger; + import javax.sql.DataSource; + import org.apache.seata.core.model.BranchType; import org.apache.seata.rm.datasource.SeataDataSourceProxy; diff --git a/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContext.java b/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContext.java index d3ad5cd05be..80c9f037dbb 100644 --- a/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContext.java +++ b/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContext.java @@ -16,5 +16,9 @@ */ package io.seata.rm.tcc.api; +/** + * The type Business action context. + */ +@Deprecated public class BusinessActionContext extends org.apache.seata.rm.tcc.api.BusinessActionContext { } diff --git a/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java b/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java index ad4ef05c2f5..1d2806ca6d9 100644 --- a/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java +++ b/compatible/src/main/java/io/seata/rm/tcc/api/BusinessActionContextParameter.java @@ -21,6 +21,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +@Deprecated @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.PARAMETER, ElementType.FIELD}) public @interface BusinessActionContextParameter { diff --git a/compatible/src/main/java/io/seata/rm/tcc/api/LocalTCC.java b/compatible/src/main/java/io/seata/rm/tcc/api/LocalTCC.java index a28f6bea2c2..4d0a3e90f01 100644 --- a/compatible/src/main/java/io/seata/rm/tcc/api/LocalTCC.java +++ b/compatible/src/main/java/io/seata/rm/tcc/api/LocalTCC.java @@ -22,7 +22,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - +@Deprecated @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) @Inherited diff --git a/compatible/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java b/compatible/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java index 1d1e86377a6..4811f8d6509 100644 --- a/compatible/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java +++ b/compatible/src/main/java/io/seata/rm/tcc/api/TwoPhaseBusinessAction.java @@ -22,7 +22,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; - +@Deprecated @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD}) @Inherited diff --git a/compatible/src/main/java/io/seata/rm/tcc/interceptor/TccActionInterceptorHandler.java b/compatible/src/main/java/io/seata/rm/tcc/interceptor/TccActionInterceptorHandler.java index 5b570e5b634..70a6c584a44 100644 --- a/compatible/src/main/java/io/seata/rm/tcc/interceptor/TccActionInterceptorHandler.java +++ b/compatible/src/main/java/io/seata/rm/tcc/interceptor/TccActionInterceptorHandler.java @@ -26,8 +26,18 @@ import org.apache.seata.common.Constants; import org.apache.seata.integration.tx.api.interceptor.TwoPhaseBusinessActionParam; +/** + * The type Tcc action interceptor handler. + */ +@Deprecated public class TccActionInterceptorHandler extends org.apache.seata.rm.tcc.interceptor.TccActionInterceptorHandler { + /** + * Instantiates a new Tcc action interceptor handler. + * + * @param targetBean the target bean + * @param methodsToProxy the methods to proxy + */ public TccActionInterceptorHandler(Object targetBean, Set methodsToProxy) { super(targetBean, methodsToProxy); actionInterceptorHandler = new ActionInterceptorHandler(); diff --git a/compatible/src/main/java/io/seata/rm/tcc/interceptor/parser/TccActionInterceptorParser.java b/compatible/src/main/java/io/seata/rm/tcc/interceptor/parser/TccActionInterceptorParser.java index dc6b68b28ed..3d929757e83 100644 --- a/compatible/src/main/java/io/seata/rm/tcc/interceptor/parser/TccActionInterceptorParser.java +++ b/compatible/src/main/java/io/seata/rm/tcc/interceptor/parser/TccActionInterceptorParser.java @@ -16,18 +16,22 @@ */ package io.seata.rm.tcc.interceptor.parser; -import io.seata.rm.tcc.api.TwoPhaseBusinessAction; -import io.seata.rm.tcc.interceptor.TccActionInterceptorHandler; -import org.apache.seata.common.util.ReflectionUtil; -import org.apache.seata.integration.tx.api.interceptor.handler.ProxyInvocationHandler; -import org.apache.seata.integration.tx.api.interceptor.parser.DefaultResourceRegisterParser; - import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Set; +import io.seata.rm.tcc.api.TwoPhaseBusinessAction; +import io.seata.rm.tcc.interceptor.TccActionInterceptorHandler; +import org.apache.seata.common.util.ReflectionUtil; +import org.apache.seata.integration.tx.api.interceptor.handler.ProxyInvocationHandler; +import org.apache.seata.integration.tx.api.interceptor.parser.DefaultResourceRegisterParser; + +/** + * The type Tcc action interceptor parser. + */ +@Deprecated public class TccActionInterceptorParser extends org.apache.seata.rm.tcc.interceptor.parser.TccActionInterceptorParser { @Override diff --git a/compatible/src/main/java/io/seata/rm/tcc/remoting/parser/LocalTCCRemotingParser.java b/compatible/src/main/java/io/seata/rm/tcc/remoting/parser/LocalTCCRemotingParser.java index 884796e497b..becac61b45b 100644 --- a/compatible/src/main/java/io/seata/rm/tcc/remoting/parser/LocalTCCRemotingParser.java +++ b/compatible/src/main/java/io/seata/rm/tcc/remoting/parser/LocalTCCRemotingParser.java @@ -16,6 +16,8 @@ */ package io.seata.rm.tcc.remoting.parser; +import java.util.Set; + import io.seata.rm.tcc.api.LocalTCC; import org.apache.seata.common.exception.FrameworkException; import org.apache.seata.common.util.ReflectionUtil; @@ -23,8 +25,10 @@ import org.apache.seata.integration.tx.api.remoting.RemotingDesc; import org.springframework.aop.framework.AopProxyUtils; -import java.util.Set; - +/** + * The type Local tcc remoting parser. + */ +@Deprecated public class LocalTCCRemotingParser extends org.apache.seata.rm.tcc.remoting.parser.LocalTCCRemotingParser { @Override diff --git a/compatible/src/main/java/io/seata/rm/tcc/resource/parser/TccRegisterResourceParser.java b/compatible/src/main/java/io/seata/rm/tcc/resource/parser/TccRegisterResourceParser.java index 465d4337aca..53168ff6bc2 100644 --- a/compatible/src/main/java/io/seata/rm/tcc/resource/parser/TccRegisterResourceParser.java +++ b/compatible/src/main/java/io/seata/rm/tcc/resource/parser/TccRegisterResourceParser.java @@ -16,6 +16,10 @@ */ package io.seata.rm.tcc.resource.parser; +import java.lang.annotation.Annotation; +import java.lang.reflect.Method; +import java.util.Set; + import io.seata.integration.tx.api.interceptor.ActionContextUtil; import io.seata.rm.tcc.api.BusinessActionContext; import io.seata.rm.tcc.api.BusinessActionContextParameter; @@ -25,10 +29,10 @@ import org.apache.seata.rm.DefaultResourceManager; import org.apache.seata.rm.tcc.TCCResource; -import java.lang.annotation.Annotation; -import java.lang.reflect.Method; -import java.util.Set; - +/** + * The type Tcc register resource parser. + */ +@Deprecated public class TccRegisterResourceParser extends org.apache.seata.rm.tcc.resource.parser.TccRegisterResourceParser { protected void executeRegisterResource(Object target, Set methods, Class targetServiceClass) throws NoSuchMethodException { diff --git a/compatible/src/main/java/io/seata/saga/engine/AsyncCallback.java b/compatible/src/main/java/io/seata/saga/engine/AsyncCallback.java index 1d1f13137b8..3c4d59d11f1 100644 --- a/compatible/src/main/java/io/seata/saga/engine/AsyncCallback.java +++ b/compatible/src/main/java/io/seata/saga/engine/AsyncCallback.java @@ -23,6 +23,7 @@ * Async Callback * */ +@Deprecated public interface AsyncCallback { /** diff --git a/compatible/src/main/java/io/seata/saga/engine/StateMachineConfig.java b/compatible/src/main/java/io/seata/saga/engine/StateMachineConfig.java index 4fe5df97ab2..747d7785b9c 100644 --- a/compatible/src/main/java/io/seata/saga/engine/StateMachineConfig.java +++ b/compatible/src/main/java/io/seata/saga/engine/StateMachineConfig.java @@ -16,6 +16,10 @@ */ package io.seata.saga.engine; +import java.util.concurrent.ThreadPoolExecutor; + +import javax.script.ScriptEngineManager; + import io.seata.saga.engine.expression.ExpressionFactoryManager; import io.seata.saga.engine.repo.StateLogRepository; import io.seata.saga.engine.repo.StateMachineRepository; @@ -27,13 +31,11 @@ import org.apache.seata.saga.engine.strategy.StatusDecisionStrategy; import org.apache.seata.saga.proctrl.eventing.impl.ProcessCtrlEventPublisher; -import javax.script.ScriptEngineManager; -import java.util.concurrent.ThreadPoolExecutor; - /** * StateMachineConfig * */ +@Deprecated public interface StateMachineConfig { /** diff --git a/compatible/src/main/java/io/seata/saga/engine/StateMachineEngine.java b/compatible/src/main/java/io/seata/saga/engine/StateMachineEngine.java index 9b846d367dd..5cff3fae363 100644 --- a/compatible/src/main/java/io/seata/saga/engine/StateMachineEngine.java +++ b/compatible/src/main/java/io/seata/saga/engine/StateMachineEngine.java @@ -16,16 +16,17 @@ */ package io.seata.saga.engine; +import java.util.Map; + +import io.seata.saga.statelang.domain.StateMachineInstance; import org.apache.seata.saga.engine.exception.EngineExecutionException; import org.apache.seata.saga.engine.exception.ForwardInvalidException; -import io.seata.saga.statelang.domain.StateMachineInstance; - -import java.util.Map; /** * State machine engine * */ +@Deprecated public interface StateMachineEngine { /** diff --git a/compatible/src/main/java/io/seata/saga/engine/config/DbStateMachineConfig.java b/compatible/src/main/java/io/seata/saga/engine/config/DbStateMachineConfig.java index 0238654c568..9c2480733a5 100644 --- a/compatible/src/main/java/io/seata/saga/engine/config/DbStateMachineConfig.java +++ b/compatible/src/main/java/io/seata/saga/engine/config/DbStateMachineConfig.java @@ -16,8 +16,13 @@ */ 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.repo.StateLogRepository; import io.seata.saga.engine.store.impl.StateLogStoreImpl; import org.apache.seata.common.ConfigurationKeys; import org.apache.seata.config.Configuration; @@ -32,17 +37,16 @@ import org.springframework.beans.factory.DisposableBean; import org.springframework.util.StringUtils; -import javax.sql.DataSource; -import java.sql.Connection; -import java.sql.DatabaseMetaData; -import java.sql.SQLException; - import static org.apache.seata.common.DefaultValues.DEFAULT_CLIENT_REPORT_SUCCESS_ENABLE; import static org.apache.seata.common.DefaultValues.DEFAULT_CLIENT_SAGA_BRANCH_REGISTER_ENABLE; import static org.apache.seata.common.DefaultValues.DEFAULT_CLIENT_SAGA_COMPENSATE_PERSIST_MODE_UPDATE; import static org.apache.seata.common.DefaultValues.DEFAULT_CLIENT_SAGA_RETRY_PERSIST_MODE_UPDATE; import static org.apache.seata.common.DefaultValues.DEFAULT_SAGA_JSON_PARSER; +/** + * The type Db state machine config. + */ +@Deprecated public class DbStateMachineConfig extends DefaultStateMachineConfig implements DisposableBean { private static final Logger LOGGER = LoggerFactory.getLogger(DbStateMachineConfig.class); @@ -59,6 +63,9 @@ public class DbStateMachineConfig extends DefaultStateMachineConfig implements D private SagaTransactionalTemplate sagaTransactionalTemplate; + /** + * Instantiates a new Db state machine config. + */ public DbStateMachineConfig() { try { Configuration configuration = ConfigurationFactory.getInstance(); @@ -80,6 +87,13 @@ public DbStateMachineConfig() { } } + /** + * Gets db type from data source. + * + * @param dataSource the data source + * @return the db type from data source + * @throws SQLException the sql exception + */ public static String getDbTypeFromDataSource(DataSource dataSource) throws SQLException { try (Connection con = dataSource.getConnection()) { DatabaseMetaData metaData = con.getMetaData(); @@ -144,78 +158,173 @@ public void destroy() throws Exception { } } + /** + * Gets data source. + * + * @return the data source + */ public DataSource getDataSource() { return dataSource; } + /** + * Sets data source. + * + * @param dataSource the data source + */ public void setDataSource(DataSource dataSource) { this.dataSource = dataSource; } + /** + * Gets application id. + * + * @return the application id + */ public String getApplicationId() { return applicationId; } + /** + * Sets application id. + * + * @param applicationId the application id + */ public void setApplicationId(String applicationId) { this.applicationId = applicationId; } + /** + * Gets tx service group. + * + * @return the tx service group + */ public String getTxServiceGroup() { return txServiceGroup; } + /** + * Sets tx service group. + * + * @param txServiceGroup the tx service group + */ public void setTxServiceGroup(String txServiceGroup) { this.txServiceGroup = txServiceGroup; } + /** + * Gets access key. + * + * @return the access key + */ public String getAccessKey() { return accessKey; } + /** + * Sets access key. + * + * @param accessKey the access key + */ public void setAccessKey(String accessKey) { this.accessKey = accessKey; } + /** + * Gets secret key. + * + * @return the secret key + */ public String getSecretKey() { return secretKey; } + /** + * Sets secret key. + * + * @param secretKey the secret key + */ public void setSecretKey(String secretKey) { this.secretKey = secretKey; } + /** + * Sets saga transactional template. + * + * @param sagaTransactionalTemplate the saga transactional template + */ public void setSagaTransactionalTemplate(SagaTransactionalTemplate sagaTransactionalTemplate) { this.sagaTransactionalTemplate = sagaTransactionalTemplate; } + /** + * Gets table prefix. + * + * @return the table prefix + */ public String getTablePrefix() { return tablePrefix; } + /** + * Sets table prefix. + * + * @param tablePrefix the table prefix + */ public void setTablePrefix(String tablePrefix) { this.tablePrefix = tablePrefix; } + /** + * Gets db type. + * + * @return the db type + */ public String getDbType() { return dbType; } + /** + * Sets db type. + * + * @param dbType the db type + */ public void setDbType(String dbType) { this.dbType = dbType; } + /** + * Is rm report success enable boolean. + * + * @return the boolean + */ public boolean isRmReportSuccessEnable() { return rmReportSuccessEnable; } + /** + * Is saga branch register enable boolean. + * + * @return the boolean + */ public boolean isSagaBranchRegisterEnable() { return sagaBranchRegisterEnable; } + /** + * Sets rm report success enable. + * + * @param rmReportSuccessEnable the rm report success enable + */ public void setRmReportSuccessEnable(boolean rmReportSuccessEnable) { this.rmReportSuccessEnable = rmReportSuccessEnable; } + /** + * Sets saga branch register enable. + * + * @param sagaBranchRegisterEnable the saga branch register enable + */ public void setSagaBranchRegisterEnable(boolean sagaBranchRegisterEnable) { this.sagaBranchRegisterEnable = sagaBranchRegisterEnable; } diff --git a/compatible/src/main/java/io/seata/saga/engine/expression/Expression.java b/compatible/src/main/java/io/seata/saga/engine/expression/Expression.java index a2586ac73a8..3a7e6599763 100644 --- a/compatible/src/main/java/io/seata/saga/engine/expression/Expression.java +++ b/compatible/src/main/java/io/seata/saga/engine/expression/Expression.java @@ -20,6 +20,7 @@ * Expression * */ +@Deprecated public interface Expression extends org.apache.seata.saga.engine.expression.Expression { } diff --git a/compatible/src/main/java/io/seata/saga/engine/expression/ExpressionFactory.java b/compatible/src/main/java/io/seata/saga/engine/expression/ExpressionFactory.java index 56619c43c95..a48494445ad 100644 --- a/compatible/src/main/java/io/seata/saga/engine/expression/ExpressionFactory.java +++ b/compatible/src/main/java/io/seata/saga/engine/expression/ExpressionFactory.java @@ -20,5 +20,6 @@ * Expression Factory * */ +@Deprecated public interface ExpressionFactory extends org.apache.seata.saga.engine.expression.ExpressionFactory { } diff --git a/compatible/src/main/java/io/seata/saga/engine/expression/ExpressionFactoryManager.java b/compatible/src/main/java/io/seata/saga/engine/expression/ExpressionFactoryManager.java index dc40a74ca19..9352c9fdbbd 100644 --- a/compatible/src/main/java/io/seata/saga/engine/expression/ExpressionFactoryManager.java +++ b/compatible/src/main/java/io/seata/saga/engine/expression/ExpressionFactoryManager.java @@ -23,6 +23,7 @@ /** * Expression factory manager */ +@Deprecated public class ExpressionFactoryManager { private final org.apache.seata.saga.engine.expression.ExpressionFactoryManager actual; diff --git a/compatible/src/main/java/io/seata/saga/engine/impl/DefaultStateMachineConfig.java b/compatible/src/main/java/io/seata/saga/engine/impl/DefaultStateMachineConfig.java index d10cf56a16d..6ae50b303d4 100644 --- a/compatible/src/main/java/io/seata/saga/engine/impl/DefaultStateMachineConfig.java +++ b/compatible/src/main/java/io/seata/saga/engine/impl/DefaultStateMachineConfig.java @@ -16,6 +16,14 @@ */ package io.seata.saga.engine.impl; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.stream.Collectors; + +import javax.script.ScriptEngineManager; + import io.seata.saga.engine.StateMachineConfig; import io.seata.saga.engine.expression.ExpressionFactoryManager; import io.seata.saga.engine.repo.StateLogRepository; @@ -38,16 +46,10 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; -import javax.script.ScriptEngineManager; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.stream.Collectors; - /** * Default state machine configuration */ +@Deprecated public class DefaultStateMachineConfig implements StateMachineConfig, ApplicationContextAware, InitializingBean { private final org.apache.seata.saga.engine.impl.DefaultStateMachineConfig actual; diff --git a/compatible/src/main/java/io/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java b/compatible/src/main/java/io/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java index dfb47e981a0..cb4d70d40db 100644 --- a/compatible/src/main/java/io/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java +++ b/compatible/src/main/java/io/seata/saga/engine/impl/ProcessCtrlStateMachineEngine.java @@ -16,21 +16,22 @@ */ package io.seata.saga.engine.impl; +import java.util.Map; + import io.seata.saga.engine.AsyncCallback; import io.seata.saga.engine.StateMachineConfig; import io.seata.saga.engine.StateMachineEngine; +import io.seata.saga.proctrl.ProcessContext; import io.seata.saga.proctrl.impl.ProcessContextImpl; import io.seata.saga.statelang.domain.StateMachineInstance; import io.seata.saga.statelang.domain.impl.StateMachineInstanceImpl; import org.apache.seata.saga.engine.exception.EngineExecutionException; import org.apache.seata.saga.engine.exception.ForwardInvalidException; -import io.seata.saga.proctrl.ProcessContext; - -import java.util.Map; /** * ProcessCtrl-based state machine engine */ +@Deprecated public class ProcessCtrlStateMachineEngine implements StateMachineEngine { private final org.apache.seata.saga.engine.impl.ProcessCtrlStateMachineEngine actual = diff --git a/compatible/src/main/java/io/seata/saga/engine/pcext/StateHandlerInterceptor.java b/compatible/src/main/java/io/seata/saga/engine/pcext/StateHandlerInterceptor.java index 01349086d33..387d2cb2b73 100644 --- a/compatible/src/main/java/io/seata/saga/engine/pcext/StateHandlerInterceptor.java +++ b/compatible/src/main/java/io/seata/saga/engine/pcext/StateHandlerInterceptor.java @@ -20,5 +20,6 @@ * StateHandler Interceptor * */ +@Deprecated public interface StateHandlerInterceptor extends org.apache.seata.saga.engine.pcext.StateHandlerInterceptor { } diff --git a/compatible/src/main/java/io/seata/saga/engine/pcext/StateRouterInterceptor.java b/compatible/src/main/java/io/seata/saga/engine/pcext/StateRouterInterceptor.java index 4cd37eef0e7..c82cb1da9a8 100644 --- a/compatible/src/main/java/io/seata/saga/engine/pcext/StateRouterInterceptor.java +++ b/compatible/src/main/java/io/seata/saga/engine/pcext/StateRouterInterceptor.java @@ -24,5 +24,6 @@ * * @see StateRouter */ +@Deprecated public interface StateRouterInterceptor extends org.apache.seata.saga.engine.pcext.StateRouterInterceptor { } diff --git a/compatible/src/main/java/io/seata/saga/engine/repo/StateLogRepository.java b/compatible/src/main/java/io/seata/saga/engine/repo/StateLogRepository.java index 92e97a5af52..3972c51fa47 100644 --- a/compatible/src/main/java/io/seata/saga/engine/repo/StateLogRepository.java +++ b/compatible/src/main/java/io/seata/saga/engine/repo/StateLogRepository.java @@ -16,15 +16,16 @@ */ package io.seata.saga.engine.repo; +import java.util.List; + import io.seata.saga.statelang.domain.StateInstance; import io.seata.saga.statelang.domain.StateMachineInstance; -import java.util.List; - /** * State Log Repository * */ +@Deprecated public interface StateLogRepository { /** diff --git a/compatible/src/main/java/io/seata/saga/engine/repo/StateMachineRepository.java b/compatible/src/main/java/io/seata/saga/engine/repo/StateMachineRepository.java index 7d83cc369f7..2c9925cfe29 100644 --- a/compatible/src/main/java/io/seata/saga/engine/repo/StateMachineRepository.java +++ b/compatible/src/main/java/io/seata/saga/engine/repo/StateMachineRepository.java @@ -16,15 +16,15 @@ */ package io.seata.saga.engine.repo; - -import io.seata.saga.statelang.domain.StateMachine; - import java.io.IOException; import java.io.InputStream; +import io.seata.saga.statelang.domain.StateMachine; + /** * StateMachineRepository */ +@Deprecated public interface StateMachineRepository { /** diff --git a/compatible/src/main/java/io/seata/saga/engine/store/StateLogStore.java b/compatible/src/main/java/io/seata/saga/engine/store/StateLogStore.java index 0c664e1ef05..fd7847d7f76 100644 --- a/compatible/src/main/java/io/seata/saga/engine/store/StateLogStore.java +++ b/compatible/src/main/java/io/seata/saga/engine/store/StateLogStore.java @@ -16,20 +16,23 @@ */ 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; - +/** + * The interface State log store. + */ +@Deprecated public interface StateLogStore { /** * Record state machine startup events * * @param machineInstance the state machine instance - * @param context the state machine process context + * @param context the state machine process context */ void recordStateMachineStarted(StateMachineInstance machineInstance, ProcessContext context); @@ -37,7 +40,7 @@ public interface StateLogStore { * Record status end event * * @param machineInstance the state machine instance - * @param context the state machine process context + * @param context the state machine process context */ void recordStateMachineFinished(StateMachineInstance machineInstance, ProcessContext context); @@ -45,7 +48,7 @@ public interface StateLogStore { * Record state machine restarted * * @param machineInstance the state machine instance - * @param context the state machine process context + * @param context the state machine process context */ void recordStateMachineRestarted(StateMachineInstance machineInstance, ProcessContext context); @@ -53,7 +56,7 @@ public interface StateLogStore { * Record state start execution event * * @param stateInstance the state machine instance - * @param context the state machine process context + * @param context the state machine process context */ void recordStateStarted(StateInstance stateInstance, ProcessContext context); @@ -61,7 +64,7 @@ public interface StateLogStore { * Record state execution end event * * @param stateInstance the state machine instance - * @param context the state machine process context + * @param context the state machine process context */ void recordStateFinished(StateInstance stateInstance, ProcessContext context); @@ -77,7 +80,7 @@ public interface StateLogStore { * Get state machine instance by businessKey * * @param businessKey the businessKey - * @param tenantId the tenant id + * @param tenantId the tenant id * @return state machine message */ StateMachineInstance getStateMachineInstanceByBusinessKey(String businessKey, String tenantId); @@ -94,7 +97,7 @@ public interface StateLogStore { * Get state instance * * @param stateInstanceId the state instance id - * @param machineInstId the machine instance id + * @param machineInstId the machine instance id * @return state instance message */ StateInstance getStateInstance(String stateInstanceId, String machineInstId); @@ -109,6 +112,8 @@ public interface StateLogStore { /** * clear the LocalThread + * + * @param context the context */ void clearUp(ProcessContext context); } diff --git a/compatible/src/main/java/io/seata/saga/engine/store/impl/StateLogStoreImpl.java b/compatible/src/main/java/io/seata/saga/engine/store/impl/StateLogStoreImpl.java index 54c89c6b1bb..54907e61249 100644 --- a/compatible/src/main/java/io/seata/saga/engine/store/impl/StateLogStoreImpl.java +++ b/compatible/src/main/java/io/seata/saga/engine/store/impl/StateLogStoreImpl.java @@ -16,6 +16,10 @@ */ package io.seata.saga.engine.store.impl; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + import io.seata.saga.engine.store.StateLogStore; import io.seata.saga.proctrl.ProcessContext; import io.seata.saga.proctrl.impl.ProcessContextImpl; @@ -25,10 +29,6 @@ import io.seata.saga.statelang.domain.impl.StateMachineInstanceImpl; import org.apache.seata.common.util.CollectionUtils; -import java.util.ArrayList; -import java.util.List; -import java.util.stream.Collectors; - public class StateLogStoreImpl implements StateLogStore { private final org.apache.seata.saga.engine.store.StateLogStore actual; diff --git a/compatible/src/main/java/io/seata/saga/proctrl/HierarchicalProcessContext.java b/compatible/src/main/java/io/seata/saga/proctrl/HierarchicalProcessContext.java index ab5f82990e4..1642b12f6e6 100644 --- a/compatible/src/main/java/io/seata/saga/proctrl/HierarchicalProcessContext.java +++ b/compatible/src/main/java/io/seata/saga/proctrl/HierarchicalProcessContext.java @@ -22,6 +22,7 @@ * Hierarchical process context * */ +@Deprecated public interface HierarchicalProcessContext extends ProcessContext { /** diff --git a/compatible/src/main/java/io/seata/saga/proctrl/ProcessContext.java b/compatible/src/main/java/io/seata/saga/proctrl/ProcessContext.java index d53f9d549d7..424c0cd7747 100644 --- a/compatible/src/main/java/io/seata/saga/proctrl/ProcessContext.java +++ b/compatible/src/main/java/io/seata/saga/proctrl/ProcessContext.java @@ -16,14 +16,15 @@ */ package io.seata.saga.proctrl; -import org.apache.seata.saga.proctrl.Instruction; - import java.util.Map; +import org.apache.seata.saga.proctrl.Instruction; + /** * Process Context * */ +@Deprecated public interface ProcessContext extends org.apache.seata.saga.proctrl.ProcessContext { String VAR_NAME_PROCESS_TYPE = "_ProcessType_"; diff --git a/compatible/src/main/java/io/seata/saga/proctrl/impl/ProcessContextImpl.java b/compatible/src/main/java/io/seata/saga/proctrl/impl/ProcessContextImpl.java index ce9cbc95a20..ee7bc9820f6 100644 --- a/compatible/src/main/java/io/seata/saga/proctrl/impl/ProcessContextImpl.java +++ b/compatible/src/main/java/io/seata/saga/proctrl/impl/ProcessContextImpl.java @@ -16,16 +16,17 @@ */ package io.seata.saga.proctrl.impl; +import java.util.Map; + import io.seata.saga.proctrl.HierarchicalProcessContext; import io.seata.saga.proctrl.ProcessContext; import org.apache.seata.saga.proctrl.Instruction; -import java.util.Map; - /** * The default process context implementation * */ +@Deprecated public class ProcessContextImpl implements HierarchicalProcessContext, ProcessContext { private final org.apache.seata.saga.proctrl.HierarchicalProcessContext actual; diff --git a/compatible/src/main/java/io/seata/saga/rm/SagaResourceManager.java b/compatible/src/main/java/io/seata/saga/rm/SagaResourceManager.java index a850e40605d..0a5cdbf736a 100644 --- a/compatible/src/main/java/io/seata/saga/rm/SagaResourceManager.java +++ b/compatible/src/main/java/io/seata/saga/rm/SagaResourceManager.java @@ -16,6 +16,9 @@ */ package io.seata.saga.rm; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + import io.seata.saga.statelang.domain.ExecutionStatus; import io.seata.saga.statelang.domain.StateMachineInstance; import org.apache.seata.common.exception.FrameworkErrorCode; @@ -32,9 +35,10 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - +/** + * The type Saga resource manager. + */ +@Deprecated public class SagaResourceManager extends AbstractResourceManager { private static final Logger LOGGER = LoggerFactory.getLogger(SagaResourceManager.class); diff --git a/compatible/src/main/java/io/seata/saga/rm/StateMachineEngineHolder.java b/compatible/src/main/java/io/seata/saga/rm/StateMachineEngineHolder.java index 1866e34fd54..f632335b4cb 100644 --- a/compatible/src/main/java/io/seata/saga/rm/StateMachineEngineHolder.java +++ b/compatible/src/main/java/io/seata/saga/rm/StateMachineEngineHolder.java @@ -19,14 +19,28 @@ import io.seata.saga.engine.StateMachineEngine; +/** + * The type State machine engine holder. + */ +@Deprecated public class StateMachineEngineHolder { private static StateMachineEngine stateMachineEngine; + /** + * Gets state machine engine. + * + * @return the state machine engine + */ public static StateMachineEngine getStateMachineEngine() { return stateMachineEngine; } + /** + * Sets state machine engine. + * + * @param smEngine the sm engine + */ public static void setStateMachineEngine(StateMachineEngine smEngine) { stateMachineEngine = smEngine; } diff --git a/compatible/src/main/java/io/seata/saga/statelang/domain/DomainConstants.java b/compatible/src/main/java/io/seata/saga/statelang/domain/DomainConstants.java index 87bd9fe44a1..42a2243ff18 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/domain/DomainConstants.java +++ b/compatible/src/main/java/io/seata/saga/statelang/domain/DomainConstants.java @@ -20,6 +20,7 @@ * State Language Domain Constants * */ +@Deprecated public interface DomainConstants { //region State Types diff --git a/compatible/src/main/java/io/seata/saga/statelang/domain/ExecutionStatus.java b/compatible/src/main/java/io/seata/saga/statelang/domain/ExecutionStatus.java index 06b6632eefd..1229620c096 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/domain/ExecutionStatus.java +++ b/compatible/src/main/java/io/seata/saga/statelang/domain/ExecutionStatus.java @@ -20,6 +20,7 @@ * Execution Status * */ +@Deprecated public enum ExecutionStatus { /** diff --git a/compatible/src/main/java/io/seata/saga/statelang/domain/RecoverStrategy.java b/compatible/src/main/java/io/seata/saga/statelang/domain/RecoverStrategy.java index dfd07747371..03b7c7c2def 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/domain/RecoverStrategy.java +++ b/compatible/src/main/java/io/seata/saga/statelang/domain/RecoverStrategy.java @@ -19,6 +19,7 @@ /** * Recover Strategy */ +@Deprecated public enum RecoverStrategy { /** diff --git a/compatible/src/main/java/io/seata/saga/statelang/domain/State.java b/compatible/src/main/java/io/seata/saga/statelang/domain/State.java index 9cf71f5391f..348445389a5 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/domain/State.java +++ b/compatible/src/main/java/io/seata/saga/statelang/domain/State.java @@ -18,6 +18,10 @@ import java.util.Map; +/** + * The interface State. + */ +@Deprecated public interface State { /** @@ -61,4 +65,4 @@ public interface State { * @return the state machine */ StateMachine getStateMachine(); -} \ No newline at end of file +} diff --git a/compatible/src/main/java/io/seata/saga/statelang/domain/StateInstance.java b/compatible/src/main/java/io/seata/saga/statelang/domain/StateInstance.java index 39109b3c0c5..ad11bdf7877 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/domain/StateInstance.java +++ b/compatible/src/main/java/io/seata/saga/statelang/domain/StateInstance.java @@ -22,6 +22,7 @@ * State execution instance * */ +@Deprecated public interface StateInstance { /** diff --git a/compatible/src/main/java/io/seata/saga/statelang/domain/StateMachine.java b/compatible/src/main/java/io/seata/saga/statelang/domain/StateMachine.java index 15f8045212f..3642cd207bd 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/domain/StateMachine.java +++ b/compatible/src/main/java/io/seata/saga/statelang/domain/StateMachine.java @@ -19,6 +19,10 @@ import java.util.Date; import java.util.Map; +/** + * The interface State machine. + */ +@Deprecated public interface StateMachine { /** @@ -42,6 +46,11 @@ public interface StateMachine { */ String getStartState(); + /** + * Sets start state. + * + * @param startState the start state + */ void setStartState(String startState); /** @@ -80,6 +89,11 @@ public interface StateMachine { */ String getId(); + /** + * Sets id. + * + * @param id the id + */ void setId(String id); /** @@ -159,6 +173,11 @@ public interface StateMachine { */ String getContent(); + /** + * Sets content. + * + * @param content the content + */ void setContent(String content); /** @@ -175,6 +194,9 @@ public interface StateMachine { */ void setGmtCreate(Date date); + /** + * The enum Status. + */ enum Status { /** * Active @@ -191,10 +213,21 @@ enum Status { this.statusString = statusString; } + /** + * Gets status string. + * + * @return the status string + */ public String getStatusString() { return statusString; } + /** + * Wrap status. + * + * @param target the target + * @return the status + */ public static Status wrap(org.apache.seata.saga.statelang.domain.StateMachine.Status target) { if (target == null) { return null; @@ -209,6 +242,11 @@ public static Status wrap(org.apache.seata.saga.statelang.domain.StateMachine.St } } + /** + * Unwrap org . apache . seata . saga . statelang . domain . state machine . status. + * + * @return the org . apache . seata . saga . statelang . domain . state machine . status + */ public org.apache.seata.saga.statelang.domain.StateMachine.Status unwrap() { switch (this) { case AC: @@ -220,4 +258,4 @@ public org.apache.seata.saga.statelang.domain.StateMachine.Status unwrap() { } } } -} \ No newline at end of file +} diff --git a/compatible/src/main/java/io/seata/saga/statelang/domain/StateMachineInstance.java b/compatible/src/main/java/io/seata/saga/statelang/domain/StateMachineInstance.java index b4b8efec3b1..d6ad2eb261c 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/domain/StateMachineInstance.java +++ b/compatible/src/main/java/io/seata/saga/statelang/domain/StateMachineInstance.java @@ -24,6 +24,7 @@ * StateMachine execution instance * */ +@Deprecated public interface StateMachineInstance { /** diff --git a/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateImpl.java b/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateImpl.java index bdc5ec3b36e..29f31b9f68b 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateImpl.java +++ b/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateImpl.java @@ -16,11 +16,15 @@ */ 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; - +/** + * The type State. + */ +@Deprecated public class StateImpl implements State { private final org.apache.seata.saga.statelang.domain.State actual; @@ -61,6 +65,12 @@ public StateMachine getStateMachine() { return StateMachineImpl.wrap(stateMachine); } + /** + * Wrap state. + * + * @param target the target + * @return the state + */ public static StateImpl wrap(org.apache.seata.saga.statelang.domain.State target) { if (target == null) { return null; @@ -68,6 +78,11 @@ public static StateImpl wrap(org.apache.seata.saga.statelang.domain.State target return new StateImpl(target); } + /** + * Unwrap org . apache . seata . saga . statelang . domain . state. + * + * @return the org . apache . seata . saga . statelang . domain . state + */ public org.apache.seata.saga.statelang.domain.State unwrap() { return actual; } diff --git a/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateInstanceImpl.java b/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateInstanceImpl.java index 25dd81ee60f..205614e521b 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateInstanceImpl.java +++ b/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateInstanceImpl.java @@ -16,16 +16,17 @@ */ package io.seata.saga.statelang.domain.impl; +import java.util.Date; + 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 * */ +@Deprecated public class StateInstanceImpl implements StateInstance { private final org.apache.seata.saga.statelang.domain.StateInstance actual; diff --git a/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineImpl.java b/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineImpl.java index f3bdc2f2b10..1435d9856aa 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineImpl.java +++ b/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineImpl.java @@ -16,14 +16,18 @@ */ package io.seata.saga.statelang.domain.impl; -import io.seata.saga.statelang.domain.RecoverStrategy; -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.RecoverStrategy; +import io.seata.saga.statelang.domain.State; +import io.seata.saga.statelang.domain.StateMachine; + +/** + * The type State machine. + */ +@Deprecated public class StateMachineImpl implements StateMachine { private final org.apache.seata.saga.statelang.domain.StateMachine actual; @@ -166,6 +170,12 @@ public void setGmtCreate(Date date) { actual.setGmtCreate(date); } + /** + * Wrap state machine. + * + * @param target the target + * @return the state machine + */ public static StateMachineImpl wrap(org.apache.seata.saga.statelang.domain.StateMachine target) { if (target == null) { return null; @@ -173,6 +183,11 @@ public static StateMachineImpl wrap(org.apache.seata.saga.statelang.domain.State return new StateMachineImpl(target); } + /** + * Unwrap org . apache . seata . saga . statelang . domain . state machine. + * + * @return the org . apache . seata . saga . statelang . domain . state machine + */ public org.apache.seata.saga.statelang.domain.StateMachine unwrap() { return actual; } diff --git a/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineInstanceImpl.java b/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineInstanceImpl.java index 57e2ad83781..ce81b254a51 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineInstanceImpl.java +++ b/compatible/src/main/java/io/seata/saga/statelang/domain/impl/StateMachineInstanceImpl.java @@ -16,11 +16,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.AbstractMap; import java.util.Date; import java.util.List; @@ -28,9 +23,15 @@ import java.util.function.Function; import java.util.stream.Collectors; +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 */ +@Deprecated public class StateMachineInstanceImpl implements StateMachineInstance { private final org.apache.seata.saga.statelang.domain.StateMachineInstance actual; diff --git a/compatible/src/main/java/io/seata/saga/statelang/parser/JsonParser.java b/compatible/src/main/java/io/seata/saga/statelang/parser/JsonParser.java index e139e01eca7..0f749821fc9 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/parser/JsonParser.java +++ b/compatible/src/main/java/io/seata/saga/statelang/parser/JsonParser.java @@ -21,6 +21,7 @@ * Json Parser * */ +@Deprecated public interface JsonParser extends org.apache.seata.saga.statelang.parser.JsonParser { } diff --git a/compatible/src/main/java/io/seata/saga/statelang/validator/Rule.java b/compatible/src/main/java/io/seata/saga/statelang/validator/Rule.java index 55b620fb90e..fc4d1359d52 100644 --- a/compatible/src/main/java/io/seata/saga/statelang/validator/Rule.java +++ b/compatible/src/main/java/io/seata/saga/statelang/validator/Rule.java @@ -16,5 +16,9 @@ */ package io.seata.saga.statelang.validator; +/** + * The interface Rule. + */ +@Deprecated public interface Rule extends org.apache.seata.saga.statelang.validator.Rule { } diff --git a/compatible/src/main/java/io/seata/spring/annotation/GlobalLock.java b/compatible/src/main/java/io/seata/spring/annotation/GlobalLock.java index f47e32976a5..f8cb393e800 100644 --- a/compatible/src/main/java/io/seata/spring/annotation/GlobalLock.java +++ b/compatible/src/main/java/io/seata/spring/annotation/GlobalLock.java @@ -23,6 +23,7 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +@Deprecated @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, ElementType.TYPE}) @Inherited diff --git a/compatible/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java b/compatible/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java index f242db672c2..5d8108b6451 100644 --- a/compatible/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java +++ b/compatible/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java @@ -26,30 +26,73 @@ import static org.apache.seata.common.DefaultValues.DEFAULT_TX_GROUP; import static org.apache.seata.common.DefaultValues.DEFAULT_TX_GROUP_OLD; +/** + * The type Global transaction scanner. + */ +@Deprecated public class GlobalTransactionScanner extends org.apache.seata.spring.annotation.GlobalTransactionScanner { private static final Logger LOGGER = LoggerFactory.getLogger(GlobalTransactionScanner.class); + /** + * Instantiates a new Global transaction scanner. + * + * @param txServiceGroup the tx service group + */ public GlobalTransactionScanner(String txServiceGroup) { super(txServiceGroup); } + /** + * Instantiates a new Global transaction scanner. + * + * @param txServiceGroup the tx service group + * @param mode the mode + */ public GlobalTransactionScanner(String txServiceGroup, int mode) { super(txServiceGroup, mode); } + /** + * Instantiates a new Global transaction scanner. + * + * @param applicationId the application id + * @param txServiceGroup the tx service group + */ public GlobalTransactionScanner(String applicationId, String txServiceGroup) { super(applicationId, txServiceGroup); } + /** + * Instantiates a new Global transaction scanner. + * + * @param applicationId the application id + * @param txServiceGroup the tx service group + * @param mode the mode + */ public GlobalTransactionScanner(String applicationId, String txServiceGroup, int mode) { super(applicationId, txServiceGroup, mode); } + /** + * Instantiates a new Global transaction scanner. + * + * @param applicationId the application id + * @param txServiceGroup the tx service group + * @param failureHandlerHook the failure handler hook + */ public GlobalTransactionScanner(String applicationId, String txServiceGroup, FailureHandler failureHandlerHook) { super(applicationId, txServiceGroup, failureHandlerHook); } + /** + * Instantiates a new Global transaction scanner. + * + * @param applicationId the application id + * @param txServiceGroup the tx service group + * @param mode the mode + * @param failureHandlerHook the failure handler hook + */ public GlobalTransactionScanner(String applicationId, String txServiceGroup, int mode, FailureHandler failureHandlerHook) { super(applicationId, txServiceGroup, mode, failureHandlerHook); } diff --git a/compatible/src/main/java/io/seata/spring/annotation/GlobalTransactional.java b/compatible/src/main/java/io/seata/spring/annotation/GlobalTransactional.java index f4d4fe08189..b311c6f1ecf 100644 --- a/compatible/src/main/java/io/seata/spring/annotation/GlobalTransactional.java +++ b/compatible/src/main/java/io/seata/spring/annotation/GlobalTransactional.java @@ -16,17 +16,17 @@ */ package io.seata.spring.annotation; -import io.seata.common.LockStrategyMode; -import io.seata.tm.api.transaction.Propagation; -import org.apache.seata.common.DefaultValues; - import java.lang.annotation.ElementType; import java.lang.annotation.Inherited; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import io.seata.common.LockStrategyMode; +import io.seata.tm.api.transaction.Propagation; +import org.apache.seata.common.DefaultValues; +@Deprecated @Retention(RetentionPolicy.RUNTIME) @Target({ElementType.METHOD, ElementType.TYPE}) @Inherited diff --git a/compatible/src/main/java/io/seata/spring/annotation/ScannerChecker.java b/compatible/src/main/java/io/seata/spring/annotation/ScannerChecker.java index 4bfee1f0fa9..89d7574bee5 100644 --- a/compatible/src/main/java/io/seata/spring/annotation/ScannerChecker.java +++ b/compatible/src/main/java/io/seata/spring/annotation/ScannerChecker.java @@ -21,7 +21,9 @@ /** * The Scanner checker for {@link GlobalTransactionScanner} * - * @see GlobalTransactionScanner#wrapIfNecessary(Object, String, Object) + * @see GlobalTransactionScanner#wrapIfNecessary(Object, String, Object) GlobalTransactionScanner#wrapIfNecessary + * (Object, String, Object) */ +@Deprecated public interface ScannerChecker extends org.apache.seata.spring.annotation.ScannerChecker { } diff --git a/compatible/src/main/java/io/seata/spring/annotation/datasource/AutoDataSourceProxyRegistrar.java b/compatible/src/main/java/io/seata/spring/annotation/datasource/AutoDataSourceProxyRegistrar.java index 1fbc4f5f06c..ff7082b3603 100644 --- a/compatible/src/main/java/io/seata/spring/annotation/datasource/AutoDataSourceProxyRegistrar.java +++ b/compatible/src/main/java/io/seata/spring/annotation/datasource/AutoDataSourceProxyRegistrar.java @@ -25,11 +25,18 @@ import org.springframework.context.annotation.ImportBeanDefinitionRegistrar; import org.springframework.core.type.AnnotationMetadata; +/** + * The type Auto data source proxy registrar. + */ +@Deprecated public class AutoDataSourceProxyRegistrar implements ImportBeanDefinitionRegistrar { private static final String ATTRIBUTE_KEY_USE_JDK_PROXY = "useJdkProxy"; private static final String ATTRIBUTE_KEY_EXCLUDES = "excludes"; private static final String ATTRIBUTE_KEY_DATA_SOURCE_PROXY_MODE = "dataSourceProxyMode"; + /** + * The constant BEAN_NAME_SEATA_AUTO_DATA_SOURCE_PROXY_CREATOR. + */ public static final String BEAN_NAME_SEATA_AUTO_DATA_SOURCE_PROXY_CREATOR = "seataAutoDataSourceProxyCreator"; @Override diff --git a/compatible/src/main/java/io/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java b/compatible/src/main/java/io/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java index 44e96086848..b2302f1618f 100644 --- a/compatible/src/main/java/io/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java +++ b/compatible/src/main/java/io/seata/spring/annotation/datasource/EnableAutoDataSourceProxy.java @@ -27,6 +27,7 @@ /** * This annotation will enable auto proxying of datasource bean. */ +@Deprecated @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Import(AutoDataSourceProxyRegistrar.class) diff --git a/compatible/src/main/java/io/seata/tm/TMClient.java b/compatible/src/main/java/io/seata/tm/TMClient.java index 4753aea0fe8..cb2d072f09e 100644 --- a/compatible/src/main/java/io/seata/tm/TMClient.java +++ b/compatible/src/main/java/io/seata/tm/TMClient.java @@ -20,5 +20,6 @@ * The type Tm client. * */ +@Deprecated public class TMClient extends org.apache.seata.tm.TMClient { } diff --git a/compatible/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java b/compatible/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java index db18a8fd583..63f727c7ac2 100644 --- a/compatible/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java +++ b/compatible/src/main/java/io/seata/tm/api/DefaultFailureHandlerImpl.java @@ -17,6 +17,7 @@ package io.seata.tm.api; import java.util.concurrent.TimeUnit; + import io.netty.util.HashedWheelTimer; import io.netty.util.Timeout; import io.netty.util.TimerTask; @@ -31,6 +32,7 @@ * The type Default failure handler. * */ +@Deprecated public class DefaultFailureHandlerImpl implements FailureHandler { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultFailureHandlerImpl.class); diff --git a/compatible/src/main/java/io/seata/tm/api/DefaultGlobalTransaction.java b/compatible/src/main/java/io/seata/tm/api/DefaultGlobalTransaction.java index 5a14ac96e0d..a8d2b4ba5e2 100644 --- a/compatible/src/main/java/io/seata/tm/api/DefaultGlobalTransaction.java +++ b/compatible/src/main/java/io/seata/tm/api/DefaultGlobalTransaction.java @@ -24,6 +24,7 @@ /** * The type Default global transaction. */ +@Deprecated public class DefaultGlobalTransaction implements GlobalTransaction { private final org.apache.seata.tm.api.DefaultGlobalTransaction instance; diff --git a/compatible/src/main/java/io/seata/tm/api/FailureHandler.java b/compatible/src/main/java/io/seata/tm/api/FailureHandler.java index 2058deb1886..a3e2c43972b 100644 --- a/compatible/src/main/java/io/seata/tm/api/FailureHandler.java +++ b/compatible/src/main/java/io/seata/tm/api/FailureHandler.java @@ -16,5 +16,9 @@ */ package io.seata.tm.api; +/** + * The interface Failure handler. + */ +@Deprecated public interface FailureHandler extends org.apache.seata.tm.api.FailureHandler { } diff --git a/compatible/src/main/java/io/seata/tm/api/GlobalTransaction.java b/compatible/src/main/java/io/seata/tm/api/GlobalTransaction.java index ef0f29be7c9..bd563b9531e 100644 --- a/compatible/src/main/java/io/seata/tm/api/GlobalTransaction.java +++ b/compatible/src/main/java/io/seata/tm/api/GlobalTransaction.java @@ -24,6 +24,7 @@ /** * Global transaction. */ +@Deprecated public interface GlobalTransaction extends BaseTransaction { /** diff --git a/compatible/src/main/java/io/seata/tm/api/GlobalTransactionContext.java b/compatible/src/main/java/io/seata/tm/api/GlobalTransactionContext.java index e7dc71ed308..7de92249e45 100644 --- a/compatible/src/main/java/io/seata/tm/api/GlobalTransactionContext.java +++ b/compatible/src/main/java/io/seata/tm/api/GlobalTransactionContext.java @@ -24,6 +24,7 @@ /** * GlobalTransaction API */ +@Deprecated public class GlobalTransactionContext { private GlobalTransactionContext() { diff --git a/compatible/src/main/java/io/seata/tm/api/GlobalTransactionRole.java b/compatible/src/main/java/io/seata/tm/api/GlobalTransactionRole.java index 7dd926eff98..32a20e1717e 100644 --- a/compatible/src/main/java/io/seata/tm/api/GlobalTransactionRole.java +++ b/compatible/src/main/java/io/seata/tm/api/GlobalTransactionRole.java @@ -19,6 +19,7 @@ /** * Role of current thread involve in a global transaction. */ +@Deprecated public enum GlobalTransactionRole { /** diff --git a/compatible/src/main/java/io/seata/tm/api/TransactionalTemplate.java b/compatible/src/main/java/io/seata/tm/api/TransactionalTemplate.java index 46dab0393dd..003a47fb2b6 100644 --- a/compatible/src/main/java/io/seata/tm/api/TransactionalTemplate.java +++ b/compatible/src/main/java/io/seata/tm/api/TransactionalTemplate.java @@ -19,5 +19,6 @@ /** * Template of executing business logic with a global transaction. */ +@Deprecated public class TransactionalTemplate extends org.apache.seata.tm.api.TransactionalTemplate { } diff --git a/compatible/src/main/java/io/seata/tm/api/transaction/Propagation.java b/compatible/src/main/java/io/seata/tm/api/transaction/Propagation.java index feae3a3cd81..3c4e6956c38 100644 --- a/compatible/src/main/java/io/seata/tm/api/transaction/Propagation.java +++ b/compatible/src/main/java/io/seata/tm/api/transaction/Propagation.java @@ -16,6 +16,7 @@ */ package io.seata.tm.api.transaction; +@Deprecated public enum Propagation { /** * The REQUIRED. diff --git a/compatible/src/main/java/io/seata/tm/api/transaction/SuspendedResourcesHolder.java b/compatible/src/main/java/io/seata/tm/api/transaction/SuspendedResourcesHolder.java index 38bf15bc743..ae0aa882911 100644 --- a/compatible/src/main/java/io/seata/tm/api/transaction/SuspendedResourcesHolder.java +++ b/compatible/src/main/java/io/seata/tm/api/transaction/SuspendedResourcesHolder.java @@ -20,6 +20,7 @@ * Holder for suspended resources to support propagation or nested logic. * Used by {@code suspend} and {@code resume} */ +@Deprecated public class SuspendedResourcesHolder extends org.apache.seata.tm.api.transaction.SuspendedResourcesHolder { public SuspendedResourcesHolder(String xid) { super(xid); diff --git a/compatible/src/test/java/io/seata/common/LockAndCallback.java b/compatible/src/test/java/io/seata/common/LockAndCallback.java index a679fe25bfc..bc171e5dde0 100644 --- a/compatible/src/test/java/io/seata/common/LockAndCallback.java +++ b/compatible/src/test/java/io/seata/common/LockAndCallback.java @@ -16,17 +16,16 @@ */ package io.seata.common; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.locks.Condition; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; import io.seata.saga.engine.AsyncCallback; import io.seata.saga.proctrl.ProcessContext; import io.seata.saga.statelang.domain.ExecutionStatus; import io.seata.saga.statelang.domain.StateMachineInstance; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Condition; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - public class LockAndCallback { private final Lock lock; private final Condition notFinished; diff --git a/compatible/src/test/java/io/seata/rm/datasource/DataSourceProxyTest.java b/compatible/src/test/java/io/seata/rm/datasource/DataSourceProxyTest.java index a9148311759..e707c4c568f 100644 --- a/compatible/src/test/java/io/seata/rm/datasource/DataSourceProxyTest.java +++ b/compatible/src/test/java/io/seata/rm/datasource/DataSourceProxyTest.java @@ -21,6 +21,7 @@ import javax.sql.DataSource; import com.alibaba.druid.pool.DruidDataSource; + import io.seata.rm.datasource.mock.MockDataSource; import io.seata.rm.datasource.mock.MockDriver; import org.apache.seata.rm.datasource.undo.UndoLogManagerFactory; @@ -30,7 +31,6 @@ import org.mockito.MockedStatic; import org.mockito.Mockito; - import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; diff --git a/compatible/src/test/java/io/seata/rm/datasource/mock/MockDriver.java b/compatible/src/test/java/io/seata/rm/datasource/mock/MockDriver.java index 968bf33777f..cf25053b40c 100644 --- a/compatible/src/test/java/io/seata/rm/datasource/mock/MockDriver.java +++ b/compatible/src/test/java/io/seata/rm/datasource/mock/MockDriver.java @@ -21,12 +21,12 @@ import java.util.List; import java.util.Properties; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - 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 diff --git a/compatible/src/test/java/io/seata/rm/datasource/mock/MockExecuteHandlerImpl.java b/compatible/src/test/java/io/seata/rm/datasource/mock/MockExecuteHandlerImpl.java index 5d711164ad6..6739869493c 100644 --- a/compatible/src/test/java/io/seata/rm/datasource/mock/MockExecuteHandlerImpl.java +++ b/compatible/src/test/java/io/seata/rm/datasource/mock/MockExecuteHandlerImpl.java @@ -22,9 +22,6 @@ import java.util.Arrays; import java.util.List; -import org.apache.seata.sqlparser.druid.mysql.MySQLSelectForUpdateRecognizer; -import org.apache.seata.sqlparser.util.JdbcConstants; - import com.alibaba.druid.mock.MockStatementBase; import com.alibaba.druid.mock.handler.MockExecuteHandler; import com.alibaba.druid.sql.SQLUtils; @@ -33,6 +30,9 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; +import org.apache.seata.sqlparser.druid.mysql.MySQLSelectForUpdateRecognizer; +import org.apache.seata.sqlparser.util.JdbcConstants; + public class MockExecuteHandlerImpl implements MockExecuteHandler { diff --git a/compatible/src/test/java/io/seata/rm/datasource/mock/MockResultSet.java b/compatible/src/test/java/io/seata/rm/datasource/mock/MockResultSet.java index 84d2d00142e..2aca861b189 100644 --- a/compatible/src/test/java/io/seata/rm/datasource/mock/MockResultSet.java +++ b/compatible/src/test/java/io/seata/rm/datasource/mock/MockResultSet.java @@ -24,13 +24,13 @@ import java.util.ArrayList; import java.util.List; +import com.alibaba.druid.util.jdbc.ResultSetBase; + +import com.google.common.collect.Lists; import org.apache.seata.sqlparser.struct.ColumnMeta; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.alibaba.druid.util.jdbc.ResultSetBase; -import com.google.common.collect.Lists; - public class MockResultSet extends ResultSetBase { diff --git a/compatible/src/test/java/io/seata/rm/datasource/xa/DataSourceProxyXATest.java b/compatible/src/test/java/io/seata/rm/datasource/xa/DataSourceProxyXATest.java index 51d83dc1b6e..47eee8f3754 100644 --- a/compatible/src/test/java/io/seata/rm/datasource/xa/DataSourceProxyXATest.java +++ b/compatible/src/test/java/io/seata/rm/datasource/xa/DataSourceProxyXATest.java @@ -29,16 +29,14 @@ import com.mysql.jdbc.JDBC4MySQLConnection; import com.mysql.jdbc.jdbc2.optional.JDBC4ConnectionWrapper; -import io.seata.rm.datasource.mock.MockDataSource; import io.seata.core.context.RootContext; +import io.seata.rm.datasource.mock.MockDataSource; import org.apache.seata.rm.datasource.xa.ConnectionProxyXA; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; - import static org.mockito.ArgumentMatchers.any; /** diff --git a/compatible/src/test/java/io/seata/rm/tcc/Param.java b/compatible/src/test/java/io/seata/rm/tcc/Param.java index d6055e54e37..65af4f832a8 100644 --- a/compatible/src/test/java/io/seata/rm/tcc/Param.java +++ b/compatible/src/test/java/io/seata/rm/tcc/Param.java @@ -29,4 +29,4 @@ @Target({ElementType.PARAMETER, ElementType.FIELD}) public @interface Param { String value() default ""; -} \ No newline at end of file +} diff --git a/compatible/src/test/java/io/seata/rm/tcc/interceptor/ProxyUtilsTccTest.java b/compatible/src/test/java/io/seata/rm/tcc/interceptor/ProxyUtilsTccTest.java index b2ebb77c95d..7802ba291e4 100644 --- a/compatible/src/test/java/io/seata/rm/tcc/interceptor/ProxyUtilsTccTest.java +++ b/compatible/src/test/java/io/seata/rm/tcc/interceptor/ProxyUtilsTccTest.java @@ -21,9 +21,9 @@ import java.util.Map; import java.util.concurrent.atomic.AtomicReference; +import io.seata.core.context.RootContext; import io.seata.rm.tcc.NormalTccActionImpl; import io.seata.rm.tcc.TccParam; -import io.seata.core.context.RootContext; import org.apache.seata.core.exception.TransactionException; import org.apache.seata.core.model.BranchStatus; import org.apache.seata.core.model.BranchType; diff --git a/compatible/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineAsyncDBMockServerTests.java b/compatible/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineAsyncDBMockServerTests.java index 98daec128c2..2dedd078226 100644 --- a/compatible/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineAsyncDBMockServerTests.java +++ b/compatible/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineAsyncDBMockServerTests.java @@ -16,6 +16,9 @@ */ package io.seata.saga.engine.db.mockserver; +import java.util.HashMap; +import java.util.Map; + import io.seata.common.LockAndCallback; import io.seata.saga.SagaCostPrint; import io.seata.saga.engine.StateMachineEngine; @@ -29,9 +32,6 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import java.util.HashMap; -import java.util.Map; - /** * State machine async tests with db log store * diff --git a/compatible/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineDBMockServerTests.java b/compatible/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineDBMockServerTests.java index f7647d4cda0..17a28acffec 100644 --- a/compatible/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineDBMockServerTests.java +++ b/compatible/src/test/java/io/seata/saga/engine/db/mockserver/StateMachineDBMockServerTests.java @@ -16,6 +16,9 @@ */ package io.seata.saga.engine.db.mockserver; +import java.util.HashMap; +import java.util.Map; + import io.seata.saga.SagaCostPrint; import io.seata.saga.engine.StateMachineEngine; import io.seata.saga.engine.mock.DemoService.Engineer; @@ -24,16 +27,12 @@ import io.seata.saga.statelang.domain.DomainConstants; import io.seata.saga.statelang.domain.ExecutionStatus; import io.seata.saga.statelang.domain.StateMachineInstance; -import org.apache.seata.rm.DefaultResourceManager; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import java.util.HashMap; -import java.util.Map; - /** * State machine tests with db log store * diff --git a/compatible/src/test/java/io/seata/spi/SPITest.java b/compatible/src/test/java/io/seata/spi/SPITest.java index 7da08bd3ec3..31c07fddffe 100644 --- a/compatible/src/test/java/io/seata/spi/SPITest.java +++ b/compatible/src/test/java/io/seata/spi/SPITest.java @@ -16,15 +16,15 @@ */ package io.seata.spi; +import java.util.List; +import java.util.stream.Collectors; + import org.apache.seata.common.loader.EnhancedServiceLoader; import org.apache.seata.core.model.BranchType; import org.apache.seata.core.model.ResourceManager; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import java.util.List; -import java.util.stream.Collectors; - public class SPITest { @Test diff --git a/compatible/src/test/java/io/seata/tm/api/DefaultFailureHandlerImplTest.java b/compatible/src/test/java/io/seata/tm/api/DefaultFailureHandlerImplTest.java index 260e2e09e60..34567dd5364 100644 --- a/compatible/src/test/java/io/seata/tm/api/DefaultFailureHandlerImplTest.java +++ b/compatible/src/test/java/io/seata/tm/api/DefaultFailureHandlerImplTest.java @@ -18,6 +18,7 @@ import java.lang.reflect.Field; +import io.netty.util.HashedWheelTimer; import io.seata.core.context.RootContext; import io.seata.tm.api.transaction.MyRuntimeException; import org.apache.seata.core.exception.TransactionException; @@ -30,8 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.util.HashedWheelTimer; - class DefaultFailureHandlerImplTest { private static final Logger LOGGER = LoggerFactory.getLogger(DefaultFailureHandlerImplTest.class); 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 cac67023203..71d82cafbc3 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 @@ -21,6 +21,10 @@ import org.apache.seata.common.util.DurationUtil; import org.apache.seata.common.util.StringUtils; +/** + * The type Abstract configuration. + */ +@Deprecated public abstract class AbstractConfiguration implements Configuration { /** * The constant DEFAULT_CONFIG_TIMEOUT. @@ -31,9 +35,21 @@ public abstract class AbstractConfiguration implements Configuration { * The constant DEFAULT_XXX. */ public static final short DEFAULT_SHORT = (short)0; + /** + * The constant DEFAULT_INT. + */ public static final int DEFAULT_INT = 0; + /** + * The constant DEFAULT_LONG. + */ public static final long DEFAULT_LONG = 0L; + /** + * The constant DEFAULT_DURATION. + */ public static final Duration DEFAULT_DURATION = Duration.ZERO; + /** + * The constant DEFAULT_BOOLEAN. + */ public static final boolean DEFAULT_BOOLEAN = false; @Override 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 e778350e22b..faf4ba8f571 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 @@ -22,8 +22,15 @@ import org.apache.seata.common.util.StringUtils; +/** + * The interface Configuration. + */ +@Deprecated public interface Configuration { + /** + * The Env map. + */ Map ENV_MAP = System.getenv(); /** 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 index 9d4f2565e84..d485ddaa889 100644 --- 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 @@ -16,6 +16,10 @@ */ package io.seata.config; +/** + * The type Configuration change event. + */ +@Deprecated public class ConfigurationChangeEvent { private String dataId; private String oldValue; @@ -24,14 +28,32 @@ public class ConfigurationChangeEvent { private ConfigurationChangeType changeType; private static final String DEFAULT_NAMESPACE = "DEFAULT"; + /** + * Instantiates a new Configuration change event. + */ public ConfigurationChangeEvent() { } + /** + * Instantiates a new Configuration change event. + * + * @param dataId the data id + * @param newValue the new value + */ public ConfigurationChangeEvent(String dataId, String newValue) { this(dataId, DEFAULT_NAMESPACE, null, newValue, ConfigurationChangeType.MODIFY); } + /** + * Instantiates a new Configuration change event. + * + * @param dataId the data id + * @param namespace the namespace + * @param oldValue the old value + * @param newValue the new value + * @param type the type + */ public ConfigurationChangeEvent(String dataId, String namespace, String oldValue, String newValue, ConfigurationChangeType type) { this.dataId = dataId; @@ -54,6 +76,7 @@ public String getDataId() { * Sets data id. * * @param dataId the data id + * @return the data id */ public ConfigurationChangeEvent setDataId(String dataId) { this.dataId = dataId; @@ -73,6 +96,7 @@ public String getOldValue() { * Sets old value. * * @param oldValue the old value + * @return the old value */ public ConfigurationChangeEvent setOldValue(String oldValue) { this.oldValue = oldValue; @@ -92,6 +116,7 @@ public String getNewValue() { * Sets new value. * * @param newValue the new value + * @return the new value */ public ConfigurationChangeEvent setNewValue(String newValue) { this.newValue = newValue; @@ -111,6 +136,7 @@ public ConfigurationChangeType getChangeType() { * Sets change type. * * @param changeType the change type + * @return the change type */ public ConfigurationChangeEvent setChangeType(ConfigurationChangeType changeType) { this.changeType = changeType; @@ -130,6 +156,7 @@ public String getNamespace() { * Sets namespace. * * @param namespace the namespace + * @return the namespace */ public ConfigurationChangeEvent setNamespace(String namespace) { this.namespace = namespace; 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 index fda6086a2bf..0eb79a71c85 100644 --- 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 @@ -23,6 +23,10 @@ import org.apache.seata.common.thread.NamedThreadFactory; +/** + * The interface Configuration change listener. + */ +@Deprecated public interface ConfigurationChangeListener { /** * The constant CORE_LISTENER_THREAD. 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 index 22b172e44a7..ad03bb38f9e 100644 --- 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 @@ -16,6 +16,10 @@ */ package io.seata.config; +/** + * The enum Configuration change type. + */ +@Deprecated public enum ConfigurationChangeType { /** * Add configuration change type. 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 c9e8ecf921a..f9c9d1097a1 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 @@ -20,6 +20,7 @@ * the interface configuration provider * Notes: used for io.seata SPI interface */ +@Deprecated public interface ConfigurationProvider { /** * provide a AbstractConfiguration implementation instance 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 index 051c2335f71..474e4bba0bd 100644 --- 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 @@ -20,6 +20,7 @@ * the interface ext configuration provider * Notes: used for io.seata SPI interface */ +@Deprecated public interface ExtConfigurationProvider { /** * provide a AbstractConfiguration implementation instance 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 af2fb245127..374d4fc5c77 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 @@ -29,6 +29,7 @@ * /apache/shardingsphere/transaction/base/seata/at/SeataATShardingSphereTransactionManager.java * 2.EnhancedServiceLoader.load(ExtConfigurationProvider.class).provide(configuration) */ +@Deprecated public class FileConfiguration extends AbstractConfiguration { private final org.apache.seata.config.FileConfiguration target; diff --git a/config/seata-config-core/src/main/java/io/seata/config/Processor.java b/config/seata-config-core/src/main/java/io/seata/config/Processor.java index ab8e5e3b305..dac238c25b8 100644 --- a/config/seata-config-core/src/main/java/io/seata/config/Processor.java +++ b/config/seata-config-core/src/main/java/io/seata/config/Processor.java @@ -20,5 +20,6 @@ * The processing configuration. * Notes: used for io.seata SPI interface */ +@Deprecated public interface Processor extends org.apache.seata.config.processor.Processor { } diff --git a/config/seata-config-core/src/main/java/org/apache/seata/config/ConfigurationCache.java b/config/seata-config-core/src/main/java/org/apache/seata/config/ConfigurationCache.java index 0ef162e4f19..74bbceca893 100644 --- a/config/seata-config-core/src/main/java/org/apache/seata/config/ConfigurationCache.java +++ b/config/seata-config-core/src/main/java/org/apache/seata/config/ConfigurationCache.java @@ -28,7 +28,6 @@ import org.apache.seata.common.util.StringUtils; /** - * @author funkye */ public class ConfigurationCache implements ConfigurationChangeListener { diff --git a/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/interceptor/parser/DefaultInterfaceParser.java b/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/interceptor/parser/DefaultInterfaceParser.java index c93574e8189..cd20f0eb39d 100644 --- a/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/interceptor/parser/DefaultInterfaceParser.java +++ b/integration-tx-api/src/main/java/org/apache/seata/integration/tx/api/interceptor/parser/DefaultInterfaceParser.java @@ -28,7 +28,6 @@ import org.apache.seata.integration.tx.api.interceptor.handler.ProxyInvocationHandler; /** - * @author leezongjie */ public class DefaultInterfaceParser implements InterfaceParser { diff --git a/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQ.java b/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQ.java index 44ea5dfac34..89abf945543 100644 --- a/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQ.java +++ b/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQ.java @@ -76,4 +76,4 @@ boolean rollback(BusinessActionContext context) throws UnknownHostException, MQBrokerException, RemotingException, InterruptedException, TransactionException; -} \ No newline at end of file +} diff --git a/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQImpl.java b/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQImpl.java index bd1a7972038..beeb6db944c 100644 --- a/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQImpl.java +++ b/rocketmq/src/main/java/org/apache/seata/integration/rocketmq/TCCRocketMQImpl.java @@ -93,4 +93,4 @@ public boolean rollback(BusinessActionContext context) LOGGER.info("RocketMQ message send rollback, xid = {}, branchId = {}", context.getXid(), context.getBranchId()); return true; } -} \ No newline at end of file +} diff --git a/saga/seata-saga-engine-store/src/main/java/org/apache/seata/saga/engine/store/StateLangStore.java b/saga/seata-saga-engine-store/src/main/java/org/apache/seata/saga/engine/store/StateLangStore.java index 9e9f4d84f03..0f29e7bff72 100644 --- a/saga/seata-saga-engine-store/src/main/java/org/apache/seata/saga/engine/store/StateLangStore.java +++ b/saga/seata-saga-engine-store/src/main/java/org/apache/seata/saga/engine/store/StateLangStore.java @@ -48,4 +48,4 @@ public interface StateLangStore { * @return whether the store state machine action is successful */ boolean storeStateMachine(StateMachine stateMachine); -} \ No newline at end of file +} diff --git a/saga/seata-saga-engine-store/src/main/java/org/apache/seata/saga/engine/store/StateLogStore.java b/saga/seata-saga-engine-store/src/main/java/org/apache/seata/saga/engine/store/StateLogStore.java index 1c95f2ac2c0..7dec8f53166 100644 --- a/saga/seata-saga-engine-store/src/main/java/org/apache/seata/saga/engine/store/StateLogStore.java +++ b/saga/seata-saga-engine-store/src/main/java/org/apache/seata/saga/engine/store/StateLogStore.java @@ -114,4 +114,4 @@ public interface StateLogStore { * clear the LocalThread */ void clearUp(ProcessContext context); -} \ No newline at end of file +} diff --git a/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/config/AbstractStateMachineConfig.java b/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/config/AbstractStateMachineConfig.java index 7c9122c1820..f61c3777554 100644 --- a/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/config/AbstractStateMachineConfig.java +++ b/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/config/AbstractStateMachineConfig.java @@ -492,4 +492,4 @@ public boolean isSagaBranchRegisterEnable() { public void setSagaBranchRegisterEnable(boolean sagaBranchRegisterEnable) { this.sagaBranchRegisterEnable = sagaBranchRegisterEnable; } -} \ No newline at end of file +} diff --git a/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/sequence/UUIDSeqGenerator.java b/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/sequence/UUIDSeqGenerator.java index a31665d4c60..c20bb2d2b56 100644 --- a/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/sequence/UUIDSeqGenerator.java +++ b/saga/seata-saga-engine/src/main/java/org/apache/seata/saga/engine/sequence/UUIDSeqGenerator.java @@ -44,4 +44,4 @@ public String generate(String entity, List shardingParameters) { public String generate(String entity) { return generate(entity, null); } -} \ No newline at end of file +} diff --git a/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/config/DbStateMachineConfig.java b/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/config/DbStateMachineConfig.java index 0672b67ce09..b934e1bd4b0 100644 --- a/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/config/DbStateMachineConfig.java +++ b/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/config/DbStateMachineConfig.java @@ -201,4 +201,4 @@ public String getDbType() { public void setDbType(String dbType) { this.dbType = dbType; } -} \ No newline at end of file +} diff --git a/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/impl/DefaultStateMachineConfig.java b/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/impl/DefaultStateMachineConfig.java index 247f43c4d5c..1e3722f542e 100644 --- a/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/impl/DefaultStateMachineConfig.java +++ b/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/impl/DefaultStateMachineConfig.java @@ -93,4 +93,4 @@ public void setResources(String[] resources) { public void setApplicationContext(ApplicationContext applicationContext) { this.applicationContext = applicationContext; } -} \ No newline at end of file +} diff --git a/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/tm/DefaultSagaTransactionalTemplate.java b/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/tm/DefaultSagaTransactionalTemplate.java index 3c067565d84..869f38bf1a6 100644 --- a/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/tm/DefaultSagaTransactionalTemplate.java +++ b/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/tm/DefaultSagaTransactionalTemplate.java @@ -320,4 +320,4 @@ public String getSecretKey() { public void setSecretKey(String secretKey) { this.secretKey = secretKey; } -} \ No newline at end of file +} diff --git a/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/tm/SagaTransactionalTemplate.java b/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/tm/SagaTransactionalTemplate.java index d0be486d595..f3f6410a5ba 100644 --- a/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/tm/SagaTransactionalTemplate.java +++ b/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/tm/SagaTransactionalTemplate.java @@ -51,4 +51,4 @@ void branchReport(String xid, long branchId, BranchStatus status, String applica void triggerAfterCompletion(GlobalTransaction tx); void cleanUp(GlobalTransaction tx); -} \ No newline at end of file +} diff --git a/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/utils/ResourceUtil.java b/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/utils/ResourceUtil.java index d58535e995c..4a74956a641 100644 --- a/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/utils/ResourceUtil.java +++ b/saga/seata-saga-spring/src/main/java/org/apache/seata/saga/engine/utils/ResourceUtil.java @@ -46,4 +46,4 @@ public static Resource[] getResources(String[] locationArr) { .flatMap(location -> Stream.of(getResources(location))) .toArray(Resource[]::new); } -} \ No newline at end of file +} diff --git a/saga/seata-saga-spring/src/test/java/org/apache/seata/saga/statelang/parser/utils/ResourceUtilTests.java b/saga/seata-saga-spring/src/test/java/org/apache/seata/saga/statelang/parser/utils/ResourceUtilTests.java index 7ed5549b057..cb800ed1560 100644 --- a/saga/seata-saga-spring/src/test/java/org/apache/seata/saga/statelang/parser/utils/ResourceUtilTests.java +++ b/saga/seata-saga-spring/src/test/java/org/apache/seata/saga/statelang/parser/utils/ResourceUtilTests.java @@ -36,4 +36,4 @@ public void getResources_test() { Resource[] resources2 = ResourceUtil.getResources(new String[]{"classpath*:statelang/*.json"}); assertThat(resources2.length).isEqualTo(1); } -} \ No newline at end of file +} diff --git a/saga/seata-saga-statelang/src/test/java/org/apache/seata/saga/statelang/parser/StateParserTests.java b/saga/seata-saga-statelang/src/test/java/org/apache/seata/saga/statelang/parser/StateParserTests.java index d054e3017d1..45702f40f72 100644 --- a/saga/seata-saga-statelang/src/test/java/org/apache/seata/saga/statelang/parser/StateParserTests.java +++ b/saga/seata-saga-statelang/src/test/java/org/apache/seata/saga/statelang/parser/StateParserTests.java @@ -125,4 +125,4 @@ private InputStream getInputStreamByPath(String path) { return classLoader.getResourceAsStream(path); } -} \ No newline at end of file +} diff --git a/server/src/main/java/org/apache/seata/server/cluster/raft/serializer/CustomDeserializer.java b/server/src/main/java/org/apache/seata/server/cluster/raft/serializer/CustomDeserializer.java index 1d368237d64..9987a203dfb 100644 --- a/server/src/main/java/org/apache/seata/server/cluster/raft/serializer/CustomDeserializer.java +++ b/server/src/main/java/org/apache/seata/server/cluster/raft/serializer/CustomDeserializer.java @@ -36,4 +36,4 @@ public Class deserialize(JsonParser jsonParser, DeserializationContext deseri throw new RuntimeException(e.getMessage(), e); } } -} \ No newline at end of file +} diff --git a/spring/src/test/java/org/apache/seata/spring/annotation/AdapterSpringSeataInterceptorTest.java b/spring/src/test/java/org/apache/seata/spring/annotation/AdapterSpringSeataInterceptorTest.java index e1d0e19e485..4baab0cecbb 100644 --- a/spring/src/test/java/org/apache/seata/spring/annotation/AdapterSpringSeataInterceptorTest.java +++ b/spring/src/test/java/org/apache/seata/spring/annotation/AdapterSpringSeataInterceptorTest.java @@ -105,4 +105,4 @@ public AccessibleObject getStaticPart() { return null; } } -} \ No newline at end of file +}