Commit Graph

1112 Commits

Author SHA1 Message Date
Andy Wilkinson 32a80f7091 Merge branch '1.5.x' 2018-01-29 16:07:06 +00:00
Stephane Nicoll eba476ba6e Disable LoggersEndpoint if the logging system is disabled
Closes gh-11793
2018-01-29 16:37:28 +01:00
Andy Wilkinson 7a75ca4685 Upgrade to Postgresql 42.2.1
Closes gh-11833
2018-01-29 14:48:55 +00:00
Andy Wilkinson 11e6bcaf4f Upgrade to Jolokia 1.4.0
Closes gh-11832
2018-01-29 14:48:55 +00:00
Andy Wilkinson 2b01d5c70b Upgrade to Narayana 5.7.2.Final
Closes gh-11831
2018-01-29 14:48:54 +00:00
Andy Wilkinson d908d0e876 Upgrade to Jackson 2.9.4
Closes gh-11830
2018-01-29 14:48:53 +00:00
Andy Wilkinson 70dabdbf39 Add application/json and /xml to default compressible mime types
Closes gh-11828
2018-01-29 14:33:02 +00:00
Andy Wilkinson 844782b20b Remove default JUL handler to prevent duplicate console logging
By default, JUL configures a single root handler. That handler is a
ConsoleHandler. Previously, we removed all root handlers from JUL but
this is problematic in environments where other handlers are
registered with JUL and those handlers need to be retained.
0679d436 attempted to fix the problem by leaving the root handlers in
place and only adding and removing the bridge handler. This resulted
in log output from Tomcat (and anything else that uses JUL) being
duplicated.

This commit makes another attempt at tackling the problem. It attempts
to detect JUL's default configuration (a single root handler that's a
ConsoleHandler) and only removes the handler if it appears to be from
the default configuration. For environments where default JUL
configuration is being used, this will prevent duplicate logging and
for environments where custom JUL configuration is being used, this
will prevent that configuration from being undone.

Closes gh-8933
2018-01-29 14:22:28 +00:00
Stephane Nicoll c2a2999799 Use proper classloader for value serialization
Closes gh-11822
2018-01-29 13:55:05 +01:00
Andy Wilkinson 9edcd25c25 Simply test for async dispatch metrics filter registration
Previously, the test in MetricsAutoConfigurationIntegrationTests was
testing the functionality of WebMvcMetricsFilter to verify that the
auto-configuration had registered the filter for async dispatches.
This test was complex and covered the same code as a test in
WebMvcMetricsFilterTests.

This commit reworks the test to examine the dispatcher types on the
filter registration directly instead.

Closes gh-11826
2018-01-29 11:23:58 +00:00
Andy Wilkinson 199088b0c9 Set kotlin.version when Kotlin's Gradle plugin is applied
Closes gh-11711
2018-01-29 10:13:54 +00:00
Stephane Nicoll bdd532cc20 Clarify when a property was not renamed due to an incompatible type
Closes gh-11794
2018-01-29 10:30:59 +01:00
Stephane Nicoll 43e5e83d9c Transparently handle migration from number to java.util.Duration
See gh-11794
2018-01-29 09:59:38 +01:00
Vedran Pavic df28ee7122 Use Spring Session BOM in dependency management
Closes gh-11815
2018-01-29 08:24:38 +01:00
Stephane Nicoll a515c5b7d1 Polish contribution
Closes gh-11811
2018-01-29 08:12:35 +01:00
Johnny Lim 914bdb393f Polish
See gh-11811
2018-01-29 08:11:09 +01:00
dreis2211 c1675c2d5f Use InvocationOnMock.getArgument() where possible
Closes gh-11818
2018-01-29 08:06:00 +01:00
dreis2211 a7663c88d3 Replace casted Mockito.any() calls
Closes gh-11817
2018-01-29 07:50:29 +01:00
Stephane Nicoll ab02e48c44 Fix security section indents
Closes gh-11813
2018-01-28 09:40:40 +01:00
Phillip Webb 5767350380 Polish 2018-01-26 22:12:07 -08:00
Phillip Webb 53b0f0db60 Fix NPE when normalizing client tag URIs
See gh-11798
2018-01-26 22:12:07 -08:00
Stephane Nicoll 3266c68a78 Polish 2018-01-27 06:18:14 +01:00
Stephane Nicoll 5e26d04c05 Only generate time-to-live property for matching endpoints
This commit makes sure that a "cache.time-to-live" property is not
generated for endpoints that do not have a main read operation (i.e. a
read operation with no parameter or only nullable parameters).

This matches the endpoint feature that provides caching for only such
operation.

