Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,702 Commits 18 Branches 0 Tags
60d2d16b2b67caa3f7fb95be4a4e955e149b51df
Commit Graph

751 Commits

Author SHA1 Message Date
Sam Brannen
0fb9de5d0e Merge branch '5.3.x' 2022-07-13 16:36:01 +02:00
Marc Wrobel
bd3499671c Fix typos in test code 
This commit fixes typos in test class names, test method names, and
test variable names.

Closes gh-28807
 2022-07-13 16:24:11 +02:00
Sam Brannen
ddd11610cf Merge branch '5.3.x' 
# Conflicts:
#	spring-jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
#	spring-orm/src/main/java/org/springframework/orm/jpa/JpaVendorAdapter.java
 2022-07-13 13:46:34 +02:00
Marc Wrobel
bca104798b Fix and improve Javadoc in spring-jdbc 
Closes gh-28796
 2022-07-13 13:42:48 +02:00
Juergen Hoeller
dfae4eec2d Merge branch '5.3.x' 
# Conflicts:
#	build.gradle
#	spring-core/src/main/java/org/springframework/cglib/core/ReflectUtils.java
#	spring-core/src/main/java/org/springframework/core/ResolvableType.java
#	spring-jdbc/src/main/java/org/springframework/jdbc/core/StatementCreatorUtils.java
#	spring-r2dbc/src/main/java/org/springframework/r2dbc/connection/R2dbcTransactionManager.java
 2022-07-13 11:16:13 +02:00
Juergen Hoeller
5247eeba84 Support LocalDate/Time for SQL type mappings 
Closes gh-28778
 2022-07-13 11:09:30 +02:00
Sam Brannen
2af08cf163 Merge branch '5.3.x' 
# Conflicts:
#	spring-core/src/test/java/org/springframework/core/annotation/TypeMappedAnnotationTests.java
#	spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
#	spring-test/src/test/java/org/springframework/test/util/MetaAnnotationUtilsTests.java
#	spring-test/src/test/java/org/springframework/test/util/OverriddenMetaAnnotationAttributesTests.java
 2022-07-09 16:24:04 +02:00
Sam Brannen
d274e893a6 Remove superfluous static declaration for enum, annotation, & interface 2022-07-09 16:16:13 +02:00
Sam Brannen
729c4e5434 Merge branch '5.3.x' 2022-07-01 10:43:38 +02:00
Sam Brannen
5650e20edd Polishing 2022-07-01 10:42:23 +02:00
Johnny Lim
2885177f5b Add @since tag for new CannotGetJdbcConnectionException constructor 
See gh-28669
Closes gh-28738
 2022-07-01 10:39:35 +02:00
Stephane Nicoll
a4ccec18f6 Merge branch '5.3.x' 2022-06-23 09:04:52 +02:00
Stephane Nicoll
e98b602d4f Polish "Fix DataSourceUtils inconsistent exception handling" 
See gh-28669
 2022-06-23 09:01:39 +02:00
Kevin Schönfeld
edfe5d2f18 Fix DataSourceUtils inconsistent exception handling 
Align IllegalStateException with SQLException handling and propagate
the original exception.

See gh-28669

Co-authored-by: Christoph Mies <chr.mi@web.de>
 2022-06-23 09:01:39 +02:00
Juergen Hoeller
d7be1e0dab Polishing 2022-06-14 15:09:39 +02:00
Juergen Hoeller
083113d8a4 Use SQLExceptionSubclassTranslator by default (avoiding sql-error-codes.xml) 
SQLErrorCodeSQLExceptionTranslator kicks in for user-provided sql-error-codes.xml files. It will still pick up Spring's legacy default error code mappings as well but only when triggered by a (potentially empty) user-provided file in the root of the classpath.

Closes gh-28216
 2022-06-14 14:00:56 +02:00
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