481 Commits

Author SHA1 Message Date
Phillip Webb
620208a802 Polish 2018-03-16 13:39:50 -07:00
Brian Clozel
0162978c78 Support server.error.whitelabel.enabled in WebFlux
This commit disables the default HTML view in the WebFlux error handling
support when `server.error.whitelabel.enabled=false`.
In this case, the original exception will be forwarded down the stream
and handled by the default `WebExceptionHandler` provided by Spring
WebFlux (likely to respond a blank page and an error HTTP response
status).

Closes gh-12520
2018-03-16 16:54:34 +01:00
Brian Clozel
161ecc0575 Bind server.error.whitelabel.enabled to ErrorProperties
Closes gh-12516
2018-03-16 16:54:22 +01:00
Andy Wilkinson
2da4897aa8 Polish 2018-03-16 09:57:35 +00:00
Phillip Webb
c201c1dac1 Polish 2018-03-15 16:09:14 -07:00
Madhura Bhave
cb3da28bb9 Enforce length > 1 for H2 and WebServices path
Fixes gh-12485
2018-03-15 12:14:28 -07:00
Brian Clozel
a0b9974796 Polish Couchbase tests 2018-03-15 15:49:21 +01:00
dreis2211
ca30739bf9 Use ApplicationContextRunner in tests
Closes gh-12495
2018-03-15 14:28:56 +01:00
Brian Clozel
57147241cb Make WebClientCustomizer optional for WebClient
This commit removes the required dependency on `WebClientCustomizer`
instances when creating `WebClient` beans, making it optional.

Closes gh-12458
2018-03-15 10:47:45 +01:00
Brian Clozel
a08deff0ce Fix WelcomePageHandlerMapping order
This commit fixes 220f8cd and moves the order for
`WelcomePageHandlerMapping` to `2` since the previous order was
conflicting with the resource mapping.

Closes gh-12335
2018-03-14 23:38:17 +01:00
Phillip Webb
c3bc6f6dd6 Polish "Move test to ApplicationContextRunner"
Closes gh-12477
2018-03-14 15:20:56 -07:00
dreis2211
3246496e2c Move test to ApplicationContextRunner
Move `DispatcherServletAutoConfigurationTests` to use the
`ApplicationContextRunner`

See gh-12477
2018-03-14 15:20:16 -07:00
dreis2211
8626daf135 Replace Mockito.times(0) with Mockito.never()
Closes gh-12475
2018-03-14 15:12:20 -07:00
Phillip Webb
a4b0be089d Polish 2018-03-14 14:05:26 -07:00
Brian Clozel
220f8cdca2 Order WelcomePageHandlerMapping at lower precedence
This commit orders the `WelcomePageHandlerMapping` at
`Ordered.LOWEST_PRECEDENCE -1` in order to give a chance to other
mappings to handle the incoming requests.

In this case, developers might provide a custom `ViewController` or
custom `HandlerMapping` for the `"/"` path and we should not override
that opinion.

Closes gh-12335
2018-03-14 17:16:39 +01:00
Stephane Nicoll
b80620fe28 Revert "Group auto-configuration import selectors together"
This reverts commit 26d9c26
2018-03-14 08:34:30 -04:00
Stephane Nicoll
26d9c261c5 Group auto-configuration import selectors together
This commit updates Spring Boot's DeferredImportSelector implementations
to group imports in a consistent set. This makes sure ordering is
applied consistently.

Closes gh-12366
2018-03-14 05:02:22 -04:00
igor-suhorukov
97d803bd30 Polish
Closes gh-12448
2018-03-13 08:49:49 +01:00
Stephane Nicoll
bb25b0a1f4 Merge branch '1.5.x' 2018-03-12 15:40:50 +01:00
igor-suhorukov
aebb475bc5 Reorder modifiers to comply with the JLS
See gh-12432
2018-03-12 15:17:05 +01:00
Andy Wilkinson
3642636b60 Align test build-info.properties with ISO 8601 formatt changes
See gh-12420
2018-03-09 13:24:34 +00:00
Brian Clozel
72afdc676d Reorder WebMvcConfigurer from auto-configuration
Prior to this commit, all `WebMvcConfigurer` instances provided by user
configuration were processed *before* the one provided by the
`WebMvcAutoConfiguration`.

For many options this has no consequence, but for some, like the
`ContentNegotiationConfigurer`, settings were overriden by the
auto-configuration even if developers provided an opinion.

This commit orders the `WebMvcConfigurer` provided by the
auto-configuration at `0`, so that custom configurers (unordered, at
`Ordered.LOWEST_PRECEDENCE`) are processed *after*.

This still gives room to developers for configuring things *before* the
auto-configuration - they can still order their own configuration
accordingly.

Fixes gh-12389
2018-03-07 17:50:41 +01:00
Stephane Nicoll
1b36ab5be0 Fix wrong import 2018-03-07 14:10:49 +01:00
Stephane Nicoll
0207b816d9 Attempt to detect ddl-auto mode only if necessary
This commit defers the resolution of the default ddl auto mode only when
it is absolutely necessary. This prevents Spring Boot to attempt to get
a connection when it isn't necessary

