Juergen Hoeller
3fd89c3ac1
Fix merge result
...
See gh-25706
2020-09-05 13:12:19 +02:00
Juergen Hoeller
9d7849c539
Merge branch '5.2.x'
...
# Conflicts:
# spring-expression/src/main/java/org/springframework/expression/spel/ast/MethodReference.java
2020-09-05 13:02:01 +02:00
Juergen Hoeller
939c76c4a5
Revise documentation notes on getParameterType performance issues
...
See gh-25679
2020-09-05 13:00:06 +02:00
Juergen Hoeller
40bf83c9e5
Restore original 4.x behavior for initialization of function return name
...
Closes gh-25707
2020-09-05 12:59:34 +02:00
Juergen Hoeller
c368ce8223
Fix SpEL generated code for default method invocation
...
Closes gh-25706
2020-09-05 12:59:12 +02:00
Andy Clement
a404bf5a94
Fix SpEL generated code for default method invocation
...
Closes gh-25706
2020-09-04 22:23:13 -07:00
Juergen Hoeller
4044f4c30f
Polishing
2020-09-03 23:56:36 +02:00
Yanming Zhou
a2bb59f1b8
Replace StringBuffer with StringBuilder where possible
2020-09-03 22:40:51 +02:00
Juergen Hoeller
33195da64f
Fix assertion for the revised SQLExceptionTranslator contract in 5.3
...
See gh-25681
2020-09-03 19:34:54 +02:00
Juergen Hoeller
3aae0fc91b
Merge branch '5.2.x'
2020-09-03 19:21:44 +02:00
Juergen Hoeller
670b9fd60b
Retry SQLErrorCodesFactory retrieval if DatabaseMetaData access failed
...
Includes deprecation of JdbcUtils.extractDatabaseMetaData(DataSource, String) in favor of the now generified version of extractDatabaseMetaData(DataSource, DatabaseMetaDataCallback).
Closes gh-25681
Closes gh-25686
2020-09-03 19:16:14 +02:00
Arjen Poutsma
d550d344d5
Respect context path in WebMvc.fn & WebFlux.fn
...
This commit makes several changes in both WebMvc.fn as well as
WebFlux.fn.
- ServerRequest now exposes a RequestPath through requestPath(), and
pathContainer() has been deprecated.
- The PathPredicate and PathResourceLookupFunction now respects this
RequestPath's pathInApplication() in their path-related
functionality.
- When nesting, the PathPredicate now appends the matched part of the
path to the current context path, instead of removing the matched
part (which was done previously). This has the same result: the
matched part is gone, but now the full path stays the same.
Closes gh-25270
2020-09-03 15:10:56 +02:00
Brian Clozel
88249b2d9a
Polish StartupStep "tags" method
...
Renaming the `tags` method to `getTags` for overall consistency, and
fixing the Javadoc to mention that this returns an immutable collection.
Closes gh-25678
2020-09-02 17:57:38 +02:00
Stephane Nicoll
f55b48f4b4
Merge branch '5.2.x'
2020-09-02 14:44:22 +02:00
Stephane Nicoll
c2363a6ef9
Make DataSize serializable
...
Closes gh-25675
2020-09-02 14:39:12 +02:00
Stephane Nicoll
a06deac5db
Merge branch '5.2.x'
2020-09-02 11:29:25 +02:00
Stephane Nicoll
cdfdc340d2
Log cache hit and cache miss for synchronized access
...
Closes gh-25248
2020-09-02 11:29:03 +02:00
Rossen Stoyanchev
e02ccc9374
Optional WebSocket engine presence in WebFlux config
...
Closes gh-22587
2020-09-02 10:05:58 +01:00
Juergen Hoeller
689adb4bd0
Merge branch '5.2.x'
...
# Conflicts:
# build.gradle
2020-09-01 23:46:11 +02:00
Juergen Hoeller
7bd6b8d279
Upgrade to Checkstyle 8.36
2020-09-01 23:41:34 +02:00
Juergen Hoeller
141470ff58
Explicit nullability declarations for getTarget() implementations
2020-09-01 23:26:22 +02:00
Juergen Hoeller
e20bff9c64
Consistent data class constructor resolution with clear error message
...
MVC data class processor constructs target instance even in case of binding failure, as long as the corresponding method parameter is not marked as optional.
Closes gh-24372
2020-09-01 19:10:32 +02:00
Juergen Hoeller
278c6d5cdb
Redeclare postProcessProperties callback to skip postProcessPropertyValues
...
See gh-25165
2020-09-01 11:12:06 +02:00
Rossen Stoyanchev
25165f552d
Remove erroneously committed change
2020-09-01 09:42:38 +01:00
Juergen Hoeller
e365e0221a
Merge branch '5.2.x'
...
# Conflicts:
# spring-web/src/main/java/org/springframework/web/util/UrlPathHelper.java
2020-09-01 10:30:59 +02:00
Juergen Hoeller
d62202f464
Polishing
2020-09-01 10:27:36 +02:00
Juergen Hoeller
bcdc2503fa
Avoid repeated calls to getPathWithinApplication from getLookupPathForRequest
...
Closes gh-25669
2020-09-01 10:27:04 +02:00
tristeza
61311248bf
change assert in replaceOverride constructor from methodName to methodReplacerBeanName
2020-09-01 10:10:08 +02:00
Johnny Lim
603d7e93b9
Copy httpHandlerDecorator in copy constructor for WebHttpHandlerBuilder
...
This commit also polishes its Javadoc and fixes its test along the way.
2020-09-01 10:09:34 +02:00
Rossen Stoyanchev
e34c800467
More updates to Web testing section
...
See gh-19647
2020-09-01 08:56:57 +01:00
Rossen Stoyanchev
c6b87b3ef4
Updates to Web testing sections of reference docs
...
Closes gh-19647
2020-08-31 21:15:17 +01:00
Rossen Stoyanchev
9b6476c0a1
Rename MockMvcTestClient to MockMvcWebTestClient
...
Closes gh-19647
2020-08-31 21:15:17 +01:00
Rossen Stoyanchev
591ab8a00a
@EnableWebFlux setup supports WebSocketHandler
...
Closes gh-22587
2020-08-31 21:15:17 +01:00
Juergen Hoeller
8f369ffed5
Merge branch '5.2.x'
...
# Conflicts:
# build.gradle
2020-08-31 18:07:04 +02:00
Juergen Hoeller
3a73533b1c
Upgrade Gradle plugins to latest patch releases
2020-08-31 18:01:22 +02:00
Juergen Hoeller
d8c420ab75
Avoid full singleton lock for getSingleton(beanName, false)
...
Closes gh-25667
2020-08-31 18:00:51 +02:00
Сергей Цыпанов
1f3e52d932
gh-25650 Replace remaining usage of LinkedList with ArrayList in tests
2020-08-31 14:33:14 +02:00
Juergen Hoeller
79cf6b4353
Merge branch '5.2.x'
2020-08-30 12:18:49 +02:00
Juergen Hoeller
97d84d9ab8
Upgrade to AssertJ 3.17.1
2020-08-30 12:16:14 +02:00
Juergen Hoeller
ae4160e131
Avoid direct use of non-exported XStream CompositeClassLoader class
...
Closes gh-25662
2020-08-30 12:15:45 +02:00
Сергей Цыпанов
a033660425
Improve performance of JdkDynamicAopProxy.getProxy()
2020-08-30 11:40:08 +02:00
Rossen Stoyanchev
7bc8035989
Replace http with https in docs sample
2020-08-28 22:30:57 +01:00
Rossen Stoyanchev
42aeb6cd93
Update docs on timeouts with WebClient
...
Closes gh-25115
2020-08-28 22:19:01 +01:00
Rossen Stoyanchev
c4e1e4ee1e
WebFlux AbstractUrlHandlerMapping support URI vars
...
Closes gh-25648
2020-08-28 21:56:28 +01:00
Rossen Stoyanchev
a8d953afa4
CloseStatus implements Serializable
...
Closes gh-25507
2020-08-28 20:43:45 +01:00
Rossen Stoyanchev
bb941b6180
OrderedMessageChannelDecorator doesn't preclude send limits
...
Closes gh-25581
2020-08-28 20:40:55 +01:00
Juergen Hoeller
c4f4fbc003
Polishing
2020-08-28 20:14:24 +02:00
Juergen Hoeller
00c5dbf11a
Merge branch '5.2.x'
...
# Conflicts:
# spring-beans/src/main/java/org/springframework/beans/CachedIntrospectionResults.java
2020-08-28 20:01:17 +02:00
Juergen Hoeller
bb9e79daa7
Polishing
2020-08-28 19:58:56 +02:00
Juergen Hoeller
6d9d4157ef
Specifically detect Joda-Time 2.x
...
Closes gh-25655
2020-08-28 19:57:51 +02:00