Closes gh-11703
2018-01-27 06:11:01 +01:00
Stephane Nicoll 90545fb0c6 Update LocalDevToolsAutoConfiguration to use constructor injection
Closes gh-11769
2018-01-27 05:55:56 +01:00
Stephane Nicoll 6569ed8739 Polish contribution
Closes gh-11809
2018-01-27 05:33:49 +01:00
Johnny Lim a0fb138771 Fix to assert parameter names in EndpointServlet.withInitParameters()
See gh-11809
2018-01-27 05:31:56 +01:00
Johnny Lim 6d68806275 Polish
Closes gh-11805
2018-01-27 05:22:04 +01:00
Phillip Webb 1d8942941e Normalize micrometer client tag URIs
Update `MetricsClientHttpRequestInterceptor` so that captured URIs
are normalize to always contain a leading slash.

Fixes gh-11798
2018-01-26 20:16:03 -08:00
Jon Schneider b254761c5e Support micrometer Graphite tagsAsPrefix property
Fixes gh-11797
2018-01-26 19:57:48 -08:00
Phillip Webb 0b689a5b10 Polish MetricsFilter registration async support
Closes gh-11348
2018-01-26 19:51:03 -08:00
Nikolay Rybak b6af06a55f Fix MetricsFilter registration to support async
Update `WebMvcMetricsConfiguration` so that the filter is registered
with the correct settings to support async requests.

See gh-11348
2018-01-26 19:51:03 -08:00
Phillip Webb 25815ca7e1 Refine WebMvcMetricsFilter for async support
Rework `WebMvcMetricsFilter` so that async requests can be handled
correctly.

See gh-11348
2018-01-26 19:51:02 -08:00
Jon Schneider 112ffd7890 Cleanup URLs before using them for metrics
Update `WebMvcTags` to cleanup URLs by removing any double
slashes and any trailing slash.

Fixes gh-11808
2018-01-26 19:40:57 -08:00
Phillip Webb 1da0f2c6b0 Remove FIXME
See gh-11807
2018-01-26 14:44:49 -08:00
Phillip Webb 643cda480f Migrate to updated micrometer Tags class
See gh-11575
2018-01-26 14:42:38 -08:00
Jon Schneider fd237f85cc Extract common micrometer test setup
Create `MetricsRun` that can be used to apply common micrometer test
configuration to a `ApplicationContextRunner`.

Closes gh-11804
2018-01-26 14:42:22 -08:00
Jon Schneider d1de1cd053 Upgrade to micrometer 1.0.0-SNAPSHOT
Move to the snapshots and rework changed APIs in preparation for
the upcoming rc8 release.

See gh-11575
2018-01-26 11:40:37 -08:00
Phillip Webb b234501af3 Polish 2018-01-26 11:39:41 -08:00
Johnny Lim a46e047c5d Polish
Closes gh-11792
2018-01-26 18:19:44 +01:00
Andy Wilkinson 498f66fcdc Test the Gradle plugin against Gradle 4.5
Closes gh-11768
2018-01-26 15:55:25 +00:00
Andy Wilkinson 82d41c1e83 Reinstate information about web endpoints' default URL mapping
Closes gh-11755
2018-01-26 15:41:13 +00:00
Andy Wilkinson 92138e4c32 Polish "Mark thread as interrupted after catching InterruptedException"
See gh-11784
2018-01-26 15:27:09 +00:00
igor-suhorukov 0c30c969bf Mark thread as interrupted after catching InterruptedException
Closes gh-11784
2018-01-26 15:27:09 +00:00
Andy Wilkinson 192fe929c7 Polish "Use custom DataSource if Flyway or Liquibase has user or url"
Closes gh-11751
2018-01-26 14:51:43 +00:00
Dominic Gunn 5d3cd23eed Use custom DataSource if Flyway or Liquibase has user or url
This commit enables a more flexible Liquibase/Flyway configuration by
allowing for a combination of the provider's and the primary
DataSource's configuration to be used. This gives developers the
flexibility to specify only a user or a url and having
Liquibase/Flyway fall back to individual datasource properties rather
than ignoring the Liquibase/Flyway properties and falling back to the
default data source.

