root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity
33,367 Commits 18 Branches 346 Tags 380 MiB
Commit Graph

1101 Commits

Author SHA1 Message Date
Juergen Hoeller 321a804449 Merge branch '6.2.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details
2025-07-28 22:07:53 +02:00
Juergen Hoeller f3832c7262 Add note on SQL types with SqlBinaryValue/SqlCharacterValue
Backport Bot / build (push) Waiting to run Details
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details 
Closes gh-34786
 2025-07-28 22:06:38 +02:00
Juergen Hoeller 16e99f289c Accept support for generated keys column name array on HSQLDB/Derby 
Closes gh-34790
 2025-07-28 22:04:18 +02:00
Juergen Hoeller dacaf7fd56 Align @Nullable annotation 2025-07-28 20:33:33 +02:00
Juergen Hoeller 2a0a1fa67a Merge branch '6.2.x' 
# Conflicts:
#	spring-jdbc/src/main/java/org/springframework/jdbc/core/metadata/GenericTableMetaDataProvider.java
 2025-07-28 20:32:30 +02:00
Juergen Hoeller 642e554c52 Process PostgreSQL-returned catalog/schema names in given case 
Closes gh-35064
 2025-07-28 20:28:45 +02:00
Sébastien Deleuze a61b297967 Specify flexible generics nullness in spring-jdbc 
This commit leverages flexible generics nullness at method and
type level when relevant in spring-jdbc.

Due to https://github.com/uber/NullAway/issues/1075, some related
`@SuppressWarnings("NullAway")` have been added.

JdbcOperations Kotlin extensions have been refined accordingly.

Closes gh-34911
 2025-07-07 16:35:25 +02:00
Juergen Hoeller 9406e7ee2a Add additional javadoc notes on 7.0 
See gh-34709
See gh-34757
 2025-07-07 14:08:43 +02:00
Yanming Zhou 88257f7dfd Discard further rows once maxRows has been reached 
See https://github.com/spring-projects/spring-framework/issues/34666#issuecomment-2773151317

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-07-07 13:37:31 +02:00
Juergen Hoeller 8cb901825b Merge branch '6.2.x' 
# Conflicts:
#	spring-jdbc/src/main/java/org/springframework/jdbc/core/JdbcTemplate.java
#	spring-jms/src/main/java/org/springframework/jms/core/JmsTemplate.java
#	spring-messaging/src/main/java/org/springframework/messaging/core/AbstractDestinationResolvingMessagingTemplate.java
#	spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessageReceivingTemplate.java
#	spring-messaging/src/main/java/org/springframework/messaging/core/AbstractMessagingTemplate.java
#	spring-messaging/src/main/java/org/springframework/messaging/core/MessageRequestReplyOperations.java
#	spring-messaging/src/main/java/org/springframework/messaging/core/MessageSendingOperations.java
 2025-07-04 18:31:13 +02:00
Juergen Hoeller 65e5c14245 Polishing
Backport Bot / build (push) Waiting to run Details
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details
2025-07-04 18:20:27 +02:00
Juergen Hoeller 842f582afc Specify fetchSize/maxRows/queryTimeout per statement in JdbcClient 
Closes gh-35155
 2025-07-04 17:36:18 +02:00
Juergen Hoeller 196b7ec275 Deprecate (Jdbc)DaoSupport classes (including JmsGatewaySupport) 
Closes gh-35145
 2025-07-02 11:12:57 +02:00
Sébastien Deleuze 294406dae9 Remove `@Suppress("EXTENSION_SHADOWED_BY_MEMBER")`
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details 
Fixed in Kotlin 2.2.0 and IntelliJ IDEA IDEA 2024.2 EAP, see
https://youtrack.jetbrains.com/issue/KT-75169 related issue.

See gh-34453
 2025-06-24 11:40:23 +02:00
Juergen Hoeller 6927e39e6b Merge branch '6.2.x' 2025-06-18 12:23:07 +02:00
Juergen Hoeller e33adadc62 Detect SQL state 57014 as QueryTimeoutException 
Closes gh-35073
 2025-06-18 12:20:09 +02:00
Sam Brannen 74ee1b991a Apply consistent copyright headers in Kotlin source code 
See gh-35070
 2025-06-17 16:24:15 +02:00
Spring Builds 16edf9867a Update copyright headers in source files 
This commit updates Java, Kotlin, and Groovy source files to use the
"<year>-present" pattern in copyright headers.

Closes gh-35070
 2025-06-17 16:23:50 +02:00
Sam Brannen 103a7e58bb Apply consistent copyright headers in Kotlin source code 
See gh-35070
 2025-06-17 15:54:58 +02:00
Spring Builds aee29b7f30 Update copyright headers in source files 
This commit updates Java, Kotlin, and Groovy source files to use the
"<year>-present" pattern in copyright headers.

Closes gh-35070
 2025-06-17 15:54:58 +02:00
rstoyanchev 230540b6da Polishing contribution 
Closes gh-34942
 2025-06-04 13:46:22 +01:00
Yanming Zhou f9fa7cc93b Add missing "since" in `@Deprecated` 
See gh-34942

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-06-04 13:46:22 +01:00
Sam Brannen f4f0e52003 Stop declaring parameters as final in JdbcTemplate
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details 
The affected parameters are "effectively final" and are therefore no
longer required to be declared as "final" on modern JDKs.
 2025-05-16 14:46:40 +02:00
