root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

TransactionTemplate equality for same transaction manager only 

Issue: SPR-16572
This commit is contained in:
Juergen Hoeller 2018-03-09 09:39:45 +01:00
parent cf74b1b8be
commit df8061494c
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-tx/src/main/java/org/springframework/transaction/support/DefaultTransactionDefinition.java
View File

@ -259,7 +259,7 @@ public class DefaultTransactionDefinition implements TransactionDefinition, Seri
*/
@Override
public boolean equals(Object other) {
return (other instanceof TransactionDefinition && toString().equals(other.toString()));
return (this == other || (other instanceof TransactionDefinition && toString().equals(other.toString())));
}
/**

9
spring-tx/src/main/java/org/springframework/transaction/support/TransactionTemplate.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -178,4 +178,11 @@ public class TransactionTemplate extends DefaultTransactionDefinition
}
}
@Override
public boolean equals(Object other) {
return (this == other || (super.equals(other) && (!(other instanceof TransactionTemplate) ||
getTransactionManager() == ((TransactionTemplate) other).getTransactionManager())));
}
}

25
spring-tx/src/test/java/org/springframework/transaction/TransactionSupportTests.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -83,6 +83,7 @@ public class TransactionSupportTests {
TestTransactionManager tm = new TestTransactionManager(false, true);
TransactionStatus status = tm.getTransaction(null);
tm.commit(status);
assertTrue("triggered begin", tm.begin);
assertTrue("triggered commit", tm.commit);
assertTrue("no rollback", !tm.rollback);
@ -94,6 +95,7 @@ public class TransactionSupportTests {
TestTransactionManager tm = new TestTransactionManager(false, true);
TransactionStatus status = tm.getTransaction(null);
tm.rollback(status);
assertTrue("triggered begin", tm.begin);
assertTrue("no commit", !tm.commit);
assertTrue("triggered rollback", tm.rollback);
@ -106,6 +108,7 @@ public class TransactionSupportTests {
TransactionStatus status = tm.getTransaction(null);
status.setRollbackOnly();
tm.commit(status);
assertTrue("triggered begin", tm.begin);
assertTrue("no commit", !tm.commit);
assertTrue("triggered rollback", tm.rollback);
@ -117,6 +120,7 @@ public class TransactionSupportTests {
TestTransactionManager tm = new TestTransactionManager(true, true);
TransactionStatus status = tm.getTransaction(null);
tm.commit(status);
assertTrue("no begin", !tm.begin);
assertTrue("no commit", !tm.commit);
assertTrue("no rollback", !tm.rollback);
@ -128,6 +132,7 @@ public class TransactionSupportTests {
TestTransactionManager tm = new TestTransactionManager(true, true);
TransactionStatus status = tm.getTransaction(null);
tm.rollback(status);
assertTrue("no begin", !tm.begin);
assertTrue("no commit", !tm.commit);
assertTrue("no rollback", !tm.rollback);
@ -140,6 +145,7 @@ public class TransactionSupportTests {
TransactionStatus status = tm.getTransaction(null);
status.setRollbackOnly();
tm.commit(status);
assertTrue("no begin", !tm.begin);
assertTrue("no commit", !tm.commit);
assertTrue("no rollback", !tm.rollback);
@ -155,6 +161,7 @@ public class TransactionSupportTests {
protected void doInTransactionWithoutResult(TransactionStatus status) {
}
});
assertTrue("triggered begin", tm.begin);
assertTrue("triggered commit", tm.commit);
assertTrue("no rollback", !tm.rollback);
@ -170,6 +177,7 @@ public class TransactionSupportTests {
protected void doInTransactionWithoutResult(TransactionStatus status) {
}
});
assertSame(template, ptm.getDefinition());
assertFalse(ptm.getStatus().isRollbackOnly());
}
@ -300,9 +308,22 @@ public class TransactionSupportTests {
assertTrue("Correct isolation level set", template.getIsolationLevel() == TransactionDefinition.ISOLATION_REPEATABLE_READ);
}
@Test
public void transactionTemplateEquality() {
TestTransactionManager tm1 = new TestTransactionManager(false, true);
TestTransactionManager tm2 = new TestTransactionManager(false, true);
TransactionTemplate template1 = new TransactionTemplate(tm1);
TransactionTemplate template2 = new TransactionTemplate(tm2);
TransactionTemplate template3 = new TransactionTemplate(tm2);
assertNotEquals(template1, template2);
assertNotEquals(template1, template3);
assertEquals(template2, template3);
}
@After
public void tearDown() {
public void clear() {
assertTrue(TransactionSynchronizationManager.getResourceMap().isEmpty());
assertFalse(TransactionSynchronizationManager.isSynchronizationActive());
}