Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
apache
Shardingsphere
提交
b4cf0bc0
Shardingsphere
项目概览
apache
/
Shardingsphere
通知
56
Star
3
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Shardingsphere
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
b4cf0bc0
编写于
1月 15, 2019
作者:
C
cherrylzhao
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move SingleXAResource to SPI for other transaction manager integration.
上级
3b1f21a2
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
46 addition
and
21 deletion
+46
-21
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/main/java/io/shardingsphere/transaction/xa/jta/connection/SingleXAConnection.java
...ere/transaction/xa/jta/connection/SingleXAConnection.java
+2
-3
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/main/java/io/shardingsphere/transaction/xa/manager/atomikos/AtomikosTransactionManager.java
...ction/xa/manager/atomikos/AtomikosTransactionManager.java
+2
-2
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/main/java/io/shardingsphere/transaction/xa/manager/atomikos/AtomikosXARecoverableResource.java
...on/xa/manager/atomikos/AtomikosXARecoverableResource.java
+1
-1
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/test/java/io/shardingsphere/transaction/xa/XAShardingTransactionEngineTest.java
...phere/transaction/xa/XAShardingTransactionEngineTest.java
+4
-4
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/test/java/io/shardingsphere/transaction/xa/jta/AllJTATests.java
...ava/io/shardingsphere/transaction/xa/jta/AllJTATests.java
+1
-3
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/test/java/io/shardingsphere/transaction/xa/jta/connection/SingleXAConnectionTest.java
...transaction/xa/jta/connection/SingleXAConnectionTest.java
+1
-1
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/test/java/io/shardingsphere/transaction/xa/manager/atomikos/AtomikosXARecoverableResourceTest.java
...a/manager/atomikos/AtomikosXARecoverableResourceTest.java
+1
-1
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-spi/src/main/java/io/shardingsphere/transaction/xa/spi/SingleXAResource.java
...o/shardingsphere/transaction/xa/spi/SingleXAResource.java
+1
-1
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-spi/src/main/java/io/shardingsphere/transaction/xa/spi/XATransactionManager.java
...ardingsphere/transaction/xa/spi/XATransactionManager.java
+3
-4
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-spi/src/test/java/io/shardingsphere/transaction/xa/spi/AllTests.java
...t/java/io/shardingsphere/transaction/xa/spi/AllTests.java
+29
-0
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-spi/src/test/java/io/shardingsphere/transaction/xa/spi/SingleXAResourceTest.java
...ardingsphere/transaction/xa/spi/SingleXAResourceTest.java
+1
-1
未找到文件。
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/main/java/io/shardingsphere/transaction/xa/jta/connection/SingleXAConnection.java
浏览文件 @
b4cf0bc0
...
...
@@ -17,13 +17,12 @@
package
io.shardingsphere.transaction.xa.jta.connection
;
import
io.shardingsphere.transaction.xa.
jta.resource
.SingleXAResource
;
import
io.shardingsphere.transaction.xa.
spi
.SingleXAResource
;
import
lombok.RequiredArgsConstructor
;
import
javax.sql.ConnectionEventListener
;
import
javax.sql.StatementEventListener
;
import
javax.sql.XAConnection
;
import
javax.transaction.xa.XAResource
;
import
java.sql.Connection
;
import
java.sql.SQLException
;
...
...
@@ -40,7 +39,7 @@ public final class SingleXAConnection implements XAConnection {
private
final
XAConnection
delegate
;
@Override
public
XAResource
getXAResource
()
throws
SQLException
{
public
Single
XAResource
getXAResource
()
throws
SQLException
{
return
new
SingleXAResource
(
resourceName
,
delegate
.
getXAResource
());
}
...
...
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/main/java/io/shardingsphere/transaction/xa/manager/atomikos/AtomikosTransactionManager.java
浏览文件 @
b4cf0bc0
...
...
@@ -20,12 +20,12 @@ package io.shardingsphere.transaction.xa.manager.atomikos;
import
com.atomikos.icatch.config.UserTransactionService
;
import
com.atomikos.icatch.config.UserTransactionServiceImp
;
import
com.atomikos.icatch.jta.UserTransactionManager
;
import
io.shardingsphere.transaction.xa.spi.SingleXAResource
;
import
io.shardingsphere.transaction.xa.spi.XATransactionManager
;
import
lombok.SneakyThrows
;
import
javax.sql.XADataSource
;
import
javax.transaction.Status
;
import
javax.transaction.xa.XAResource
;
/**
* Atomikos XA transaction manager.
...
...
@@ -55,7 +55,7 @@ public final class AtomikosTransactionManager implements XATransactionManager {
@Override
@SneakyThrows
public
void
enlistResource
(
final
XAResource
xaResource
)
{
public
void
enlistResource
(
final
Single
XAResource
xaResource
)
{
underlyingTransactionManager
.
getTransaction
().
enlistResource
(
xaResource
);
}
...
...
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/main/java/io/shardingsphere/transaction/xa/manager/atomikos/AtomikosXARecoverableResource.java
浏览文件 @
b4cf0bc0
...
...
@@ -18,7 +18,7 @@
package
io.shardingsphere.transaction.xa.manager.atomikos
;
import
com.atomikos.datasource.xa.jdbc.JdbcTransactionalResource
;
import
io.shardingsphere.transaction.xa.
jta.resource
.SingleXAResource
;
import
io.shardingsphere.transaction.xa.
spi
.SingleXAResource
;
import
javax.sql.XADataSource
;
import
javax.transaction.xa.XAResource
;
...
...
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/test/java/io/shardingsphere/transaction/xa/XAShardingTransactionEngineTest.java
浏览文件 @
b4cf0bc0
...
...
@@ -25,6 +25,7 @@ import io.shardingsphere.transaction.api.TransactionType;
import
io.shardingsphere.transaction.xa.fixture.DataSourceUtils
;
import
io.shardingsphere.transaction.xa.jta.connection.SingleXAConnection
;
import
io.shardingsphere.transaction.xa.jta.datasource.SingleXADataSource
;
import
io.shardingsphere.transaction.xa.spi.SingleXAResource
;
import
io.shardingsphere.transaction.xa.spi.XATransactionManager
;
import
lombok.SneakyThrows
;
import
org.junit.Before
;
...
...
@@ -36,7 +37,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import
javax.sql.DataSource
;
import
javax.sql.XADataSource
;
import
javax.transaction.Status
;
import
javax.transaction.xa.XAResource
;
import
java.lang.reflect.Field
;
import
java.sql.Connection
;
import
java.util.HashMap
;
...
...
@@ -120,7 +120,7 @@ public class XAShardingTransactionEngineTest {
setCachedSingleXADataSourceMap
(
"ds1"
);
Connection
actual
=
xaShardingTransactionEngine
.
getConnection
(
"ds1"
);
assertThat
(
actual
,
instanceOf
(
Connection
.
class
));
verify
(
xaTransactionManager
).
enlistResource
(
any
(
XAResource
.
class
));
verify
(
xaTransactionManager
).
enlistResource
(
any
(
Single
XAResource
.
class
));
}
@Test
...
...
@@ -152,10 +152,10 @@ public class XAShardingTransactionEngineTest {
SingleXADataSource
singleXADataSource
=
mock
(
SingleXADataSource
.
class
);
SingleXAConnection
singleXAConnection
=
mock
(
SingleXAConnection
.
class
);
XADataSource
xaDataSource
=
mock
(
XADataSource
.
class
);
XAResource
xaResource
=
mock
(
XAResource
.
class
);
SingleXAResource
singleXAResource
=
mock
(
Single
XAResource
.
class
);
Connection
connection
=
mock
(
Connection
.
class
);
when
(
singleXAConnection
.
getConnection
()).
thenReturn
(
connection
);
when
(
singleXAConnection
.
getXAResource
()).
thenReturn
(
xa
Resource
);
when
(
singleXAConnection
.
getXAResource
()).
thenReturn
(
singleXA
Resource
);
when
(
singleXADataSource
.
getXAConnection
()).
thenReturn
(
singleXAConnection
);
when
(
singleXADataSource
.
getResourceName
()).
thenReturn
(
datasourceName
);
when
(
singleXADataSource
.
getXaDataSource
()).
thenReturn
(
xaDataSource
);
...
...
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/test/java/io/shardingsphere/transaction/xa/jta/AllJTATests.java
浏览文件 @
b4cf0bc0
...
...
@@ -31,15 +31,13 @@ import io.shardingsphere.transaction.xa.jta.datasource.properties.dialect.SQLSer
import
io.shardingsphere.transaction.xa.jta.datasource.swapper.DataSourcePropertyProviderLoaderTest
;
import
io.shardingsphere.transaction.xa.jta.datasource.swapper.DataSourceSwapperTest
;
import
io.shardingsphere.transaction.xa.jta.datasource.swapper.impl.DefaultDataSourcePropertyProviderTest
;
import
io.shardingsphere.transaction.xa.jta.resource.SingleXAResourceTest
;
import
org.junit.runner.RunWith
;
import
org.junit.runners.Suite
;
import
org.junit.runners.Suite.SuiteClasses
;
@RunWith
(
Suite
.
class
)
@SuiteClasses
({
SingleXAResourceTest
.
class
,
XAPropertiesFactoryTest
.
class
,
XAPropertiesFactoryTest
.
class
,
SingleXADataSourceTest
.
class
,
XADataSourceFactoryTest
.
class
,
DataSourcePropertyProviderLoaderTest
.
class
,
...
...
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/test/java/io/shardingsphere/transaction/xa/jta/connection/SingleXAConnectionTest.java
浏览文件 @
b4cf0bc0
...
...
@@ -17,7 +17,7 @@
package
io.shardingsphere.transaction.xa.jta.connection
;
import
io.shardingsphere.transaction.xa.
jta.resource
.SingleXAResource
;
import
io.shardingsphere.transaction.xa.
spi
.SingleXAResource
;
import
lombok.SneakyThrows
;
import
org.junit.Before
;
import
org.junit.Test
;
...
...
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-core/src/test/java/io/shardingsphere/transaction/xa/manager/atomikos/AtomikosXARecoverableResourceTest.java
浏览文件 @
b4cf0bc0
...
...
@@ -17,7 +17,7 @@
package
io.shardingsphere.transaction.xa.manager.atomikos
;
import
io.shardingsphere.transaction.xa.
jta.resource
.SingleXAResource
;
import
io.shardingsphere.transaction.xa.
spi
.SingleXAResource
;
import
org.junit.Before
;
import
org.junit.Test
;
import
org.junit.runner.RunWith
;
...
...
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-
core/src/main/java/io/shardingsphere/transaction/xa/jta/resource
/SingleXAResource.java
→
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-
spi/src/main/java/io/shardingsphere/transaction/xa/spi
/SingleXAResource.java
浏览文件 @
b4cf0bc0
...
...
@@ -15,7 +15,7 @@
* </p>
*/
package
io.shardingsphere.transaction.xa.
jta.resource
;
package
io.shardingsphere.transaction.xa.
spi
;
import
lombok.Getter
;
import
lombok.RequiredArgsConstructor
;
...
...
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-spi/src/main/java/io/shardingsphere/transaction/xa/spi/XATransactionManager.java
浏览文件 @
b4cf0bc0
...
...
@@ -20,7 +20,6 @@ package io.shardingsphere.transaction.xa.spi;
import
io.shardingsphere.transaction.core.ShardingTransactionManager
;
import
javax.sql.XADataSource
;
import
javax.transaction.xa.XAResource
;
/**
* XA transaction manager.
...
...
@@ -52,9 +51,9 @@ public interface XATransactionManager extends ShardingTransactionManager, AutoCl
void
removeRecoveryResource
(
String
dataSourceName
,
XADataSource
xaDataSource
);
/**
* Enlist resource.
* Enlist
single XA
resource.
*
* @param
xaResourc
e XA resource
* @param
singleXAResource singl
e XA resource
*/
void
enlistResource
(
XAResource
xa
Resource
);
void
enlistResource
(
SingleXAResource
singleXA
Resource
);
}
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-spi/src/test/java/io/shardingsphere/transaction/xa/spi/AllTests.java
0 → 100644
浏览文件 @
b4cf0bc0
/*
* Copyright 2016-2018 shardingsphere.io.
* <p>
* Licensed 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.
* </p>
*/
package
io.shardingsphere.transaction.xa.spi
;
import
org.junit.runner.RunWith
;
import
org.junit.runners.Suite
;
import
org.junit.runners.Suite.SuiteClasses
;
@RunWith
(
Suite
.
class
)
@SuiteClasses
(
SingleXAResourceTest
.
class
)
public
final
class
AllTests
{
}
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-
core/src/test/java/io/shardingsphere/transaction/xa/jta/resource
/SingleXAResourceTest.java
→
sharding-transaction/sharding-transaction-2pc/sharding-transaction-xa/sharding-transaction-xa-
spi/src/test/java/io/shardingsphere/transaction/xa/spi
/SingleXAResourceTest.java
浏览文件 @
b4cf0bc0
...
...
@@ -15,7 +15,7 @@
* </p>
*/
package
io.shardingsphere.transaction.xa.
jta.resource
;
package
io.shardingsphere.transaction.xa.
spi
;
import
org.junit.Before
;
import
org.junit.Test
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录