Skip to content

Commit 3a653bd

Browse files
committed
Deprecate JCA CCI support
Closes gh-25287
1 parent e0e1c12 commit 3a653bd

30 files changed

+124
-1196
lines changed

spring-tx/src/main/java/org/springframework/jca/cci/CannotCreateRecordException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
*
2727
* @author Juergen Hoeller
2828
* @since 1.2
29+
* @deprecated as of 5.3, in favor of specific data access APIs
30+
* (or native CCI usage if there is no alternative)
2931
*/
32+
@Deprecated
3033
@SuppressWarnings("serial")
3134
public class CannotCreateRecordException extends DataAccessResourceFailureException {
3235

spring-tx/src/main/java/org/springframework/jca/cci/CannotGetCciConnectionException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
* @author Thierry Templier
2727
* @author Juergen Hoeller
2828
* @since 1.2
29+
* @deprecated as of 5.3, in favor of specific data access APIs
30+
* (or native CCI usage if there is no alternative)
2931
*/
32+
@Deprecated
3033
@SuppressWarnings("serial")
3134
public class CannotGetCciConnectionException extends DataAccessResourceFailureException {
3235

spring-tx/src/main/java/org/springframework/jca/cci/CciOperationNotSupportedException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
*
2626
* @author Juergen Hoeller
2727
* @since 1.2
28+
* @deprecated as of 5.3, in favor of specific data access APIs
29+
* (or native CCI usage if there is no alternative)
2830
*/
31+
@Deprecated
2932
@SuppressWarnings("serial")
3033
public class CciOperationNotSupportedException extends InvalidDataAccessResourceUsageException {
3134

spring-tx/src/main/java/org/springframework/jca/cci/InvalidResultSetAccessException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,10 @@
3030
* @author Juergen Hoeller
3131
* @since 1.2
3232
* @see javax.resource.cci.ResultSet
33+
* @deprecated as of 5.3, in favor of specific data access APIs
34+
* (or native CCI usage if there is no alternative)
3335
*/
36+
@Deprecated
3437
@SuppressWarnings("serial")
3538
public class InvalidResultSetAccessException extends InvalidDataAccessResourceUsageException {
3639

spring-tx/src/main/java/org/springframework/jca/cci/RecordTypeNotSupportedException.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@
2626
*
2727
* @author Juergen Hoeller
2828
* @since 1.2
29+
* @deprecated as of 5.3, in favor of specific data access APIs
30+
* (or native CCI usage if there is no alternative)
2931
*/
32+
@Deprecated
3033
@SuppressWarnings("serial")
3134
public class RecordTypeNotSupportedException extends InvalidDataAccessResourceUsageException {
3235

spring-tx/src/main/java/org/springframework/jca/cci/connection/CciLocalTransactionManager.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,10 @@
6161
* @see ConnectionFactoryUtils#releaseConnection
6262
* @see TransactionAwareConnectionFactoryProxy
6363
* @see org.springframework.jca.cci.core.CciTemplate
64+
* @deprecated as of 5.3, in favor of specific data access APIs
65+
* (or native CCI usage if there is no alternative)
6466
*/
67+
@Deprecated
6568
@SuppressWarnings("serial")
6669
public class CciLocalTransactionManager extends AbstractPlatformTransactionManager
6770
implements ResourceTransactionManager, InitializingBean {

spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionFactoryUtils.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.apache.commons.logging.Log;
2525
import org.apache.commons.logging.LogFactory;
2626

27-
import org.springframework.jca.cci.CannotGetCciConnectionException;
2827
import org.springframework.lang.Nullable;
2928
import org.springframework.transaction.support.ResourceHolderSynchronization;
3029
import org.springframework.transaction.support.TransactionSynchronizationManager;
@@ -49,7 +48,10 @@
4948
* @see CciLocalTransactionManager
5049
* @see org.springframework.transaction.jta.JtaTransactionManager
5150
* @see org.springframework.transaction.support.TransactionSynchronizationManager
51+
* @deprecated as of 5.3, in favor of specific data access APIs
52+
* (or native CCI usage if there is no alternative)
5253
*/
54+
@Deprecated
5355
public abstract class ConnectionFactoryUtils {
5456

5557
private static final Log logger = LogFactory.getLog(ConnectionFactoryUtils.class);
@@ -68,7 +70,9 @@ public abstract class ConnectionFactoryUtils {
6870
* if the attempt to get a Connection failed
6971
* @see #releaseConnection
7072
*/
71-
public static Connection getConnection(ConnectionFactory cf) throws CannotGetCciConnectionException {
73+
public static Connection getConnection(ConnectionFactory cf)
74+
throws org.springframework.jca.cci.CannotGetCciConnectionException {
75+
7276
return getConnection(cf, null);
7377
}
7478

@@ -89,7 +93,7 @@ public static Connection getConnection(ConnectionFactory cf) throws CannotGetCci
8993
* @see #releaseConnection
9094
*/
9195
public static Connection getConnection(ConnectionFactory cf, @Nullable ConnectionSpec spec)
92-
throws CannotGetCciConnectionException {
96+
throws org.springframework.jca.cci.CannotGetCciConnectionException {
9397
try {
9498
if (spec != null) {
9599
Assert.notNull(cf, "No ConnectionFactory specified");
@@ -100,7 +104,7 @@ public static Connection getConnection(ConnectionFactory cf, @Nullable Connectio
100104
}
101105
}
102106
catch (ResourceException ex) {
103-
throw new CannotGetCciConnectionException("Could not get CCI Connection", ex);
107+
throw new org.springframework.jca.cci.CannotGetCciConnectionException("Could not get CCI Connection", ex);
104108
}
105109
}
106110

spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionHolder.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,10 @@
3232
* @since 1.2
3333
* @see CciLocalTransactionManager
3434
* @see ConnectionFactoryUtils
35+
* @deprecated as of 5.3, in favor of specific data access APIs
36+
* (or native CCI usage if there is no alternative)
3537
*/
38+
@Deprecated
3639
public class ConnectionHolder extends ResourceHolderSupport {
3740

3841
private final Connection connection;

spring-tx/src/main/java/org/springframework/jca/cci/connection/ConnectionSpecConnectionFactoryAdapter.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,10 @@
6464
* @author Juergen Hoeller
6565
* @since 1.2
6666
* @see #getConnection
67+
* @deprecated as of 5.3, in favor of specific data access APIs
68+
* (or native CCI usage if there is no alternative)
6769
*/
70+
@Deprecated
6871
@SuppressWarnings("serial")
6972
public class ConnectionSpecConnectionFactoryAdapter extends DelegatingConnectionFactory {
7073

spring-tx/src/main/java/org/springframework/jca/cci/connection/DelegatingConnectionFactory.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@
4040
* @author Juergen Hoeller
4141
* @since 1.2
4242
* @see #getConnection
43+
* @deprecated as of 5.3, in favor of specific data access APIs
44+
* (or native CCI usage if there is no alternative)
4345
*/
46+
@Deprecated
4447
@SuppressWarnings("serial")
4548
public class DelegatingConnectionFactory implements ConnectionFactory, InitializingBean {
4649

0 commit comments

Comments
 (0)