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

18706 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Juergen Hoeller
ff838fd011 Consistently support CompletionStage in ReactiveAdapterRegistry 
Aligns ReactiveAdapterRegistry with MVC/messaging handler methods in terms of recognizing CompletionStage as well as CompletableFuture. Includes consistent use of ReactiveAdapter for reactive transactions.

Closes gh-23011
 2019-05-21 19:26:12 +02:00
Arjen Poutsma
9b3c92e8d2 Add leading slash for path predicate if not present 
This commit adds a leading slash for path predicates in both
WebFlux.fn and WebMvc.fn.

Closes gh-22795
 2019-05-21 12:09:36 +02:00
Juergen Hoeller
c329bad42a Merge branch '5.1.x' 2019-05-21 00:16:35 +02:00
Juergen Hoeller
8cd3daad0d Polishing 2019-05-21 00:15:40 +02:00
Juergen Hoeller
171e8f56a3 Merge branch '5.1.x' 2019-05-20 22:27:37 +02:00
Juergen Hoeller
75d751d968 Polishing 2019-05-20 22:19:11 +02:00
Juergen Hoeller
55e601c322 Revise system property replacement tests 
See gh-22959
 2019-05-20 22:19:03 +02:00
stsypanov
6f07a504b8 A couple of trivial simplifications 2019-05-20 21:41:15 +02:00
Phillip Webb
02850f357f Migrate exception checking tests to use AssertJ 
Migrate tests that use `@Test(expectedException=...)` or
`try...fail...catch` to use AssertJ's `assertThatException`
instead.
 2019-05-20 10:47:53 -07:00
Phillip Webb
fb26fc3f94 Polishing 2019-05-20 10:46:20 -07:00
Juergen Hoeller
a363fed209 Merge branch '5.1.x' 2019-05-20 17:21:07 +02:00
Juergen Hoeller
515d627aec Upgrade to Jackson 2.9.9 2019-05-20 17:19:34 +02:00
Juergen Hoeller
7edf8aca8e Drop DefaultNamespaceHandlerResolverTests.testResolveInvalidHandler 
Closes gh-22994
 2019-05-20 17:19:18 +02:00
Juergen Hoeller
52e02deb53 Configurable connection recovery in SimpleMessageListenerContainer 
Closes gh-22987
 2019-05-20 17:19:00 +02:00
Juergen Hoeller
c5d6b74321 Fix stale-if-error xsd documentation 
Closes gh-22983
 2019-05-20 17:18:11 +02:00
Juergen Hoeller
4c334de850 Use Map.values() iteration within isMultipart check 
Closes gh-22982
 2019-05-20 17:17:51 +02:00
Johnny Lim
21e163e5da Fix typo 2019-05-20 16:41:05 +02:00
Rossen Stoyanchev
bd910fc62b Fix checkstyle errors 2019-05-16 20:49:49 -04:00
Rossen Stoyanchev
60e4649ff3 Merge branch '5.1.x' 2019-05-16 20:42:09 -04:00
Rossen Stoyanchev
da4430e27e BindingResult for resolved async attributes 
ViewResolutionResultHandler no longer adds BindingResult objects for
async model attributes. Instead AbstractView adds them later when
those attributes are resolved to concrete values.

Closes gh-22933
 2019-05-16 20:41:37 -04:00
Rossen Stoyanchev
172afb510a Polish AbstractView in WebFlux 2019-05-16 14:37:04 -04:00
Rossen Stoyanchev
ed2a3bd451 Take advantage of Encoder#encodeValue 
EncoderHttpMessageWriter takes advantage of the Encoder#encodeValue
that's new in 5.2 in order to produce a Mono<DataBuffer> instead of
producing a Flux<DataBuffer> and then using flux.singleOrEmpty().

Closes gh-22952
 2019-05-15 17:31:59 -04:00
Rossen Stoyanchev
013249757a Merge branch '5.1.x' 2019-05-15 16:44:05 -04:00
Rossen Stoyanchev
ffd7cffa14 Fix typo in HttpHeaders 
Closes gh-22976
 2019-05-15 16:42:07 -04:00
Rossen Stoyanchev
e0b9ed6d72 Fix typo in reference 
Closes gh-22975
 2019-05-15 16:13:02 -04:00