See gh-11751
2018-01-26 14:51:43 +00:00
Stephane Nicoll 1c195f5b9a Polish "Migrate server customizer to PropertyMapper"
Closes gh-11772
2018-01-26 13:48:07 +01:00
yulin 19542b975f Migrate server customizer to PropertyMapper
See gh-11772
2018-01-26 13:48:07 +01:00
Andy Wilkinson 988fc18f8c Simplify endpoint enablement and update reference documentation
Closes gh-11755
2018-01-26 12:12:11 +00:00
Stephane Nicoll 1880a25cfb Polish
Closes gh-11788
2018-01-26 12:31:30 +01:00
Johnny Lim 946593238e Align missed bits from trace endpoint changes
Closes gh-11789
2018-01-26 12:16:04 +01:00
Stephane Nicoll cacc3a0b2b Upgrade to Spring Session 2.0.1.RELEASE
See gh-11537
2018-01-26 11:29:03 +01:00
Stephane Nicoll 98c667c2d5 Polish "Use PropertyMapper to configure WebServerFactory"
Closes gh-11773
2018-01-26 11:19:03 +01:00
Huang YunKun 7d4e558f8e Use PropertyMapper to configure WebServerFactory
See gh-11773
2018-01-26 11:08:23 +01:00
Stephane Nicoll 584985c7fa Polish 2018-01-26 11:06:11 +01:00
Stephane Nicoll e95cda10ee Add whenInstanceOf to PropertyMapper
Add an operation on PropertyMapper that takes care of casting. Returns
a source for the requested type if the current value is of the right
type.

Closes gh-11788
2018-01-26 11:05:13 +01:00
Madhura Bhave 3a95a7531a UserDetailsService not created when OAuth configured
Fixes gh-10531
2018-01-26 15:10:21 +05:30
Stephane Nicoll 3f1aaa1f7e Polish contribution
Closes gh-11783
2018-01-26 10:03:47 +01:00
Raja Kolli 64c324612e Polish
See gh-11783
2018-01-26 09:52:52 +01:00
Stephane Nicoll fe7d7e2fc9 Polish 2018-01-26 09:51:54 +01:00
Johnny Lim 15fb62718d Remove unused parameters
Closes gh-11785
2018-01-26 09:30:02 +01:00
Andy Wilkinson cffafe31ba Determine parent ClassLoader in CLI in a more robust manner
Closes gh-11745
2018-01-25 21:24:59 +00:00
Phillip Webb adfb6dc128 Polish 2018-01-25 13:20:29 -08:00
Raja Kolli f9f9e84f96 Upgrade to Maven Checkstyle Plugin 3.0.0
Closes gh-11775
2018-01-25 21:16:35 +01:00
Andy Wilkinson 0679d4369c Use uninstall to remove SL4FJBridgeHandler
Closes gh-8933
2018-01-25 16:17:06 +00:00
Andy Wilkinson 85d4647bda Downgrade to Groovy 2.4.13
There's an extra ClassLoader in the hierarchy of the TCCL in Groovy
2.4 vs Groovy 2.5 so we require an extra getParent() call to avoid
being able to load classes that are visible to the launched URL
class loader.

Closes gh-11745
2018-01-25 15:55:33 +00:00
Andy Wilkinson 3565961d68 Rework HTTP exchange tracing and add support for WebFlux
Closes gh-9980
2018-01-25 13:27:07 +00:00
Andy Wilkinson 11064b5d78 List valid values in failure analysis for enum binding failure
Closes gh-11771
2018-01-25 13:26:43 +00:00
Andy Wilkinson cedb6b2f17 Revert "Clean up the logging system later in context close processing"
This reverts commit 8619256d2a.

See gh-11676
2018-01-25 13:15:41 +00:00
Andy Wilkinson 9cae416755 Explicitly configure and document WebFilter orderings
Closes gh-11756
2018-01-25 11:55:01 +00:00
Andy Wilkinson 9a22201dd3 Polish 2018-01-25 11:55:01 +00:00
Stephane Nicoll 43bac617d4 Add access to short deprecation reason
Closes gh-11770
2018-01-25 12:47:54 +01:00
Andy Wilkinson 4c23afdcd8 Polish 2018-01-25 11:04:16 +00:00
Andy Wilkinson e2cb7a7545 Align default scopes for Google with changes in Spring Security 5.0.1
Closes gh-11573
2018-01-25 10:58:05 +00:00
Andy Wilkinson 8619256d2a Clean up the logging system later in context close processing
Previously, the logging system was cleaned up in response to the
root context's ContextClosedEvent being received. This event is
published early in a context's close processing. As a result, the
logging system is in cleaned up state while, for example, disposable
beans are being destroyed.

This commit reworks the logic that triggers logging system clean up
to use a disposable bean instead. Disposable beans are called in
reverse-registration order. The logging clean up bean is registered as
early as possible so that it should be the last disposable bean to
be called.

Closes gh-11676
2018-01-25 10:33:56 +00:00
Andy Wilkinson 3c462d3b93 Upgrade to Spring Security 5.0.1.RELEASE
Closes gh-11573
2018-01-25 10:25:15 +00:00
Phillip Webb b7c52da457 Allow custom WebTestClient beans
Update `@SpringBootTest` `WebTestClient` support so that the bean
definition is only registered when the user has not defined or
auto-configured their own.

