From 196b7ec275010056e4db25ae01818688abd3c0af Mon Sep 17 00:00:00 2001
From: Juergen Hoeller <juergen.hoeller@broadcom.com>
Date: Wed, 2 Jul 2025 11:12:57 +0200
Subject: [PATCH] Deprecate (Jdbc)DaoSupport classes (including
 JmsGatewaySupport)

Closes gh-35145
---
 .../jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java    | 4 ++++
 .../org/springframework/jdbc/core/support/JdbcDaoSupport.java | 4 ++++
 .../jdbc/core/support/JdbcDaoSupportTests.java                | 1 +
 .../springframework/jms/core/support/JmsGatewaySupport.java   | 3 +++
 .../jms/core/support/JmsGatewaySupportTests.java              | 1 +
 .../main/java/org/springframework/dao/support/DaoSupport.java | 2 ++
 6 files changed, 15 insertions(+)

diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
index 97bc7c6563d..5e7a6a8fa3e 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/namedparam/NamedParameterJdbcDaoSupport.java
@@ -28,7 +28,11 @@ import org.springframework.jdbc.core.support.JdbcDaoSupport;
  * @author Juergen Hoeller
  * @since 2.0
  * @see NamedParameterJdbcTemplate
+ * @deprecated as of 7.0, in favor of direct injection of {@link NamedParameterJdbcTemplate}
+ * or {@link org.springframework.jdbc.core.simple.JdbcClient}
  */
+@Deprecated(since = "7.0", forRemoval = true)
+@SuppressWarnings("removal")
 public class NamedParameterJdbcDaoSupport extends JdbcDaoSupport {
 
 	private @Nullable NamedParameterJdbcTemplate namedParameterJdbcTemplate;
diff --git a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
index 5729f009d4c..403de750755 100644
--- a/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
+++ b/spring-jdbc/src/main/java/org/springframework/jdbc/core/support/JdbcDaoSupport.java
@@ -45,7 +45,11 @@ import org.springframework.util.Assert;
  * @see #setDataSource
  * @see #getJdbcTemplate
  * @see org.springframework.jdbc.core.JdbcTemplate
+ * @deprecated as of 7.0, in favor of direct injection of {@link JdbcTemplate}
+ * or {@link org.springframework.jdbc.core.simple.JdbcClient}
  */
+@Deprecated(since = "7.0", forRemoval = true)
+@SuppressWarnings("removal")
 public abstract class JdbcDaoSupport extends DaoSupport {
 
 	private @Nullable JdbcTemplate jdbcTemplate;
diff --git a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
index 20156b50e7d..debb567875e 100644
--- a/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
+++ b/spring-jdbc/src/test/java/org/springframework/jdbc/core/support/JdbcDaoSupportTests.java
@@ -32,6 +32,7 @@ import static org.mockito.Mockito.mock;
  * @author Juergen Hoeller
  * @since 30.07.2003
  */
+@SuppressWarnings("removal")
 class JdbcDaoSupportTests {
 
 	@Test
diff --git a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
index 13e0103fda8..61694c1bcbd 100644
--- a/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
+++ b/spring-jms/src/main/java/org/springframework/jms/core/support/JmsGatewaySupport.java
@@ -39,7 +39,10 @@ import org.springframework.jms.core.JmsTemplate;
  * @see #setJmsTemplate
  * @see #createJmsTemplate
  * @see org.springframework.jms.core.JmsTemplate
+ * @deprecated as of 7.0, in favor of direct injection of {@link JmsTemplate}
+ * or {@link org.springframework.jms.core.JmsMessagingTemplate}
  */
+@Deprecated(since = "7.0", forRemoval = true)
 public abstract class JmsGatewaySupport implements InitializingBean {
 
 	/** Logger available to subclasses. */
diff --git a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
index b044eb37113..9a78e8e6d51 100644
--- a/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
+++ b/spring-jms/src/test/java/org/springframework/jms/core/support/JmsGatewaySupportTests.java
@@ -31,6 +31,7 @@ import static org.mockito.Mockito.mock;
  * @author Mark Pollack
  * @since 24.9.2004
  */
+@SuppressWarnings("removal")
 class JmsGatewaySupportTests {
 
 	@Test
diff --git a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
index b4ff8d2a66e..6ed15d45b61 100644
--- a/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
+++ b/spring-tx/src/main/java/org/springframework/dao/support/DaoSupport.java
@@ -31,7 +31,9 @@ import org.springframework.beans.factory.InitializingBean;
  * @author Juergen Hoeller
  * @since 1.2.2
  * @see org.springframework.jdbc.core.support.JdbcDaoSupport
+ * @deprecated as of 7.0, in favor of direct injection of client dependencies
  */
+@Deprecated(since = "7.0", forRemoval = true)
 public abstract class DaoSupport implements InitializingBean {
 
 	/** Logger available to subclasses. */