Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,232 Commits 18 Branches 0 Tags
d2db43a900b739fcae84d23daa4e2b46078f9dce
Commit Graph

21232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Brannen
d2db43a900 Polish Javadoc 2020-07-27 14:38:24 +02:00
Sam Brannen
27e0febacf Polish MockHttpServletResponseTests 2020-07-26 09:57:25 +02:00
Sam Brannen
a03f894a14 Merge branch '5.2.x' 2020-07-25 15:48:53 +02:00
Sam Brannen
5442d8779a Polish contribution 
See gh-25429
 2020-07-25 15:24:36 +02:00
yilianhuaixiao
650cbeee14 Avoid infinite loop in AnnotationScanner 
Prior to this commit, scanning for annotations resulted in an infinite
loop when using the INHERITED_ANNOTATIONS search strategy and a class
filter that filters out visited classes.

This commit avoids an infinite loop in AnnotationsScanner's
processClassInheritedAnnotations(...) method by skipping the current
level of the class hierarchy when the current source class has been
filtered out.

Closes gh-25429
 2020-07-25 15:23:21 +02:00
Arjen Poutsma
cf8c36adf3 Javadoc 
Add Javadoc note explaining that StringUtils.cleanPath should not be
depended on in security context.
 2020-07-23 17:43:20 +02:00
Sébastien Deleuze
05683fed7a Skip LoadTimeWeaverAwareProcessor with native images 2020-07-23 12:13:20 +02:00
Juergen Hoeller
718d46adac Check for alias overriding bean definition of same name 
Closes gh-25430
 2020-07-22 18:42:53 +02:00
Sam Brannen
32b35e9a23 Merge branch '5.2.x' 2020-07-22 17:28:57 +02:00
Sam Brannen
335c3d5db6 Polish contribution 
See gh-25445
 2020-07-22 17:26:59 +02:00
XenoAmess
ab859fcc96 Refine use of substring operations 
Closes gh-25445
 2020-07-22 17:26:42 +02:00
Sam Brannen
a8901e3cf8 Polish contribution 
See gh-25445
 2020-07-22 16:36:14 +02:00
XenoAmess
edfc6c0293 Refine use of substring operations 
Closes gh-25445
 2020-07-22 16:28:58 +02:00
Sam Brannen
cdc234d7db Polish contribution 
See gh-25446
 2020-07-22 14:06:29 +02:00
XenoAmess
c547809e89 Use instanceof instead of Class#isInstance where feasible 
Closes gh-25446
 2020-07-22 14:06:29 +02:00
Rossen Stoyanchev
9fe1feea9a Provide access to underlying RSocketClient 
The recently introduced support for RSocketClient in commit
7c98251142 did not expose the underlying
client in order to avoid a hard dependency on RSocket 1.1 for the time
being. However such access appears to be necessary, e.g. for Spring
Integration, where the connection needs to be established (warmed up)
ahead of actual requests.

See gh-25332
 2020-07-22 14:57:33 +03:00
Rossen Stoyanchev
f9ba58eab9 Match subscriptions to remove by id 
Commit 524ca1a676 unintentionally changed
how subscriptions to be removed are matched. This commit restores that.

See gh-25298
 2020-07-22 13:22:29 +03:00
Sam Brannen
471577a11b Polish contribution 
See gh-25454
 2020-07-22 11:35:31 +02:00
XenoAmess
523d2f88be Use List.sort instead of Collection.sort in tests 
Closes gh-25454
 2020-07-22 11:32:50 +02:00
Sam Brannen
ae5913f3b6 Polish tests 
See gh-25456
 2020-07-22 11:09:52 +02:00
XenoAmess
cd12583e13 Use Integer.parseInt instead of Integer.valueOf for primitive int 
Closes gh-25456
 2020-07-22 10:54:32 +02:00
Sam Brannen
24f9b1d966 Delete unused import 2020-07-22 10:40:59 +02:00
XenoAmess
e4a139e70e Use System.currentTimeMillis() in AbstractSockJsService 
Closes gh-25447
 2020-07-22 10:39:27 +02:00
