@ -1,5 +1,5 @@
/ *
/ *
* Copyright 2002 - 2013 the original author or authors .
* Copyright 2002 - 2014 the original author or authors .
*
*
* Licensed under the Apache License , Version 2 . 0 ( the "License" ) ;
* Licensed under the Apache License , Version 2 . 0 ( the "License" ) ;
* you may not use this file except in compliance with the License .
* you may not use this file except in compliance with the License .
@ -53,9 +53,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
ptm . afterPropertiesSet ( ) ;
ptm . afterPropertiesSet ( ) ;
DefaultTransactionDefinition definition = new DefaultTransactionDefinition ( ) ;
DefaultTransactionDefinition definition = new DefaultTransactionDefinition ( ) ;
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback ( ) {
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
return "result" ;
return "result" ;
}
}
} ) ) ;
} ) ) ;
@ -80,9 +80,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
DefaultTransactionDefinition definition = new DefaultTransactionDefinition ( ) ;
DefaultTransactionDefinition definition = new DefaultTransactionDefinition ( ) ;
TransactionStatus ts = ptm . getTransaction ( definition ) ;
TransactionStatus ts = ptm . getTransaction ( definition ) ;
ptm . commit ( ts ) ;
ptm . commit ( ts ) ;
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback ( ) {
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
return "result" ;
return "result" ;
}
}
} ) ) ;
} ) ) ;
@ -101,9 +101,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
definition . setPropagationBehavior ( TransactionDefinition . PROPAGATION_MANDATORY ) ;
definition . setPropagationBehavior ( TransactionDefinition . PROPAGATION_MANDATORY ) ;
try {
try {
ptm . execute ( definition , new TransactionCallback ( ) {
ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
return "result" ;
return "result" ;
}
}
} ) ;
} ) ;
@ -171,9 +171,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback ( ) {
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
if ( synchMode = = WebSphereUowTransactionManager . SYNCHRONIZATION_ALWAYS ) {
if ( synchMode = = WebSphereUowTransactionManager . SYNCHRONIZATION_ALWAYS ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
@ -255,9 +255,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback ( ) {
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
if ( synchMode ! = WebSphereUowTransactionManager . SYNCHRONIZATION_NEVER ) {
if ( synchMode ! = WebSphereUowTransactionManager . SYNCHRONIZATION_NEVER ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
@ -293,9 +293,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback ( ) {
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
@ -329,9 +329,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
try {
try {
ptm . execute ( definition , new TransactionCallback ( ) {
ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
@ -364,9 +364,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
try {
try {
ptm . execute ( definition , new TransactionCallback ( ) {
ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
@ -398,9 +398,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback ( ) {
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
@ -429,9 +429,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback ( ) {
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
@ -457,9 +457,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
definition . setPropagationBehavior ( TransactionDefinition . PROPAGATION_NEVER ) ;
definition . setPropagationBehavior ( TransactionDefinition . PROPAGATION_NEVER ) ;
try {
try {
ptm . execute ( definition , new TransactionCallback ( ) {
ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
return "result" ;
return "result" ;
}
}
} ) ;
} ) ;
@ -478,9 +478,9 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
definition . setPropagationBehavior ( TransactionDefinition . PROPAGATION_NESTED ) ;
definition . setPropagationBehavior ( TransactionDefinition . PROPAGATION_NESTED ) ;
try {
try {
ptm . execute ( definition , new TransactionCallback ( ) {
ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
return "result" ;
return "result" ;
}
}
} ) ;
} ) ;
@ -515,15 +515,15 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback ( ) {
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertEquals ( "result2" , ptm . execute ( definition2 , new TransactionCallback ( ) {
assertEquals ( "result2" , ptm . execute ( definition2 , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
@ -564,15 +564,15 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback ( ) {
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertEquals ( "result2" , ptm . execute ( definition2 , new TransactionCallback ( ) {
assertEquals ( "result2" , ptm . execute ( definition2 , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertEquals ( propagationBehavior = = TransactionDefinition . PROPAGATION_REQUIRES_NEW ,
assertEquals ( propagationBehavior = = TransactionDefinition . PROPAGATION_REQUIRES_NEW ,
TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
@ -611,15 +611,15 @@ public class WebSphereUowTransactionManagerTests extends TestCase {
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback ( ) {
assertEquals ( "result" , ptm . execute ( definition , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertEquals ( "result2" , ptm . execute ( definition2 , new TransactionCallback ( ) {
assertEquals ( "result2" , ptm . execute ( definition2 , new TransactionCallback < String > ( ) {
@Override
@Override
public Object doInTransaction ( TransactionStatus status ) {
public String doInTransaction ( TransactionStatus status ) {
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isSynchronizationActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertFalse ( TransactionSynchronizationManager . isActualTransactionActive ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;
assertTrue ( TransactionSynchronizationManager . isCurrentTransactionReadOnly ( ) ) ;