See gh-10556
2018-01-25 00:08:19 -08:00
Phillip Webb 177281a504 Allow custom TestRestTemplate beans
Update `@SpringBootTest` `TestRestTemplate` support so that the bean
definition is only registered when the user has not defined or
auto-configured their own.

See gh-10556
2018-01-25 00:08:19 -08:00
Stephane Nicoll a2a31894a8 Fix typo 2018-01-25 08:19:25 +01:00
Phillip Webb d61ba241b5 Move "testdb" naming to DataSourceProperties
Move the "testdb" naming logic to `DataSourceProperties` and expose
the `deduceDatabaseName` method so they can be used in
auto-configuration.

See gh-11719
2018-01-24 20:43:00 -08:00
Stephane Nicoll b67903a04a Keep "testdb" default datasource name internal
Previously, Hikari's pool name was auto-configured with the value of
`spring.datasource.name` that defaults  to `testdb`, which brings some
confusion.

This commit removes the default `testdb` value on
`spring.datasource.name` as it is a sane default only for an embedded
datasource. It is applied whenever applicable instead.

Closes gh-11719
2018-01-24 17:41:32 -08:00
Phillip Webb 017efda6ec Add @EndpointServlet and migrate Jolokia
Add first class support for Servlet based endpoints and rework the
Jolokia endpoint to use it.

Fixes gh-10264
2018-01-24 17:06:13 -08:00
dreis2211 542c3b7c1e Remove usage of Vector collection
Closes gh-11759
2018-01-24 16:36:45 -08:00
Phillip Webb 3bd940baaa Polish "Add more WebEndpointAutoConfiguration tests"
Closes gh-11754
2018-01-24 16:24:50 -08:00
Yunkun Huang d8527a9708 Add tests for WebEndpointAutoConfiguration
Closes gh-11754
See gh-11684
2018-01-24 16:24:50 -08:00
igor-suhorukov 093ca0a687 Use EnumMap whenever possible
Replace regular Map instances with EnumMap to reduce memory consumption.

Closes gh-11760
2018-01-24 16:24:47 -08:00
Phillip Webb ab6ad6aa4b Polish 2018-01-24 16:09:14 -08:00
Phillip Webb e53bef737f Rename property migrator classes
Rename packages and classes to match the new module name.

See gh-11301
2018-01-24 15:54:24 -08:00
Andy Wilkinson 1a1a62b744 Protect tests against Cassandra startup failures
On CI, Cassandra running inside the Docker container sometimes fails
to start or the start times out. This has nothing to do with Boot so
we  attempt to protect our tests from the flakiness of the container
by allowing 3 startup attempts.
2018-01-24 21:34:11 +00:00
Andy Wilkinson 292025936e Omit null properties from actuator endpoint API response examples
Closes gh-11757
2018-01-24 16:40:10 +00:00
Stephane Nicoll 41bfe07964 Upgrade to Spring Data Kay SR3
Closes gh-11666
2018-01-24 15:30:34 +01:00
Stephane Nicoll b1525f4f2e Rename spring-boot-deprecated-properties-support
Rename `spring-boot-deprecated-properties-support` to
`spring-boot-properties-migrator`.

See gh-11301
2018-01-24 11:15:17 +01:00
Stephane Nicoll 960989cfe6 Polish "Add support for anonymousReadOnly in LdapProperties"
Closes gh-11744
2018-01-24 10:21:33 +01:00
Stephane Nicoll af0bdc893b Add support for anonymousReadOnly in LdapProperties
See gh-11744
2018-01-24 09:59:03 +01:00
Eddú Meléndez 633aefa844 Move tests to use ApplicationContextRunner 2018-01-24 09:58:35 +01:00
Brian Clozel 145d46e093 Polish 2018-01-23 15:52:44 +01:00
Stephane Nicoll 1f4a32f0ad Add a way to signal that an endpoint request is invalid
This commit adds InvalidEndpointRequestException as a technology
agnostic way to signal that an endpoint request is invalid. When such
exception is thrown, the web layer translates that to a 400.

Rather than overriding the reason, this commit makes sure to reuse the
error infrastructure.

Closes gh-10618
2018-01-23 14:57:13 +01:00
Madhura Bhave 55c8ceb440 Polish 2018-01-23 17:01:46 +05:30
Brian Clozel be7c0a15f7 Move reactive ErrorAttributes into spring-boot
Closes gh-11714
2018-01-23 11:55:34 +01:00
Stephane Nicoll 674be06874 Upgrade to Spring Framework 5.0.3.RELEASE
Closes gh-11503
2018-01-23 11:35:55 +01:00
Stephane Nicoll 81b275fa2a Upgrade to Reactor Bismuth-SR5
Closes gh-11572
2018-01-23 09:29:33 +01:00