Juergen Hoeller
aa48dec697
Merge branch '5.3.x'
...
# Conflicts:
# build.gradle
# spring-jms/src/main/java/org/springframework/jms/connection/CachingConnectionFactory.java
2022-06-14 15:14:10 +02:00
Juergen Hoeller
30c873b4b5
Move NestedServletExceptionTests to spring-web module
...
See gh-25162
2022-06-14 15:09:21 +02:00
Juergen Hoeller
4e1b9f1492
Replace deep exception message nesting with custom inclusion of cause messages
...
Includes deprecation of NestedServletException, whereas NestedCheckedException and NestedRuntimeException remain as base classes with several convenience methods.
Closes gh-25162
2022-06-14 14:00:28 +02:00
rstoyanchev
933965b7b4
Merge branch '5.3.x'
2022-06-14 12:20:34 +01:00
rstoyanchev
8c777111fa
Revise commit #52d068 with corrected test
...
Update test detecting RouterFunction beans in parent contexts to use
different bean names and avoid shadowing. Changed the fix accordingly
given that BeanProvider does detect beans in parent contexts.
See gh-28595
2022-06-14 10:07:56 +01:00
rstoyanchev
d28d603081
Polishing
...
See gh-28595
2022-06-14 09:35:17 +01:00
rstoyanchev
52d0681ca1
WebMvc respects RouterFunction beans ordering
...
Closes gh-28595
2022-06-14 09:20:19 +01:00
Sébastien Deleuze
2b76a12b86
Refine build time init configuration
...
For Spring MVC and RestTemplate.
See gh-28518
2022-06-13 14:54:57 +02:00
Stephane Nicoll
0992f855e6
Add base infra for Web controllers hints
...
See gh-28518
2022-06-13 14:52:45 +02:00
Arjen Poutsma
216a266856
Polish
2022-06-08 17:00:58 +02:00
christophejan
bbabf8d855
Add minimal Kotlin DSL RouterFunction attributes support
...
Closes gh-28567
2022-06-08 16:49:46 +02:00
christophejan
5b1bda5c7c
Add test case on nested RouterFunction attributes
2022-06-08 16:49:46 +02:00
Sam Brannen
0a7a53af6d
Polish contribution
...
See gh-27609
2022-06-03 13:59:55 +02:00
Vedran Pavic
864dcf67d8
Simplify default locale/timezone resolution in cookie/session locale resolvers
...
At present, the customization of the default locale and timezone
resolution in CookieLocaleResolver and SessionLocaleResolver requires
subclassing them and overriding determineDefaultLocale and/or
determineDefaultTimeZone methods.
This commit simplifies resolution of the default locale and timezone
resolution by introducing dedicated functions for these purposes, thus
allowing customization without needing to resort to subclassing the
locale resolvers.
Closes gh-27609
2022-06-03 13:59:46 +02:00
Vedran Pavic
94cc2da33b
Update LocaleContextResolver to implement LocaleResolver
...
This commit updates LocaleContextResolver to implement LocaleResolver
using default methods, which simplifies AbstractLocaleContextResolver
and aligns it more closely with AbstractLocaleResolver.
See gh-27609
2022-06-03 13:59:38 +02:00
Vedran Pavic
9a0eb8db28
Update AcceptHeaderLocaleResolver to extend AbstractLocaleResolver
...
This commit updates AcceptHeaderLocaleResolver to extend
AbstractLocaleResolver, which allows the removal of defaultLocale
managing code in AcceptHeaderLocaleResolver.
See gh-27609
2022-06-03 13:59:30 +02:00
Sam Brannen
73acab7635
Merge branch '5.3.x'
...
# Conflicts:
# spring-webmvc/src/main/java/org/springframework/web/servlet/support/RequestContextUtils.java
2022-06-03 13:35:22 +02:00
Sam Brannen
aab9da0366
Polish LocaleResolver support
2022-06-03 13:10:55 +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
b659030867
Merge branch '5.3.x'
2022-05-31 12:01:39 +02:00
Sam Brannen
8547f8601d
Polish LocaleResolver tests
2022-05-31 11:55:30 +02:00
rstoyanchev
5e979af95a
Merge branch '5.3.x'
2022-05-23 11:24:58 +01:00
rstoyanchev
f95bf96ec9
Correct path encoding/decoding in PathResourceResolver
...
Decoding is required for non-UrlResource when the HandlerMapping is
not expected to decode the path. Encoding is the opposite.
This commit ensures correct determination of whether the HandlerMapping
is expected to have decoded the path or not that in turn depends on
whether PathPattern or PathMatcher is in use.
Closes gh-27791
2022-05-23 11:03:42 +01:00
rstoyanchev
66a5742df3
Polishing
2022-05-23 10:07:03 +01:00
Sam Brannen
874077d16e
Apply "advanced" instanceof pattern matching
2022-05-17 11:24:32 +02:00
Sam Brannen
0cf2bd0bcf
Suppress warning in test in Gradle build
2022-05-14 17:10:54 +02:00
rstoyanchev
f0e23b66f3
The "consumes" condition compares MediaType parameters
...
Closes gh-9257
2022-05-11 17:52:04 +01:00
Andy Wilkinson
1d825440c3
Update Javadoc since type-level @Controller is now required
...
See gh-22154 which removed support for a type-level @RequestMapping
annotation alone being sufficient for handler detection.
Closes gh-28448
2022-05-11 16:46:10 +02:00
Sam Brannen
6325ca95a6
Merge branch '5.3.x'
...
# Conflicts:
# gradle.properties
# spring-webmvc/src/test/java/org/springframework/web/servlet/DispatcherServletTests.java
2022-05-11 16:20:09 +02:00
Sam Brannen
06679a5583
Fix tests in DispatcherServletTests
...
See gh-28424
2022-05-11 16:00:26 +02:00
Sam Brannen
745eb1a881
Polish DispatcherServletTests
2022-05-11 15:59:47 +02:00
Sam Brannen
eb50a6f4a0
Further polishing regarding JDK baseline upgrade
...
See gh-28440
2022-05-10 17:01:40 +02:00
lihan
a892ce80c1
Polishing regarding JDK baseline upgrade
...
Closes gh-28440
2022-05-10 17:01:40 +02:00
Sam Brannen
d45b5f6e8a
Merge branch '5.3.x'
...
# Conflicts:
# spring-webflux/src/main/java/org/springframework/web/reactive/resource/VersionResourceResolver.java
# spring-webmvc/src/main/java/org/springframework/web/servlet/resource/VersionResourceResolver.java
2022-05-10 11:44:14 +02:00
Sam Brannen
1c10cdd1e8
Update copyright dates
...
See gh-28433
2022-05-10 11:33:32 +02:00
evgeny.bovykin
941b92cbed
Make inner classes static when feasible
...
A static nested class does not keep an implicit reference to its
enclosing instance.
This prevents a common cause of memory leaks and uses less memory per
instance of the class.
Closes gh-28433
2022-05-10 11:32:37 +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
rstoyanchev
8378af9e39
Polishing
...
See gh-28189
2022-05-09 19:01:10 +01:00
rstoyanchev
78ab4d7118
Support content negotiation for RFC 7807
...
Closes gh-28189
2022-05-09 18:32:21 +01:00
Sam Brannen
e26d8839b3
Stop referring to features as Java 6/7 features where unnecessary
2022-05-09 19:09:06 +02:00
Sam Brannen
9b1c8a3a5c
Fix broken ToStringVisitorTests
...
Tests were broken due to the switch to Set.of(...) in
2b65f274dc
2022-05-07 16:45:46 +02:00
Juergen Hoeller
2b65f274dc
Use Set.of instead of HashSet with Arrays.asList
2022-05-06 16:19:27 +02:00
Stephane Nicoll
b4f4fd71c9
Merge branch '5.3.x'
2022-04-24 09:57:16 +02:00
Stephane Nicoll
b81c62d064
Update copyright year of changed file
...
See gh-28372
2022-04-24 09:56:39 +02:00
zhangmingqi09
ca1a11acac
Fix github issue reference in RequestMappingHandlerMapping
...
See gh-28372
2022-04-24 09:55:20 +02:00
Sam Brannen
081c6463e9
Polish Javadoc for PathVariableMapMethodArgumentResolver
2022-04-16 17:57:44 +02:00
dugenkui03
ffffa055f0
Return UnmodifiableMap in MVC PathVariableMapMethodArgumentResolver
...
See gh-28127
Closes gh-28352
2022-04-16 17:57:44 +02:00
Sam Brannen
1574fed90b
Merge branch '5.3.x'
2022-04-13 10:08:31 +02:00
Sam Brannen
a7cf19cec5
Improve documentation and matching algorithm in data binders
2022-04-13 09:55:40 +02:00