Rossen Stoyanchev
0274752fe9 Use singleOrEmpty to avoid upstream cancel 
Closes gh-22952
 2019-05-15 16:02:28 -04:00
Arjen Poutsma
a30a134c23 Make StringDecoder use DataBufferUtils.split 
* Added DataBufferUtils.split variant that takes multiple delimiters
  as argument (instead of 1).
* Use this new split() variant from within StringDecoder, replacing
  its inefficient algorithm with the Knuth-Morris-Pratt algorithm.
 2019-05-15 16:07:28 +02:00
Rossen Stoyanchev
b1912f6acc Fix checkstyle error 2019-05-15 08:29:41 -04:00
Rossen Stoyanchev
97c2de915a Add RouteMatcher 
Closes gh-22642
 2019-05-14 21:44:39 -04:00
Rossen Stoyanchev
afc0ae3752 Add hasPatternSyntax method to PathPattern 2019-05-14 15:36:47 -04:00
Rossen Stoyanchev
ac6c96a391 Polish 2019-05-13 13:45:25 -04:00
Juergen Hoeller
e0654a5b3d Merge branch '5.1.x' 2019-05-13 19:22:07 +02:00
Juergen Hoeller
d3110c452e SpEL documentation refinements 2019-05-13 19:15:45 +02:00
Juergen Hoeller
9755b59197 Merge branch '5.1.x' 2019-05-13 18:05:07 +02:00
Juergen Hoeller
0796d9af0d Upgrade to Groovy 2.5.7 2019-05-13 18:03:23 +02:00
Juergen Hoeller
4af94dfc5d Clarify AbstractBeanDefinition.getBeanClass() return semantics 
Closes gh-22960
 2019-05-13 18:03:12 +02:00
Juergen Hoeller
5910d2d4dc Add missing Nullable annotation to assertNotNull 
See gh-22932
 2019-05-13 18:03:01 +02:00
stsypanov
9ca8681f79 Iteration over a map using EntrySet 2019-05-13 15:38:13 +02:00
Sam Brannen
785e8d8116 Polish MergedAnnotation support 2019-05-13 14:11:29 +02:00
Juergen Hoeller
cfc4a59135 Merge branch '5.1.x' 2019-05-13 13:40:07 +02:00
Juergen Hoeller
daee6f5bd9 Avoid expensive assertions in web resource resolution 
Closes gh-22955
 2019-05-13 13:28:07 +02:00
Johnny Lim
9a6ce66bd9 Add a missing single quote in assertion message 2019-05-13 12:04:22 +02:00
Sam Brannen
73dbd06361 Enforces static imports for JUnit 4 assertions and assumptions 
This commit configures Checkstyle to enforces static imports for JUnit 4
assertions and assumptions.

See gh-22932
 2019-05-12 15:13:07 +02:00
Sam Brannen
deecab6311 Use assertThat from Hamcrest instead of JUnit 4 
org.junit.Assert.assertThat() is deprecated as of JUnit 4.13.

See gh-22894
 2019-05-12 14:46:55 +02:00
Sam Brannen
724c805211 Discontinue use of JUnit 3 APIs 
This commit also ensures that the JSR-330 TCK is executed with the
normal build by adhering to naming conventions for test classes.

See gh-22894
 2019-05-12 14:46:55 +02:00
Sam Brannen
5685e9dfa3 Add Checkstyle rules for deprecated JUnit APIs 
This commit adds Checkstyle rules to disallow imports of the following.

- junit.framework.*
- org.junit.Assert.assertThat
- org.junit.Assume.assumeThat

See gh-22894
 2019-05-12 14:46:55 +02:00
Sam Brannen
9e1ed6c771 Fix build on JDK 9+ 2019-05-12 13:46:14 +02:00
Sam Brannen
da1b004254 Merge branch '5.1.x' 2019-05-11 18:21:44 +02:00
Sam Brannen
e1b0bf22bf Polish Javadoc for AssertionErrors 
See gh-22932
 2019-05-11 18:21:06 +02:00
Sam Brannen
33fcde4c3e Merge branch '5.1.x' 2019-05-11 18:04:48 +02:00