Sam Brannen d0bf8faf48 Implement PreparedStatementCallback as lambda expression 2025-05-16 14:45:52 +02:00
Sam Brannen 61a517ea3b Merge branch '6.2.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details
2025-04-22 12:46:52 +02:00
Sam Brannen 2f60083cd5 Add integration tests for reused named parameters from bean properties
Backport Bot / build (push) Waiting to run Details
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details 
See gh-34768
 2025-04-22 12:45:35 +02:00
Sam Brannen c5e865494e Merge branch '6.2.x' 2025-04-17 15:48:48 +02:00
Sam Brannen 018d3c9ef2 Add integration tests for reused named parameters
Backport Bot / build (push) Has been cancelled Details
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:ubuntu-latest name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:ubuntu-latest name:Linux]) (push) Has been cancelled Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:ubuntu-latest name:Linux]) (push) Has been cancelled Details
Deploy Docs / Dispatch docs deployment (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details 
See gh-34768
 2025-04-17 15:48:24 +02:00
Juergen Hoeller 7bb7456686 Merge branch '6.2.x' 
# Conflicts:
#	spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
#	spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
 2025-04-10 18:37:07 +02:00
Juergen Hoeller eea6addd26 Avoid lenient locking for additional external bootstrap threads 
Includes spring.locking.strict revision to differentiate between true, false, not set.
Includes checkFlag accessor on SpringProperties, also used in StatementCreatorUtils.

Closes gh-34729
See gh-34303
 2025-04-10 18:33:21 +02:00
Juergen Hoeller 8d48a1e34b Merge branch '6.2.x'
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details
2025-04-05 16:14:06 +02:00
Juergen Hoeller cc5ae23915 Suppress rollback attempt in case of timeout (connection closed)
Backport Bot / build (push) Waiting to run Details
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details 
Closes gh-34714
 2025-04-05 16:03:31 +02:00
Yanming Zhou 5be83e9223 Stop calling deprecated JdbcOperations methods 
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-03-28 14:40:51 +01:00
Juergen Hoeller 7d5b3892c4 Add since 7.0 tags for stream methods
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Has been cancelled Details
Deploy Docs / Dispatch docs deployment (push) Has been cancelled Details
Build and Deploy Snapshot / Verify (push) Has been cancelled Details 
See gh-34623
 2025-03-21 18:44:57 +01:00
Yanming Zhou 8819c749ce Introduce Stream variant methods for SqlQuery 
Closes GH-34474

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-03-21 18:38:28 +01:00
Juergen Hoeller 47651350f3 Polishing
Backport Bot / build (push) Waiting to run Details
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details
2025-03-21 10:58:40 +01:00
Juergen Hoeller 0e1422820f JdbcClient holds ConversionService for queries with mapped classes 
Closes gh-33467
 2025-03-21 10:43:37 +01:00
Sam Brannen e05d4f2f18 Merge branch '6.2.x' 2025-03-18 16:42:37 +01:00
Sam Brannen c6a9aa59a3 Remove BDDMockito Checkstyle rule 
This commit removes the BDDMockito Checkstyle rule, since it did not
actually enforce the use of BDDMockito.

This commit also updates static imports to use Mockito instead of
BDDMockito where appropriate (automated via the Eclipse IDE Organize
Imports clean-up task).

Closes gh-34616
 2025-03-18 16:35:57 +01:00
Sam Brannen 5ffd88cd89 Remove deprecated rowsExpected property of SqlQuery 
Closes gh-34530

Co-authored-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-03-03 14:45:22 +01:00
Sam Brannen e9345f16dc Merge branch '6.2.x' 2025-03-03 14:34:06 +01:00
Sam Brannen 30d793cefe Revise deprecation of SqlQuery.rowsExpected 
Closes gh-34526
 2025-03-03 14:33:19 +01:00
Yanming Zhou 78cc5df748 Deprecate unused "rowsExpected" property of SqlQuery for removal 
See gh-34526

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-03-03 14:33:14 +01:00
Juergen Hoeller b610711235 Merge branch '6.2.x' 2025-02-28 14:15:36 +01:00
Juergen Hoeller c64dae3623 Avoid getTargetConnection call on transaction-aware Connection close 
Closes gh-34484
 2025-02-28 14:12:51 +01:00
Yanming Zhou 7f020118eb Polish JdbcTemplate to use getter instead of field 
1. align with others in the same source file
2. allow subclass to override

Closes: gh-34501
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
 2025-02-27 19:11:14 +01:00
Stéphane Nicoll 35dea59ce4 Polish "Prevent further configuration once SqlCall is compiled" 
See gh-33729
 2025-02-04 15:45:18 +01:00
Dan Sievewright 8810913f30 Prevent further configuration once SqlCall is compiled 
This commit prevents AbstractJdbcCall to be further configured once it
is compiled.

See gh-33729
 2025-02-04 15:43:01 +01:00
Johnny Lim 042b78f609 Fix Javadoc @code tags 
Signed-off-by: Johnny Lim <izeye@naver.com>
 2025-01-30 13:33:42 +09:00
Sébastien Deleuze 8299a617b9 Specify generic type nullness in spring-jdbc 
See gh-34140
 2025-01-14 12:35:02 +01:00