Commit Graph

15563 Commits

Author SHA1 Message Date
Stephane Nicoll a5960bc0c3 Polish 2018-02-20 11:47:20 +01:00
Stephane Nicoll 44b7673ee6 Polish 2018-02-20 11:04:52 +01:00
Stephane Nicoll 4c41aa35da Merge pull request #12127 from jkschneider:micrometer-449
* pr/12127:
  Polish "Consistent prefix for datasource pool metrics"
  Consistent prefix for datasource pool metrics
2018-02-20 10:07:25 +01:00
Stephane Nicoll f19b43bacc Polish "Consistent prefix for datasource pool metrics"
Closes gh-12127
2018-02-20 10:07:00 +01:00
Jon Schneider 16867f866c Consistent prefix for datasource pool metrics
See gh-12127
2018-02-20 09:35:43 +01:00
Andy Wilkinson 8ffa146660 Upgrade to Spring Security 5.0.2.RELEASE
Closes gh-11870
2018-02-20 07:34:26 +00:00
Phillip Webb 20109e27be Add ApplicationConversionService and fix binder
Create a new `ApplicationConversionService` similar in design to the
DefaultFormattingConversionService from Spring Framework. The new
conversion service provides a central place for custom conversion logic
supported by Spring Boot.

Also replace the `BindingConversionService` with an internal
`BindConverter` class that now invokes the `SimpleTypeConverter`
directly. Binding for `@ConfigurationProperties` has been updated so
that any custom property editors registered with the BeanFactory can
be used.

Fixes gh-12095
2018-02-19 20:25:47 -08:00
Phillip Webb 61f44179cb Relocate XA wrapper types
Move `XADataSourceWrapper` to `jdb` and `XAConnectionFactoryWrapper` to
`jms` so that they are packaged in a similar way to the underlying XA
types.

Fixes gh-12061
2018-02-19 20:22:03 -08:00
Phillip Webb b7d7f94ab7 Merge pull request #12083 from igor-suhorukov
* pr/12083:
  Polish static finals
2018-02-19 20:11:47 -08:00
igor-suhorukov fe023817c7 Polish static finals
Closes gh-12083
2018-02-19 20:10:58 -08:00
Phillip Webb 752a42710c Merge pull request #12117 from izeye
* pr/12117:
  Polish
2018-02-19 20:03:57 -08:00
Johnny Lim 88b184ca23 Polish 2018-02-19 20:00:20 -08:00
Phillip Webb cc9a5b72e1 Merge pull request #12126 from jkschneider
* pr/12126:
  Fix URI tag on RestTemplate requests based on URIs
2018-02-19 19:59:59 -08:00
Jon Schneider ec5ef0f246 Fix URI tag on RestTemplate requests based on URIs
Move leading slash logic from `MetricsClientHttpRequestInterceptor` to
`RestTemplateExchangeTags` so that URI based calls are also managed.

Closes gh-12126
2018-02-19 19:57:24 -08:00
Phillip Webb adf22d6e4a Polish 2018-02-19 19:54:10 -08:00
Andy Wilkinson 482ecc606c Polish 2018-02-19 22:46:31 +00:00
Andy Wilkinson ef19b04206 Merge pull request #12124 from Jon Schneider
* gh-12124:
  Polish "Bind StatsD queue gauges"
  Bind StatsD queue gauges
2018-02-19 21:24:32 +00:00
Andy Wilkinson 22bac1b54e Polish "Bind StatsD queue gauges"
Closes gh-12124
2018-02-19 21:24:24 +00:00
Jon Schneider 53e872bf4c Bind StatsD queue gauges
See gh-12124
2018-02-19 21:21:58 +00:00
Andy Wilkinson c7fafacb8d Upgrade to Spring Data Kay SR4
Closes gh-11884
2018-02-19 21:08:44 +00:00
Andy Wilkinson ce64f212b4 Upgrade to Reactor Bismuth SR 6
Closes gh-12085
2018-02-19 19:48:07 +00:00
Andy Wilkinson d98eafb2c9 Merge pull request #12121 from Jon Schneider
* gh-12121:
  Remove destroy methods from auto-configured MeterRegistry beans
2018-02-19 17:45:48 +00:00
Jon Schneider 9934285bca Remove destroy methods from auto-configured MeterRegistry beans
Closes gh-12121
2018-02-19 17:44:38 +00:00
Andy Wilkinson 73460a5b25 Use auto-configuration to create composite, not a BFPP
Closes gh-12122
2018-02-19 17:41:23 +00:00
Stephane Nicoll 1e932860c4 Specify default micrometer values
This commit adds micrometer's default values for each monitoring
system with tests that validate those defaults are consistent. This
makes sure that those defaults are part of the metadata and any tooling
support that uses it.

