diff --git a/changes/en-us/2.x.md b/changes/en-us/2.x.md index 64b06a9ec22..d7b8ff8ad9e 100644 --- a/changes/en-us/2.x.md +++ b/changes/en-us/2.x.md @@ -109,6 +109,7 @@ Add changes here for all PR submitted to the 2.x branch. - [[#6393](https://github.com/apache/incubator-seata/pull/6393)] determine the version before sync metadata and add retry mechanism - [[#6387](https://github.com/apache/incubator-seata/pull/6387)] optimize tcc use compatible - [[#6402](https://github.com/apache/incubator-seata/pull/6402)] optimize rm-datasource use compatible +- [[#6419](https://github.com/apache/incubator-seata/pull/6419)] optimize integration-tx-api compatibl ### refactor: - [[#6269](https://github.com/apache/incubator-seata/pull/6269)] standardize Seata Exception diff --git a/changes/zh-cn/2.x.md b/changes/zh-cn/2.x.md index fb990bd9563..78a45a9b8e3 100644 --- a/changes/zh-cn/2.x.md +++ b/changes/zh-cn/2.x.md @@ -113,6 +113,7 @@ - [[#6393](https://github.com/apache/incubator-seata/pull/6393)] 元数据同步前判断版本,并增加重试功能 - [[#6387](https://github.com/apache/incubator-seata/pull/6387)] 优化tcc使用兼容 - [[#6402](https://github.com/apache/incubator-seata/pull/6402)] 优化rm-datasource向下兼容 +- [[#6419](https://github.com/apache/incubator-seata/pull/6419)] 优化integration-tx-api向下兼容 ### refactor: diff --git a/compatible/src/main/java/io/seata/integration/tx/api/util/ProxyUtil.java b/compatible/src/main/java/io/seata/integration/tx/api/util/ProxyUtil.java new file mode 100644 index 00000000000..211ccbb89af --- /dev/null +++ b/compatible/src/main/java/io/seata/integration/tx/api/util/ProxyUtil.java @@ -0,0 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package io.seata.integration.tx.api.util; + +@Deprecated +public class ProxyUtil extends org.apache.seata.integration.tx.api.util.ProxyUtil{ +} 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 7304caf1f1f..06280e71aaa 100644 --- a/compatible/src/main/java/io/seata/rm/datasource/DataSourceProxy.java +++ b/compatible/src/main/java/io/seata/rm/datasource/DataSourceProxy.java @@ -29,6 +29,7 @@ * The type Data source proxy. * */ +@Deprecated public class DataSourceProxy implements SeataDataSourceProxy { private final org.apache.seata.rm.datasource.DataSourceProxy dataSourceProxy; 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 ba10e9fa8c9..182ea547ca1 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 @@ -29,6 +29,7 @@ * DataSource proxy for XA mode. * */ +@Deprecated public class DataSourceProxyXA implements SeataDataSourceProxy { private final org.apache.seata.rm.datasource.xa.DataSourceProxyXA dataSourceProxyXA; diff --git a/compatible/src/test/java/io/seata/integration/tx/api/interceptor/parser/GlobalTransactionalInterceptorParserTest.java b/compatible/src/test/java/io/seata/integration/tx/api/interceptor/parser/GlobalTransactionalInterceptorParserTest.java index 7ea7712c741..f390888887f 100644 --- a/compatible/src/test/java/io/seata/integration/tx/api/interceptor/parser/GlobalTransactionalInterceptorParserTest.java +++ b/compatible/src/test/java/io/seata/integration/tx/api/interceptor/parser/GlobalTransactionalInterceptorParserTest.java @@ -20,7 +20,7 @@ import io.seata.tm.api.DefaultFailureHandlerImpl; import io.seata.tm.api.FailureHandler; import org.apache.seata.integration.tx.api.interceptor.handler.ProxyInvocationHandler; -import org.apache.seata.integration.tx.api.util.ProxyUtil; +import io.seata.integration.tx.api.util.ProxyUtil; import org.apache.seata.tm.api.FailureHandlerHolder; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; 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..2c8cadb74ff 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 @@ -30,7 +30,7 @@ import org.apache.seata.core.model.GlobalStatus; import org.apache.seata.core.model.Resource; import org.apache.seata.core.model.ResourceManager; -import org.apache.seata.integration.tx.api.util.ProxyUtil; +import io.seata.integration.tx.api.util.ProxyUtil; import org.apache.seata.rm.DefaultResourceManager; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/compatible/src/test/java/io/seata/rm/tcc/interceptor/parser/TccActionInterceptorParserTest.java b/compatible/src/test/java/io/seata/rm/tcc/interceptor/parser/TccActionInterceptorParserTest.java index 3f6cb45e958..ff2607cca6c 100644 --- a/compatible/src/test/java/io/seata/rm/tcc/interceptor/parser/TccActionInterceptorParserTest.java +++ b/compatible/src/test/java/io/seata/rm/tcc/interceptor/parser/TccActionInterceptorParserTest.java @@ -39,7 +39,7 @@ import org.apache.seata.core.model.TransactionManager; import org.apache.seata.integration.tx.api.interceptor.handler.ProxyInvocationHandler; import org.apache.seata.integration.tx.api.interceptor.parser.DefaultInterfaceParser; -import org.apache.seata.integration.tx.api.util.ProxyUtil; +import io.seata.integration.tx.api.util.ProxyUtil; import org.apache.seata.rm.DefaultResourceManager; import org.apache.seata.rm.tcc.TCCResourceManager; import org.apache.seata.tm.TransactionManagerHolder;