Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,317 Commits 18 Branches 0 Tags
e1acbca4e4a07c65676b41ac01f96039576af7de
Commit Graph

23317 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephane Nicoll
e1acbca4e4 Merge branch '5.3.x' 2021-12-10 15:11:24 +01:00
Stephane Nicoll
b1352e1833 Upgrade to Log4j2 2.15.0 2021-12-10 15:05:56 +01:00
Sam Brannen
101d92c166 Merge branch '5.3.x' 2021-12-10 13:54:50 +01:00
Sam Brannen
b2e94f611f Convert single null argument to Optional.empty() in SpEL varargs expression 
Prior to this commit, if a single null value was passed to a method with
a varargs array of type java.util.Optional, that null value was passed
unmodified. On the contrary, a null passed with additional values to
such a method resulted in the null being converted to Optional.empty().

This commit ensures that a single null value is also converted to
Optional.empty() for such SpEL expressions.

Closes gh-27795
 2021-12-10 13:53:28 +01:00
Sam Brannen
62f480adc3 Merge branch '5.3.x' 2021-12-10 13:13:36 +01:00
Sam Brannen
ad7cdc5ce9 Fix regression for null varargs in SpEL expressions 
A regression was introduced in gh-27582. Specifically, when null is
supplied as the single argument for a varargs parameter in a method or
function in a SpEL expression, ReflectionHelper currently throws a
NullPointerException instead of leaving the null value unchanged.

This commit fixes this regression.

Closes gh-27719
 2021-12-10 13:12:44 +01:00
Stephane Nicoll
8d6cc7dc10 Merge branch '5.3.x' 2021-12-10 08:03:52 +01:00
Stephane Nicoll
6cc9538ab9 Start building against Reactor 2020.0.14 snapshots 
See gh-27793
 2021-12-10 07:55:44 +01:00
Rossen Stoyanchev
a15393836c Merge branch '5.3.x' into main 2021-12-09 15:35:21 +00:00
Rossen Stoyanchev
e9083d7d20 Apply LogFormatUtils in more places 2021-12-09 14:53:52 +00:00
Stephane Nicoll
b5ffcfb4ba Merge branch '5.3.x' 2021-12-09 15:19:25 +01:00
Stephane Nicoll
98ce171b30 Revert "Mention explicitly that @EventListener should be put on public methods" 
This reverts commit 57a5370eec.

See gh-27777
 2021-12-09 15:18:56 +01:00
Stephane Nicoll
866708942c Merge branch '5.3.x' 2021-12-09 14:44:20 +01:00
Stephane Nicoll
57a5370eec Mention explicitly that @EventListener should be put on public methods 
Closes gh-27777
 2021-12-09 14:43:00 +01:00
Rossen Stoyanchev
3a43ca3a34 Merge branch '5.3.x' into main 2021-12-08 11:41:02 +00:00
Rossen Stoyanchev
99c7608ffe Replace both EOL and control characters 2021-12-08 11:25:38 +00:00
Arjen Poutsma
ce253041c5 Merge branch '5.3.x' 2021-12-07 13:57:40 +01:00
Arjen Poutsma
c0f79ee00a Merge pull request #25092 from jkatada:fix-ModelAndView-status-for-redirect 
* gh-25092:
  Fix for ModelAndView.status not working with RedirectView
 2021-12-07 13:56:19 +01:00
Katada, Junya
9261766677 Fix for ModelAndView.status not working with RedirectView 2021-12-07 13:39:57 +01:00
Arjen Poutsma
81af7330f6 Deprecate StringUtils::trimWhitespace and variants 
This commits deprecates
- StringUtils::trimWhitespace in favor of String::strip
- StringUtils::trimLeadingWhitespace in favor of String::stripLeading
- StringUtils::trimTrailingWhitespace in favor of String::stripTrailing

Closes gh-27769
 2021-12-06 13:37:16 +01:00
Arjen Poutsma
982ba0e86d Merge pull request #27703 from xixingya:feat/stringstrip 
* gh-27703:
  Use String::strip in StringUtils::trimWhitespace
 2021-12-06 13:36:46 +01:00
liuzhifei
68cf95f499 Use String::strip in StringUtils::trimWhitespace 
See gh-27703
 2021-12-06 11:29:43 +01:00
Juergen Hoeller
7f43128a0e Merge branch '5.3.x' 
# Conflicts:
#	build.gradle
#	spring-web/src/main/java/org/springframework/web/server/MediaTypeNotSupportedStatusException.java
#	spring-web/src/main/java/org/springframework/web/util/ContentCachingRequestWrapper.java
#	spring-webmvc/src/main/java/org/springframework/web/servlet/handler/HandlerMappingIntrospector.java
 2021-12-03 22:42:05 +01:00
Juergen Hoeller
14f24f43d7 Polishing 2021-12-03 22:36:31 +01:00
Juergen Hoeller
d7e0eed8d2 Clarify getBeanProvider(ResolvableType) semantics for unresolved generics 
Closes gh-27727
 2021-12-03 22:33:50 +01:00