Closes gh-12089
2018-02-19 16:41:28 +01:00
Stephane Nicoll 202ed7b72b Polish 2018-02-19 16:20:56 +01:00
Andy Wilkinson 23905490d9 Upgrade to Mongo Driver Reactivestreams 1.7.1
Closes gh-12116
2018-02-19 14:59:46 +00:00
Andy Wilkinson 359ba0e96a Upgrade to Jooq 3.10.5
Closes gh-12115
2018-02-19 14:59:46 +00:00
Andy Wilkinson 4e2dc26d4c Upgrade to Infinispan 9.1.6.Final
Closes gh-12114
2018-02-19 14:59:46 +00:00
Andy Wilkinson 66a6181f18 Upgrade to Rxjava 1.3.6
Closes gh-12113
2018-02-19 14:59:46 +00:00
Stephane Nicoll cd0c81fe39 Restore prefix in ConditionalOnProperty 2018-02-19 15:46:39 +01:00
Andy Wilkinson c3a31fafe2 Remove tangle between actuate.endpoint and actuate.endpoint.invoke
See gh-11854
2018-02-19 13:04:23 +00:00
Stephane Nicoll 24e7a11222 Upgrade to Spring Framework 5.0.4
Closes gh-11894
2018-02-19 13:27:41 +01:00
Andy Wilkinson 990a0965f7 Upgrade to Lettuce 5.0.2
Closes gh-11870
2018-02-19 12:21:45 +00:00
Andy Wilkinson 39ece9a16f Merge branch '1.5.x' 2018-02-19 10:37:54 +00:00
Andy Wilkinson 712e562594 Provide dependency management for remaining Apache HttpClient modules
Closes gh-12107
2018-02-19 10:36:36 +00:00
Stephane Nicoll bce975c11e Merge pull request #12066 from jkschneider:micrometer-428
* pr/12066:
  Polish "Add SignalFxConfig source property"
  Add SignalFxConfig source property
2018-02-19 10:57:11 +01:00
Stephane Nicoll 6c85ed70e4 Polish "Add SignalFxConfig source property"
Closes gh-12066
2018-02-19 10:53:25 +01:00
Jon Schneider a732053afd Add SignalFxConfig source property
See gh-12066
2018-02-19 10:49:43 +01:00
Stephane Nicoll fd0293cd5c Merge pull request #12106 from jkschneider:simple-enable
* pr/12106:
  Polish "Restore behavior of management.metrics.export.simple.enabled"
  Restore behavior of management.metrics.export.simple.enabled
2018-02-19 10:44:54 +01:00
Stephane Nicoll 1dab83adaa Polish "Restore behavior of management.metrics.export.simple.enabled"
Closes gh-12106
2018-02-19 10:44:09 +01:00
Jon Schneider da759f29d0 Restore behavior of management.metrics.export.simple.enabled
See gh-12106
2018-02-19 10:08:22 +01:00
Andy Wilkinson 19ce68d2d8 Prefix endpoint's path to controller endpoint mappings with no path
Previously, if a controll endpoint included a mapping with no path,
it would be mapped to the root of the application rather than the
root of the endpoint's path.

This commit updates the handler mappings for both reactive and Servlet
web applications to treat a mapping with no paths as being a mapping
with a single empty path. This ensures that a path with the endpoint's
path prepended is used for the mapping.

Closes gh-12104
2018-02-18 19:53:57 +00:00
Andy Wilkinson da5bebf574 Revert "Use Jersey BOM in dependency management"
This reverts commit da7bf05c87.

Closes gh-12103
2018-02-18 09:52:19 +00:00
Stephane Nicoll 7ace46e7e3 Merge pull request #12098 from sbraconnier:master
* pr/12098:
  Add JODConverter support
2018-02-17 10:38:10 +01:00
Simon Braconnier 1a238bae29 Add JODConverter support
Closes gh-12098
2018-02-17 10:34:23 +01:00
Phillip Webb 1d83e87bcd Validate @ConfigurationProperties on @Bean methods
Refactor `ConfigurationPropertiesBindingPostProcessor` to allow JSR-303
validation on `@ConfigurationProperties` defined at the `@Bean` method
level.

JSR-303 validation is now applied when a JSR-303 implementation is
available and `@Validated` is present on either the configuration
properties class itself or the `@Bean` method that creates it.

Standard Spring validation is also supported using a validator bean
named `configurationPropertiesValidator`, or by having the configuration
properties implement `Validator`.

The commit also consolidates tests into a single location.

Fixes gh-10803
2018-02-16 18:11:54 -08:00
Phillip Webb 9e75680e6f Polish 2018-02-16 18:11:54 -08:00
Madhura Bhave d2039128b5 Merge branch '1.5.x' 2018-02-16 16:55:55 -08:00
Madhura Bhave 75e82e1b2c Fix tests to use GET to bypass CsrfFilter 2018-02-16 16:49:38 -08:00