Andy Wilkinson
ab8fcf0d71
Polish "Use class for @ConditionalOnClass"
...
See gh-15775
2019-02-12 15:45:05 +00:00
Johnny Lim
b423962c89
Use class for @ConditionalOnClass
...
See gh-15775
2019-02-12 15:45:00 +00:00
Andy Wilkinson
48e781181e
Merge branch '2.1.x'
2019-02-12 14:15:20 +00:00
Andy Wilkinson
799ac24da1
Reinstate auto-config of RequestContextFilter with Jersey
...
Previously, the auto-configuration for both Jersey and WebMvc would auto-configure
a RequestContextFilter bean. In 2.1.0, this led to a startup failure due to the latter
attempting to override the bean defined by the former. In addition to the override there
were also problems with the order of the filter as Jersey uses -1 and MVC uses -105.
To avoid the above-described problems, the auto-configuration of the RequestContextFilter
was removed from JerseyAutoConfiguration in 2.1.1. Unfortunately, the broke
request-scoped beans for those using only Jersey.
This commit attempts to strike a better balance by reintroducing the auto-configuration
of RequestContextFilter in JerseyAutoConfiguration. It will back off if the user defines
their own filter or filter registration. WebMvcAutoConfiguration has been updated to
back off in the same manner. This leaves the potential for ordering problems, but they
are no worse than they were before. Furthermore, the user has the means to correct any
problems by using the various filter ordering properties that are provided for Jersey,
Spring Session, Spring Security, etc.
Closes gh-15376
2019-02-12 14:05:36 +00:00
Andy Wilkinson
db31e42751
Merge branch '2.1.x'
2019-02-12 09:58:21 +00:00
Andy Wilkinson
a975c0ad16
Use Testcontainers’ CassandraContainer rather than our own
...
Closes gh-15901
2019-02-12 09:58:05 +00:00
Andy Wilkinson
6fe226d781
Merge branch '2.1.x'
2019-02-11 17:38:24 +00:00
Andy Wilkinson
20f26c4d30
Polish "Fix stopping of Embedded Mongo before context is closed"
...
See gh-15692
2019-02-11 17:34:40 +00:00
Eugene
750246f021
Fix stopping of Embedded Mongo before context is closed
...
See gh-15692
2019-02-11 17:33:59 +00:00
Andy Wilkinson
b5c9afc055
Merge branch '2.1.x'
2019-02-11 17:12:51 +00:00
Andy Wilkinson
295a660e35
Polish "Set NO_REQUEST_TIMEOUT as a server option not a socket option"
...
See gh-15822
2019-02-11 17:11:20 +00:00
ayudovin
dbce3731a4
Set NO_REQUEST_TIMEOUT as a server option not a socket option
...
See gh-15822
2019-02-11 17:08:16 +00:00
Andy Wilkinson
c6a1df6cd4
Merge branch '2.1.x'
2019-02-11 16:42:29 +00:00
Jeffrey van der Laan
4f86233ca7
Do not auto-configure OEMIV filter when user defines registration bean
...
See gh-15889
2019-02-11 16:33:06 +00:00
Kedar Joshi
4a253ff87c
Polish
...
1. Removed unnecessary null checks
2. Combined collection initialization and modification
3. Minor collections related optimizations
Closes gh-15837
2019-02-10 10:35:36 +01:00
Madhura Bhave
4d69e127c8
Merge branch '2.1.x'
2019-02-08 18:38:21 -08:00
Madhura Bhave
26da45aa9a
Configure a JerseyApplicationPath bean for the actuators
...
This commit also ensures that Jersey-based actuator endpoints are
available before the user has configured a `ResourceConfig` bean
Fixes gh-15625
Fixes gh-15877
2019-02-08 18:38:01 -08:00
Brian Clozel
e8fef97335
Merge branch '2.1.x'
2019-02-08 12:29:39 +01:00
Brian Clozel
cba6079b7b
Log unhandled server exceptions in WebFlux
...
Prior to this commit, errors unhandled by custom `WebExceptionHandler`
and resulting in an HTTP 500 status would not be logged at ERROR level,
giving no information to developers about the actual exception.
This commit ensures that such exceptions are logged at the ERROR level
with their exception. By the time the exception hits the
`DefaultErrorWebExceptionHandler`, if the response is already committed
or if the exception is due to a client disconnecting, the error is
delegated to Framework support as Spring Boot won't be able to render an
error page as expected.
Fixes gh-15769
2019-02-08 12:25:05 +01:00
Andy Wilkinson
45cc649c7d
Merge branch '2.1.x'
2019-02-04 12:36:33 +00:00
Andy Wilkinson
82bc87560c
Use AssertJ’s exception assertions rather than fail
...
Closes gh-15761
2019-02-04 11:48:26 +00:00
Stephane Nicoll
5269ea5536
Polish contribution
...
Closes gh-15754
2019-01-31 16:33:38 +01:00
Johnny Lim
6603033bbc
Polish SessionConfigurationImportSelector.selectImports()
...
See gh-15754
2019-01-31 16:33:02 +01:00
Stephane Nicoll
002fa405a8
Merge branch '2.1.x'
2019-01-31 16:26:37 +01:00
Stephane Nicoll
ede23caace
Polish "Inject Map directly rather than via ObjectProvider"
...
Closes gh-15798
2019-01-31 16:25:18 +01:00
ayudovin
3a2e85ce75
Inject Map directly rather than via ObjectProvider
...
See gh-15798
2019-01-31 16:24:18 +01:00
Stephane Nicoll
c5675de666
Polish "Handle AccessControlException in JspTemplateAvailabilityProvider"
...
Closes gh-15778
2019-01-31 16:21:48 +01:00
ayudovin
81273bdf9a
Handle AccessControlException in JspTemplateAvailabilityProvider
...
See gh-15778
2019-01-31 16:20:19 +01:00
dreis2211
d4ab101223
Use Assertions.contentOf() where possible
...
Closes gh-15793
2019-01-28 10:08:57 +01:00
Stephane Nicoll
342212b8dc
Merge branch '2.1.x'
2019-01-28 10:08:02 +01:00
Stephane Nicoll
6f86a84301
Polish "Alias auto-configured `TaskExecutor` to make async tasks use it"
...
Closes gh-15748
2019-01-28 10:04:30 +01:00
Camille Vienot
d0859f1569
Alias auto-configured `TaskExecutor` to make async tasks use it
...
See gh-15748
2019-01-28 09:59:55 +01:00
Andy Wilkinson
530c7bee71
Do not auto-configure HttpMessageConverters in reactive web apps
...
Closes gh-15712
2019-01-18 14:57:14 -05:00
Andy Wilkinson
6abd18ae96
Do not auto-configure RestTemplateBuilder in reactive web apps
...
Closes gh-15718
2019-01-18 14:50:24 -05:00
Andy Wilkinson
5d60d6bd62
Use ApplicationContextRunner to test RestTemplateAutoConfiguration
2019-01-18 14:36:18 -05:00
Andy Wilkinson
7dd65074e8
Only perform background pre-init with multiple processors
...
Closes gh-15722
2019-01-18 11:50:17 -05:00
Stephane Nicoll
6baa6b291e
Polish contribution
...
Closes gh-15695
2019-01-14 08:11:20 -05:00
Johnny Lim
af3ed9ff9f
Polish
...
See gh-15695
2019-01-14 08:09:32 -05:00
Phillip Webb
2f77ef7722
Merge branch '2.1.x'
2019-01-11 16:45:05 -08:00
Phillip Webb
6a901199f5
Polish
2019-01-11 16:42:02 -08:00
Stephane Nicoll
8d1d3fb087
Polish "Avoid string concatenation inside StringBuilder append()"
...
Closes gh-15589
2019-01-11 08:30:12 +01:00
igor-suhorukov
59ac85d371
Avoid string concatenation inside StringBuilder append()
...
See gh-15589
2019-01-11 08:28:19 +01:00
Brian Clozel
a83d9635af
Merge branch '2.1.x'
2019-01-08 16:13:35 +01:00
Brian Clozel
6200a319f2
Polish
...
Closes gh-15385
2019-01-08 16:13:18 +01:00
ayudovin
e9588ca04b
Support server.connection-timeout for Netty server
2019-01-08 16:03:08 +01:00
Stephane Nicoll
448f1626f9
Merge branch '2.1.x'
2019-01-07 14:56:18 +01:00
Stephane Nicoll
830da28b8c
Fix JPA bootstrap executor detection with multiple candidates
...
Spring Boot provides two separate auto-configurations that can
potentially expose an `AsyncTaskExecutor` implementation so relying on
the presence of a single instance is too weak.
This commit fixes the detection of the AsyncTaskExecutor that can be
used to bootstrap JPA so that a single instance is used and, in the case
more than one exists, the one named `applicationTaskExecutor`.
Closes gh-15447
2019-01-07 14:54:59 +01:00
Stephane Nicoll
6ba1f40e59
Polish "Allow easy customization of EmbeddedMongo DownloadConfig"
...
Closes gh-15496
2019-01-02 10:33:17 +01:00
michael
b5b6889601
Allow easy customization of EmbeddedMongo DownloadConfig
...
See gh-15496
2019-01-02 10:30:33 +01:00
Madhura Bhave
19caff6776
Merge branch '2.1.x'
2018-12-31 13:24:52 -08:00
Oleksii Bondar
b52dddf784
Refactor OAuth2ClientPropertiesRegistrationAdapterTests
...
Closes gh-15586
2018-12-31 13:18:00 -08:00
Stephane Nicoll
d0811b48df
Polish "Disable Hibernate entity scanning for default JPA setup"
...
Closes gh-15565
2018-12-31 16:51:43 +01:00
ayudovin
510a8e2ec1
Disable Hibernate entity scanning for default JPA setup
...
See gh-15565
2018-12-31 16:51:31 +01:00
Stephane Nicoll
33547569db
Merge branch '2.1.x'
2018-12-31 10:36:41 +01:00
Stephane Nicoll
c6202b57e0
Merge branch '2.0.x' into 2.1.x
2018-12-31 10:36:24 +01:00
Stephane Nicoll
be161b23cb
Polish class conditions documentation
...
Closes gh-15578
2018-12-31 10:36:02 +01:00
dreis2211
0f5f6f15dc
Use hasFieldOrPropertyWithValue where possible
...
Closes gh-15582
2018-12-30 09:48:27 +01:00
Stephane Nicoll
b578dc05df
Polish
2018-12-26 09:16:27 +01:00
igor-suhorukov
dfb3cd51bc
Simplify code by using for-each loop
...
See gh-15563
2018-12-25 09:58:42 +01:00
Stephane Nicoll
fd12e696b0
Polish "Replace redundant call to class isInstance() with instanceof"
...
Closes gh-15554
2018-12-23 15:51:39 +01:00
igor-suhorukov
7424f48803
Replace redundant call to class isInstance() with instanceof
...
See gh-15554
2018-12-23 15:50:22 +01:00
Andy Wilkinson
ddf64802c0
Merge branch '2.1.x'
2018-12-21 15:13:10 +00:00
Andy Wilkinson
bfd63ab085
Polish "Stop JtaAutoConfiguration from enabling JtaProperties when not used"
...
Closes gh-15550
2018-12-21 15:12:29 +00:00
Nishant Raut
0b29da14b3
Stop JtaAutoConfiguration from enabling JtaProperties when not used
...
See gh-15550
2018-12-21 15:12:29 +00:00
Stephane Nicoll
9d67400afa
Merge branch '2.1.x'
2018-12-20 17:54:08 +01:00
igor-suhorukov
e578d30722
Replace anonymous inner class with lambda
...
See gh-15438
2018-12-20 17:47:29 +01:00
Andy Wilkinson
3a7406fe3a
Merge branch '2.0.x' into 2.1.x
2018-12-20 15:58:03 +00:00
Andy Wilkinson
0741c90489
Avoid blocking on a Mono indefinitely
...
Closes gh-15535
2018-12-20 15:31:39 +00:00
Andy Wilkinson
9d2d6d5812
Merge branch '2.1.x'
2018-12-20 15:30:51 +00:00
Andy Wilkinson
9a33d1a2f9
Merge branch '2.0.x' into 2.1.x
2018-12-20 15:30:42 +00:00
Andy Wilkinson
8c68da0882
Avoid blocking on a Mono indefinitely
...
Closes gh-15535
2018-12-20 15:24:53 +00:00
Andy Wilkinson
70f4d5e5a8
Polish "Apply context and connector customizer beans to Tomcat factories"
...
Closes gh-15492
2018-12-19 17:09:21 +00:00
Raheela
90c489048f
Apply context and connector customizer beans to Tomcat factories
...
See gh-15492
2018-12-19 17:01:02 +00:00
Andy Wilkinson
c8a0c99a21
Remove D…S…Init…InvokerTests' assumptions about classpath structure
...
See gh-15471
2018-12-17 16:35:22 +00:00
Stephane Nicoll
6207b46bc6
Merge branch '2.1.x'
2018-12-17 17:07:58 +01:00
dreis2211
948902f090
Avoid unnecessary usage of ReflectionTestUtils
...
Closes gh-15482
2018-12-17 17:07:23 +01:00
Andy Wilkinson
61d04db0d7
Minimize and centralize assumptions about build output
...
Closes gh-15471
2018-12-14 17:50:20 +00:00
Andy Wilkinson
064f6478df
Move back to JUnit 4 until SUREFIRE-1614 has been resolved
...
See gh-14736
See gh-14737
See gh-14738
2018-12-12 16:49:30 +00:00
Andy Wilkinson
2b453bbb16
Minimise dependencies on Log4j2
...
Closes gh-15441
2018-12-12 08:19:34 +00:00
Madhura Bhave
f863ce32ee
Merge branch '2.1.x'
2018-12-10 16:44:42 -08:00
Madhura Bhave
3cc441c83e
Do not remove trailing slash from OAuth2 Issuer URI
...
Fixes gh-15324
2018-12-10 16:35:52 -08:00
Andy Wilkinson
beffc4da9f
Remove ordering dependence from tests that create embedded databases
...
Closes gh-15423
2018-12-10 14:57:39 +00:00
Stephane Nicoll
ba29788482
Polish "Replace explicit generic type with diamond operator"
...
Closes gh-15424
2018-12-09 11:43:28 +01:00
igor-suhorukov
a2ebba8db1
Replace explicit generic type with diamond operator
...
See gh-15424
2018-12-09 11:42:27 +01:00
Madhura Bhave
f040459ae5
Merge branch '2.1.x'
2018-12-07 14:32:07 -08:00
Madhura Bhave
a11dea46d7
Use the right class in @ConditionalOnClass
...
See gh-15372
2018-12-07 14:15:59 -08:00
Madhura Bhave
e0b55d36de
Merge branch '2.1.x'
2018-12-07 13:51:11 -08:00
Madhura Bhave
f13697b278
Make Resource Server auto-config conditional on JwtDecoder class
...
Fixes gh-15372
2018-12-07 13:48:32 -08:00
Andy Wilkinson
d3e5c5688f
Polish
2018-12-07 19:58:13 +00:00
Stephane Nicoll
d5f90ffcfb
Polish "Replace this lambda with a method reference"
...
Closes gh-15401
2018-12-07 11:10:10 +01:00
igor-suhorukov
5c1813aef8
Replace this lambda with a method reference
...
See gh-15401
2018-12-07 11:01:42 +01:00
Madhura Bhave
5a18df2d69
Fix tests
2018-12-05 18:33:50 -08:00
Madhura Bhave
59d2b0a3fb
Upgrade tests to Junit5
...
See gh-14737
2018-12-05 17:49:09 -08:00
Stephane Nicoll
95b94c0158
Merge branch '2.1.x'
2018-12-04 10:53:41 +01:00
Stephane Nicoll
c56c0ff433
Rename OAuth2ResourceServerJwkConfiguration
...
Closes gh-15375
2018-12-04 10:53:01 +01:00
Stephane Nicoll
bbad720e23
Polish contribution
...
Closes gh-15086
2018-12-03 14:23:16 +01:00
Razib Shahriar
9e571a2827
Fail fast if nested condition uses a phase inappropriate for its members
...
See gh-15086
2018-12-03 14:14:29 +01:00
Stephane Nicoll
0df13baa0f
Polish "Add configurable property for JWK encryption algorithm"
...
Closes gh-15145
2018-12-03 11:49:18 +01:00
artsiom
460fdaf52f
Add configurable property for JWK encryption algorithm
...
See gh-15145
2018-12-03 11:35:10 +01:00
Stephane Nicoll
ec678eaa3b
Polish "Configure MessageSource if no "messageSource" bean defined"
...
Closes gh-15212
2018-12-03 11:28:26 +01:00