Juergen Hoeller
7c834d98c2 Upgrade to ASM master (including early support for Java 19 bytecode) 
Closes gh-27740
 2021-12-03 22:32:26 +01:00
Juergen Hoeller
70974e006e Upgrade to Tomcat 9.0.55, Undertow 2.2.13, RxJava 3.1.3, SmallRye Mutiny 1.2, Joda-Time 2.10.13, JRuby 9.2.20.1, HtmlUnit 2.55, Checkstyle 9.2 2021-12-03 22:32:00 +01:00
Stephane Nicoll
110e0f7f2b Add support for Instant in @DateTimeFormat 
Closes gh-19846
 2021-12-03 16:17:52 +01:00
Arjen Poutsma
0a41da9ec9 Merge branch '5.3.x' 2021-12-03 12:52:30 +01:00
Arjen Poutsma
2f557d9583 Merge pull request #25358 from ivd-git:router-function-handler-not-found-to-exception-pr 
* gh-25358:
  Polish "Throw 404 ResponseStatusException when no routes found"
  Throw 404 ResponseStatusException when no routes found
 2021-12-03 12:51:44 +01:00
Arjen Poutsma
b84fe99d07 Polish "Throw 404 ResponseStatusException when no routes found" 
See gh-25358
 2021-12-03 12:01:49 +01:00
Ingmar van Dijk
69df27a99f Throw 404 ResponseStatusException when no routes found 
This commit makes it possible to customize 404 responses generated by
RouterFunctionWebHandler, by throwing an ResponseStatusException
instead of returning a standard 404 response.

See gh-25358
 2021-12-03 12:01:49 +01:00
Stephane Nicoll
8144f8666e Merge pull request #1215 from kazuki43zoo 
* pr/1215:
  Polish "Add support for YearMonth and MonthDay in @DateTimeFormat"
  Add support for YearMonth and MonthDay in @DateTimeFormat

Closes gh-1215
 2021-12-03 11:21:29 +01:00
Stephane Nicoll
a57ea39707 Polish "Add support for YearMonth and MonthDay in @DateTimeFormat" 
See gh-1215
 2021-12-03 11:20:04 +01:00
Kazuki Shimizu
65eceafeee Add support for YearMonth and MonthDay in @DateTimeFormat 
See gh-1215
 2021-12-03 10:59:38 +01:00
Rossen Stoyanchev
a9d2016007 Merge branch '5.3.x' into main 2021-12-03 09:27:11 +00:00
Rossen Stoyanchev
5649a6f8ef Update exchangeToMono Javadoc 
This time showing a more representative example.

See gh-27645
 2021-12-03 09:21:21 +00:00
Arjen Poutsma
ba568ff79c Merge branch '5.3.x' 2021-12-02 16:12:35 +01:00
Arjen Poutsma
be6eeafe78 Revert change createException to createError 
createError is not available in 5.3.

See gh-27645
 2021-12-02 15:59:51 +01:00
Arjen Poutsma
720c30ce84 Merge branch '5.3.x' 2021-12-02 15:12:01 +01:00
Arjen Poutsma
b77b45434f Change createException to createError 
See gh-27645
 2021-12-02 15:11:15 +01:00
Stephane Nicoll
1b4fa0370c Merge pull request #23927 from sokomishalov 
* pr/23927:
  Polish "Add Kotlin extensions for Cache and CacheManager"
  Add Kotlin extensions for Cache and CacheManager

Closes gh-23927
 2021-12-02 14:51:41 +01:00
Stephane Nicoll
65dc2afe9d Polish "Add Kotlin extensions for Cache and CacheManager" 
See gh-23927
 2021-12-02 14:51:29 +01:00
sokomishalov
5ec1e20242 Add Kotlin extensions for Cache and CacheManager 
See gh-23927
 2021-12-02 14:51:29 +01:00
Brian Clozel
24cb1def7d Polish 
Closes gh-27754
 2021-12-02 14:23:16 +01:00
Rossen Stoyanchev
2d2db530b1 Merge branch '5.3.x' into main 2021-12-02 12:35:48 +00:00
Rossen Stoyanchev
6582787678 Apply resources after application HttpClient mapper 
Closes gh-27749
 2021-12-02 12:28:36 +00:00
Rossen Stoyanchev
8b89128c7b Update createException example for WebClient 
Closes gh-27645
 2021-12-02 11:53:43 +00:00
Arjen Poutsma
9cc690a9bb Merge pull request #27356 from ydh6226:patch-1 
* gh-27356:
  Use HttpHeaders.ALLOW instead of String constant
 2021-12-02 12:32:55 +01:00
ydh6226
a0ba808217 Use HttpHeaders.ALLOW instead of String constant 
This commit changes "Allow" strings into HttpHeaders.ALLOW.

See gh-27356
 2021-12-02 12:28:36 +01:00