Sam Brannen
ee209de9cf
Merge branch '5.3.x'
...
# Conflicts:
# spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
# spring-context/src/test/java/org/springframework/ejb/access/LocalSlsbInvokerInterceptorTests.java
# spring-context/src/test/java/org/springframework/ejb/access/SimpleRemoteSlsbInvokerInterceptorTests.java
# spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
# spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java
2022-05-31 14:15:36 +02:00
Sam Brannen
1beb7068f6
Use new AssertJ exception assertions
2022-05-31 14:08:28 +02:00
Sam Brannen
70415b1781
Merge branch '5.3.x'
2022-05-17 15:41:08 +02:00
Sam Brannen
59c7bb1f86
Use Arrays.toString instead of Arrays.asList when generating Strings
2022-05-17 15:36:31 +02:00
Sam Brannen
874077d16e
Apply "advanced" instanceof pattern matching
2022-05-17 11:24:32 +02:00
Juergen Hoeller
c1a5b462c2
Merge branch '5.3.x'
...
# Conflicts:
# build.gradle
2022-05-10 13:39:31 +02:00
Juergen Hoeller
c81e11d537
Polishing
2022-05-10 13:07:00 +02:00
Sam Brannen
5f8a4bcdc5
Merge branch '5.3.x'
...
# Conflicts:
# spring-context/src/main/java/org/springframework/jmx/export/MBeanExporter.java
# spring-context/src/main/java/org/springframework/scripting/support/StandardScriptFactory.java
2022-05-09 20:08:37 +02:00
Sam Brannen
e26d8839b3
Stop referring to features as Java 6/7 features where unnecessary
2022-05-09 19:09:06 +02:00
Juergen Hoeller
7e1782ea22
Merge branch '5.3.x'
...
# Conflicts:
# build.gradle
# spring-core/src/main/java/org/springframework/core/convert/Property.java
2022-04-08 13:10:34 +02:00
Juergen Hoeller
90103b0ae9
Consistent support for direct column matches in DataClassRowMapper
...
Closes gh-28243
2022-04-08 13:00:31 +02:00
Juergen Hoeller
c3aed75b92
Merge branch '5.3.x'
...
# Conflicts:
# build.gradle
2022-03-16 11:24:24 +01:00
Juergen Hoeller
46363c337b
Avoid confusing debug log entries with DataClassRowMapper
...
Closes gh-28179
2022-03-16 11:21:43 +01:00
Sam Brannen
04fbfddb13
Polish contribution
...
See gh-28011
2022-02-05 19:12:13 +01:00
lijun695
1e0e477833
Apply "instanceof pattern matching" in AbstractRoutingDataSource
...
Closes gh-28011
2022-02-05 18:58:08 +01:00
Sam Brannen
b3f786728e
Use modern language features in tests
2022-02-03 15:35:32 +01:00
Sam Brannen
32cd73261a
Apply "switch expressions" where applicable
2022-02-03 15:21:18 +01:00
Sam Brannen
54565e95b5
Merge branch '5.3.x'
2022-02-03 14:58:36 +01:00
Sam Brannen
f8a5a8d7be
Use modern language features in tests
2022-02-03 14:50:10 +01:00
Sam Brannen
8e2bb5f3af
Merge branch '5.3.x'
2022-01-28 16:40:58 +01:00
Sam Brannen
fb312d0ed5
Improve Javadoc for DatabasePopulator
...
See gh-27008
2022-01-28 16:40:35 +01:00
Sam Brannen
19da4e309f
Merge branch '5.3.x'
2022-01-17 16:55:08 +01:00
Sam Brannen
420c4f3df3
Explicitly test BeanPropertyRowMapper.underscoreName(String)
...
See gh-27929
2022-01-17 16:54:03 +01:00
Sam Brannen
420ff46b2a
Polishing
2022-01-17 16:54:03 +01:00
Marten Deinum
261bc2ad6a
Fix regression in BeanPropertyRowMapper.underscoreName(String)
...
Commit 6316a35
introduced a regression for property names starting with
multiple uppercase letters (such as setEMail(...)).
This commit fixes that regression and includes an additional test to
cover this case.
See gh-27929
Closes gh-27941
2022-01-17 16:53:36 +01:00
Sam Brannen
ab88ff374a
Merge branch '5.3.x'
2022-01-08 17:24:53 +01:00
Sam Brannen
51d263bd06
Simplify H2SequenceMaxValueIncrementerTests
...
@hpoettker made me aware of the ModeEnum in H2 that allows the
parameterized test to be simplified, which was the primary impetus for
this commit.
See gh-27870
2022-01-08 17:24:19 +01:00
Sam Brannen
b981e36174
Merge branch '5.3.x'
2022-01-07 16:18:52 +01:00
Sam Brannen
90072d06fb
Test H2SequenceMaxValueIncrementer against all H2 2.0.x compatibility modes
...
See gh-27870
2022-01-07 16:17:11 +01:00
Sam Brannen
7769ded887
Merge branch '5.3.x'
2022-01-07 14:31:32 +01:00
Sam Brannen
75e1811470
Ensure H2SequenceMaxValueIncrementer works with all H2 compatibility modes
...
See gh-27870
2022-01-07 14:29:17 +01:00
Sam Brannen
18781e58ac
Polish contribution
...
See gh-27870
2022-01-07 10:09:45 +01:00
Henning Poettker
ed4e2289cd
Support H2 1.4 & 2.0 in H2SequenceMaxValueIncrementer
...
Prior to this commit, H2SequenceMaxValueIncrementer only supported H2
database 1.4.
This commit updates H2SequenceMaxValueIncrementer's getSequenceQuery()
method so that the syntax used supports version 1.4 and 2.0 of the H2
database.
This commit also updates several test schemas so that they work with H2
1.4 and 2.0 as well as HSQL.
Closes gh-27870
2022-01-07 10:09:27 +01:00
a.yazychyan
ab240f5d8e
Use String.repeat() and pattern matching instanceof
...
Closes gh-27834
2022-01-03 17:11:23 +01:00
Juergen Hoeller
64b6beed5b
Consistent support for square brackets around named parameter
...
See gh-27716
2021-12-14 11:34:48 +01:00
Sam Brannen
a0d54105e9
Use new features in JUnit Jupiter 5.8.2
...
See gh-27744
2021-11-30 13:00:28 +01:00
Stephane Nicoll
974d326bf5
Merge branch '5.3.x'
2021-11-22 16:17:17 +01:00
Stephane Nicoll
b67e97d388
Polish
2021-11-22 16:13:37 +01:00
Stephane Nicoll
5eafcac3d6
Merge branch '5.3.x'
2021-11-22 13:46:45 +01:00
Stephane Nicoll
23babe27bb
Polish "Add tests for AbstractRoutingDataSource"
...
See gh-1330
2021-11-22 13:43:08 +01:00
Kazuki Shimizu
bcb9f159ca
Add tests for AbstractRoutingDataSource
...
See gh-1330
2021-11-22 13:43:08 +01:00
Stephane Nicoll
bee0af2b26
Merge branch '5.3.x'
2021-11-22 13:21:28 +01:00
Stephane Nicoll
544f357661
Polish "Refine StoredProcedure#declareParameter Javadoc"
...
See gh-1000
2021-11-22 13:20:16 +01:00
awgtek
ca4f338d75
Refine StoredProcedure#declareParameter Javadoc
...
See gh-1000
2021-11-22 13:18:24 +01:00
Juergen Hoeller
4750a9430c
Early removal of 5.x-deprecated code
...
Closes gh-27686
2021-11-18 09:18:06 +01:00
Sam Brannen
971f665eb1
Apply "instanceof pattern matching" in spring-jdbc
...
This commit also applies additional clean-up tasks such as the following.
- final fields
This has only been applied to `src/main/java`.
2021-10-14 19:55:14 +02:00
Sam Brannen
4fc359f75e
Merge branch '5.3.x'
2021-10-14 15:19:56 +02:00
Sam Brannen
0853baaa3f
Fix Javadoc in [NamedParameter]JdbcOperations.queryForObject methods
...
This commit fixes the Javadoc in all queryForObject(...) methods in
JdbcOperations and NamedParameterJdbcOperations regarding what kinds of
exceptions are thrown under which conditions.
Closes gh-27559
2021-10-14 15:15:23 +02:00
Sam Brannen
49c8cb5a60
Merge branch '5.3.x'
2021-10-13 19:23:18 +02:00
Sam Brannen
89c7797ffb
Commit in DatabasePopulatorUtils if Connection has auto-commit=false
...
Prior to this commit, DatabasePopulatorUtils.execute(...) did not
perform a commit for the current Connection. This works for most use
cases; however, when DatabasePopulatorUtils is used to execute
initialization scripts without a managed transaction -- for example,
via a DataSourceInitializer configured as a bean in the
ApplicationContext or via Spring Boot configuration in
application.properties -- if the underlying database is configured with
auto-commit=false, the results of executing the SQL scripts are not
committed to the database which can lead to data being silently lost.
This commit addresses this issue by committing the Connection for the
supplied DataSource if the connection is not configured for auto-commit
and is not transactional. Existing use cases running with a managed
transaction should therefore not be affected by this change.
Closes gh-27008
2021-10-13 19:10:09 +02:00