XenoAmess
3b12beb1b8 Simplify if-statements with instanceof checks 
Closes gh-25449
 2020-07-22 10:34:27 +02:00
XenoAmess
c7f44ff671 Fix links in Javadoc 
Closes gh-25448
 2020-07-22 10:24:55 +02:00
XenoAmess
fa0a1446f0 Use StringBuilder instead of StringBuffer in tests 
Closes gh-25450
 2020-07-22 10:21:06 +02:00
Sungho Hwang
2522fe0292 Fix typos in Javadoc 
Closes gh-25458
 2020-07-22 10:18:36 +02:00
Sam Brannen
2719dcb29b Delete unused imports 2020-07-22 10:14:08 +02:00
XenoAmess
b6c463676a Use Stream#toArray in TestCompiler 
Closes gh-25453
 2020-07-21 20:44:54 +02:00
XenoAmess
e71f702bb9 Use static private instead of private static for method declarations 
Closes gh-25452
 2020-07-21 18:26:28 +02:00
Brian Clozel
05ef630f4f Merge branch '5.2.x' 2020-07-21 11:05:32 +02:00
Spring Buildmaster
fc6b38a8f6 Next Development Version 2020-07-21 08:20:59 +00:00
Jay Bryant
674bad0c59 Wording changes 
Replace potentially insensitive language with more neutral language.

See gh-25314
 2020-07-20 20:08:54 +02:00
Sam Brannen
3d64f8162c Merge branch '5.2.x' 2020-07-20 18:38:32 +02:00
Jay Bryant
1c83b3fc22 Wording changes 
Replace potentially insensitive language with more neutral language.

Closes gh-25314
 2020-07-20 17:14:13 +02:00
Juergen Hoeller
6b6e8be313 Upgrade to Mockito 3.4.4 2020-07-20 17:07:23 +02:00
Rossen Stoyanchev
7ce4d150ce Merge branch '5.2.x' 2020-07-20 18:02:22 +03:00
Rossen Stoyanchev
913eca9e14 ReactorNettyRequestUpgradeStrategy uses unique builder per request 
See gh-25315
 2020-07-20 17:55:23 +03:00
Juergen Hoeller
6c7f18e902 Upgrade to Jetty Reactive HttpClient 1.1.4 2020-07-20 16:47:52 +02:00
Juergen Hoeller
64f4703445 Defer creating logger in StandardWebSocketHandlerAdapter to instantiation time 
Closes gh-25427
 2020-07-20 16:47:32 +02:00
Rossen Stoyanchev
eb032a50a0 Upgrade to Reactor Dysprosium-SR10 
Closes gh-25376
 2020-07-20 16:48:33 +03:00
Arjen Poutsma
74d3044641 Merge pull request #25415 from thenx-wei/master 
* gh-25415:
  Simplify PathResourceLookupFunction
 2020-07-20 11:11:14 +02:00
May
24b1caf434 Simplify PathResourceLookupFunction 
This commit simplified two return statements.
 2020-07-20 11:04:32 +02:00
Juergen Hoeller
88394bff66 Merge branch '5.2.x' 2020-07-20 07:21:36 +02:00
Juergen Hoeller
65e601090f Copy queryParams MultiValueMap through addAll (for independent List entries) 
Closes gh-25423
 2020-07-20 07:07:17 +02:00
Juergen Hoeller
f1345aadf5 Defensively access existing beanDefinitionMap entries 
See gh-22263
 2020-07-20 07:04:45 +02:00
Juergen Hoeller
e4e54b3c4a Merge branch '5.2.x' 2020-07-19 20:01:21 +02:00
Juergen Hoeller
43e315f10c Unwrap SqlParameterValue for disposable value detection in cleanupParameters 
Closes gh-22972
 2020-07-19 19:59:15 +02:00
Juergen Hoeller
30bc5e09e7 Defensively catch NoSuchBeanDefinitionException on beanDefinitionNames traversal 
Closes gh-22263
 2020-07-19 19:56:33 +02:00
Juergen Hoeller
7b6924522a Avoid unnecessarily alarming stack trace logged during scheduler resolution 
Closes gh-23268
 2020-07-19 19:55:19 +02:00