Closes gh-12374
2018-03-07 13:06:01 +01:00
Andy Wilkinson
317b51f2ad Make ApplicationContextRequestMatcher and subclasses thread-safe
Previously, when performing lazy initialisation of the context,
ApplicationContextRequestMatcher assigned the context field before it
called initialized. The context being non-null is used as the signal
that it’s ok to call a subclass’s matches method. If one thread checks
for a non-null context in between the field being assigned and
initialized being called on another thread, matches will be called
before the subclass is ready.

This commit closes the window for the race condition by only assigning
the context field once the subclass’s initialized method has been
called.

There is a secondary problem in each of the subclasses. Due to the use
of double-checked locking in ApplicationContextRequestMatcher, it’s
possible for a subclass’s matches method to be called by a thread that
has not synchronised on the context lock that’s held when initialized
is called and the delegate field is assigned. This means that the
value assigned to the field may not be visible to that thread.

This commit declares the delegate field of each
ApplicationContextRequestMatcher subclass as volatile to ensure that,
following initialisation, its value is guaranteed to be visible to
all threads.

Closes gh-12380
2018-03-07 11:37:01 +00:00
Stephane Nicoll
42629cb8ae Add support for ConnectionNameStrategy
This commit detects if a `ConnectionNameStrategy` bean exists in the
context and associates it with the auto-configured RabbitMQ's
`ConnectionFactory` when that is the case.

Closes gh-12367
2018-03-07 11:15:50 +01:00
Stephane Nicoll
326c1e123c Merge branch '1.5.x' 2018-03-06 15:26:47 +01:00
Stephane Nicoll
6f7501f62b Remove my clone 2018-03-06 10:21:00 +01:00
Stephane Nicoll
7f5b7a6b47 Polish contribution
Closes gh-12326
2018-03-03 12:26:14 +01:00
Johnny Lim
751c444166 Polish
See gh-12326
2018-03-03 12:25:41 +01:00
Johnny Lim
83ed0c7783 Make UserDetailsServiceAutoConfiguration.getOrDeducePassword() private
Closes gh-12295
2018-03-02 10:41:11 +01:00
Phillip Webb
7bc535e4fa Polish 2018-02-28 10:59:26 -08:00
Andy Wilkinson
9b46221345 Escape backslashes so they are preserved during Properties parsing
Closes gh-12285
2018-02-28 16:34:05 +00:00
Stephane Nicoll
0f652cdf4f Fix injection point with proxied DataSource
Prior to this commit, the `ApplicationContext` couldn't start with a
JDK-proxied `HikariDataSource` as the JMX auto-configuration was
attempting to inject a (too narrowed) `HikariDataSource`.

This commit rather injects a regular `DataSource` and attempt to unwrap
it as a `HikariDataSource`.

Closes gh-12271
2018-02-28 15:37:07 +01:00
Stephane Nicoll
5fa71a1f94 Switch test to ApplicationContextRunner 2018-02-28 14:13:45 +01:00
Stephane Nicoll
4180762d6d Polish contribution
Closes gh-12236
2018-02-28 09:01:59 +01:00
igor-suhorukov
56cbc65e7b Polish
See gh-12236
2018-02-28 08:58:46 +01:00
Phillip Webb
c23b0e99f1 Fix failing PathRequestTests
Fix test failing due to commit d66496787d.

See gh-12238
2018-02-27 17:06:21 -08:00
Phillip Webb
d66496787d Propagate exceptions in security matchers
Update `ApplicationContextRequestMatcher` and
`ApplicationContextServerWebExchangeMatcher` to use a supplier for
the context, rather than the context itself.

This allow exceptions to be propagated to subclasses which may choose
to deal with them.

See gh-12238
2018-02-27 16:29:14 -08:00
Andy Wilkinson
dc36360155 Polish 2018-02-27 21:25:48 +00:00
Phillip Webb
3e4da3cc37 Polish 2018-02-27 12:53:01 -08:00
Andy Wilkinson
c7ed5c3d4a Upgrade to EhCache 3.5.0
Closes gh-12256
2018-02-27 20:45:54 +00:00
Stephane Nicoll
6676967cc1 Polish 2018-02-27 16:47:55 +01:00
Phillip Webb
29c3be3590 Polish 2018-02-26 10:26:02 -08:00
Stephane Nicoll
306c79f0de Merge branch '1.5.x' 2018-02-26 18:03:32 +01:00
igor-suhorukov
98f4692c62 Polish
This commit changes invocations to immediately return the expression
instead of assigning it to a temporary variable. The method name should
be sufficient for callers to know exactly what will be returned.

Closes gh-12211
2018-02-25 10:59:02 +01:00
Johnny Lim
d441a8a89a Polish
Closes gh-12205
2018-02-24 11:53:25 +01:00
Andy Wilkinson
1314678890 Nest @EnableWebFluxSecurity to avoid overzealous Wildfly warnings
Closes gh-12174
2018-02-23 20:50:20 +00:00
Andy Wilkinson
782ab2803e Polish documentation regarding target class proxying
Closes gh-12196
2018-02-23 14:52:43 +00:00
Stephane Nicoll
9b61df6a2b Polish 2018-02-23 15:18:46 +01:00