root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
18,966 Commits 23 Branches 348 Tags 287 MiB
Commit Graph

585 Commits

Author SHA1 Message Date
Stephane Nicoll ff8b8c55c6 Remove reference to "management.metrics.binders.integration.enabled" 
Closes gh-14319
 2018-09-06 12:17:57 +02:00
Phillip Webb c3de4c84f2 Polish 2018-09-05 12:54:20 -07:00
Madhura Bhave f0d7533e0b Merge branch '2.0.x' 2018-09-04 17:09:52 -07:00
Madhura Bhave 9c82d5c382 Make ApplicationContextServerWebExchangeMatcher and subclasses thread-safe 
Fixes gh-14161
 2018-09-04 17:06:24 -07:00
Andy Wilkinson 8ee4775820 Polish 2018-09-04 20:46:35 +01:00
Stephane Nicoll 1ceb076035 Harmonize Metrics test 
This commit harmonizes metrics test to rely on `MetricRun.simple()`
rather than configuring a simple `MeterRegistry` manually. Rather than
applying related auto-configurations automatically, `MetricsRun` only
enable the absolute minimum.

See gh-14255
 2018-09-04 15:04:02 +02:00
Stephane Nicoll 3d732e86f4 Merge branch '2.0.x' 2018-09-04 08:52:35 +02:00
Johnny Lim ca57e58ee5 Polish 
See gh-14293
 2018-09-04 08:52:13 +02:00
Stephane Nicoll 4634811c7c Polish 2018-08-31 14:45:17 +02:00
Stephane Nicoll 7bee9dfc22 Harmonize HTTP client metrics 
This commit harmonizes the auto-configurations for RestTemplate and
WebClient in a single `HttpClientMetricsAutoConfiguration`. Doing so
allows to give a better scope for the shared `MeterFilter`.

As a result`WebClientMetricsAutoConfiguration` has moved to the `client`
package.

Closes gh-14269
 2018-08-31 14:45:03 +02:00
Stephane Nicoll 6c26315cd1 Merge branch '2.0.x' 2018-08-30 13:08:42 +02:00
Stephane Nicoll 0625443d27 Polish "Limit metrics collection of incoming requests" 
Closes gh-14173
 2018-08-30 12:59:07 +02:00
Dmytro Nosan 81a6701914 Limit metrics collection of incoming requests 
See gh-14173
 2018-08-30 12:26:06 +02:00
dreis2211 422a436df1 Polish some Collectors 
See gh-13727
 2018-08-27 18:09:02 +02:00
Stephane Nicoll dd9209c7d9 Merge branch '2.0.x' 2018-08-22 10:48:35 +02:00
Stephane Nicoll 000cb94323 Polish "Fix String concatenation in a loop" 
Closes gh-14153
 2018-08-22 10:47:05 +02:00
Hiroaki Yoshida 43acc37587 Fix String concatenation in a loop 
See gh-14153
 2018-08-22 10:46:14 +02:00
Stephane Nicoll f5d922c712 Upgrade to Spring Integration 5.1.0.M2 
Upgrade to M2 broke a test that was looking for a particular bean that
is configured by Spring Integration (`HeaderChannelRegistry`).

It looks like INT-4517 is related to the regression as it registers the
bean too late for the auto-configuration to see it.

This commit changes the condition to a more central bean that is created
very early on.

Closes gh-14142
 2018-08-21 09:56:19 +02:00
Stephane Nicoll b60fbe5a1f Merge branch '2.0.x' 2018-08-20 17:00:36 +02:00
Stephane Nicoll b0d388830f Polish test 2018-08-20 17:00:21 +02:00
Vedran Pavic 644ab5f3e4 Align SessionsEndpoint with Spring Session API improvements 
This commit aligns SessionsEndpoint with
FindByIndexNameSessionRepository API improvements that simplifies
retrieval of sessions by principal name.

Closes gh-14124
 2018-08-18 11:27:35 +02:00
Madhura Bhave d724f154f4 Merge branch '2.0.x' 2018-08-16 15:45:20 -07:00
Madhura Bhave b93c2b9a9f Allow actuator endpoints to be used with mvcMatchers 
This commit changes AbstractWebMvcEndpointHandlerMapping to
be a MatchableHandlerMapping. Additionally, EndpointRequest,
now delegates to MvcRequestMatcher for Spring MVC applications.

For all other applications, AntPathRequestMatcher is used as
a delegate.

Closes gh-13962
 2018-08-16 15:41:02 -07:00
Johnny Lim 101cc59b7d Polish 
Closes gh-14023
 2018-08-09 09:32:10 +02:00
Stephane Nicoll a12ca0a0dc Merge branch '2.0.x' 2018-08-08 16:05:34 +02:00
Stephane Nicoll a023bd030a Add configurable timeout for Couchbase health indicator 
This commit makes sure to use a configurable timeout to check if the
Couchbase cluster is up, rather than relying on the default that can be
quite long.

Closes gh-13879
 2018-08-08 16:01:58 +02:00
Stephane Nicoll 14a9ec8711 Polish 2018-08-06 14:44:44 +02:00
Stephane Nicoll e6b44189e0 Polish "Add global support for JMX unique names" 
This commit ensures that the new "spring.jmx.unique-names" property
deprecates the Endpoint's specific property as they share the same goal.

If both are set with an incompatible value, an exception is thrown
inviting the user to update their configuration.

Closes gh-13990
 2018-08-06 14:35:18 +02:00
Stephane Nicoll 624c1306fd Merge branch '2.0.x' 2018-08-03 18:25:24 +02:00
Stephane Nicoll 737b4a275b Polish 2018-08-03 18:24:59 +02:00
Stephane Nicoll 0e750f982b Merge branch '2.0.x' 2018-08-03 09:25:15 +02:00
Johnny Lim 7b6b91aae7 Return null immediately when sla is null in convertSla() 
Closes gh-13991
 2018-08-03 09:23:22 +02:00
Phillip Webb 1b91c0ceb7 Merge branch '2.0.x' 2018-07-29 09:29:57 +01:00
Phillip Webb 0ec22c8bf9 Polish copyright date on changed files 2018-07-29 09:29:29 +01:00
Phillip Webb 80da9cf5eb Merge branch '2.0.x' 2018-07-29 09:28:56 +01:00
Phillip Webb aeb885192e Polish ternary expressions 2018-07-29 09:24:46 +01:00
Phillip Webb a6c9c92f2e Merge branch '2.0.x' 2018-07-28 01:35:43 +01:00
Phillip Webb e6a68b39a3 Fix checkstyle javadoc issues 
Fix checkstyle issues in javadoc following the spring-javaformat
upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
Phillip Webb 7fc455654a Fix checkstyle ternary issues 
Fix checkstyle issues with ternary expressions following the
spring-javaformat upgrade.

See gh-13932
 2018-07-28 01:11:52 +01:00
Madhura Bhave f2a9030788 Merge branch '2.0.x' 2018-07-27 12:23:51 -07:00
Madhura Bhave e753b530fa EndpointRequest should match links with trailing slash 
Fixes gh-13921
 2018-07-27 12:23:27 -07:00
Phillip Webb b5b60c2053 Merge branch '2.0.x' 2018-07-26 13:23:07 +01:00
Phillip Webb 9a9111af21 Support path discovery for main dispatcher servlet 
Add an `DispatcherServletPath` interface which provides a much more
consistent way to discover the path of the main dispatcher servet.

Prior to this commit, auto-configurations would often make use of the
`ServerProperties` class to discover the dispatcher servlet path. This
mechanism isn't very explicit and also makes it hard for us to relocate
that property in Spring Boot 2.1.

This commit also reverts most of fddc9e9c7e since it is now clear that
the supporting multiple dispatcher servlet paths will be much more
involved that we originally anticipated.

Closes gh-13834
 2018-07-26 11:35:12 +01:00
Phillip Webb d37e717500 Polish 2018-07-26 11:35:12 +01:00
Stephane Nicoll 1e7aa7c4bc Fix Spring Integration imports 2018-07-25 16:25:06 +02:00
Stephane Nicoll af0aa11d15 Polish "Add reactive health indicator for Cassandra" 
Closes gh-13864
 2018-07-25 10:16:17 +02:00
artsiom 61c41555c8 Add reactive health indicator for Cassandra 
See gh-13864
 2018-07-25 10:16:17 +02:00
Stephane Nicoll 6dc0cb4f67 Merge branch '2.0.x' 2018-07-24 09:33:22 +02:00
Stephane Nicoll 7176c54f5e Polish "Add metric description and base unit to metrics endpoint" 
Closes gh-13813
 2018-07-24 09:32:22 +02:00
Johannes Edmeier ab1f8cf77b Add metric description and base unit to metrics endpoint 
See gh-13813
 2018-07-24 09:32:22 +02:00
Stephane Nicoll ecb8da2536 Polish "Upgrade to Micrometer 1.0.6" 
Closes gh-13819
 2018-07-24 09:25:54 +02:00
Jon Schneider f478911c54 Upgrade to Micrometer 1.0.6 
See gh-13819
 2018-07-24 09:12:06 +02:00
Madhura Bhave 9b6a069903 Merge branch '2.0.x' 2018-07-17 16:54:43 -07:00
Johnny Lim 86ccb26c58 Polish EndpointRequest.RequestMatcherFactory.antPath() 
Closes gh-13775
 2018-07-17 16:53:33 -07:00
Andy Wilkinson 6a189cee06 Merge branch '2.0.x' 2018-07-17 19:26:08 +01:00
Andy Wilkinson a57d0f0853 Reinstate order of WebMvcMetricsFilter 
Closes gh-13781
 2018-07-17 19:14:17 +01:00
Stephane Nicoll 070c26d6c3 Merge branch '2.0.x' 2018-07-17 12:03:58 +02:00
Stephane Nicoll d6c7eff8f7 Add check for empty values for lookup 
Closes gh-13419
 2018-07-17 12:01:26 +02:00
Johnny Lim 58df752af4 Polish 
See gh-13790
 2018-07-17 10:25:38 +02:00
Stephane Nicoll 43091150d8 Merge branch '2.0.x' 2018-07-17 10:23:12 +02:00
Johnny Lim f363fe7dd1 Polish 
See gh-13790
 2018-07-17 10:03:41 +02:00
Andy Wilkinson ac1f2a5817 Polish 2018-07-14 08:45:34 +01:00
Madhura Bhave d1b8558430 Make /health and /info insecure by default 
Closes gh-13722
 2018-07-13 13:35:52 -07:00
Stephane Nicoll fa171671b1 Merge branch '2.0.x' 2018-07-13 09:39:29 +02:00
Stephane Nicoll e6ea28dec5 Polish 2018-07-13 09:36:37 +02:00
Johnny Lim 13202eb278 Prevent duplicate RequestMatcher in RequestMatcherFactory.antPath() 
Closes gh-13706
 2018-07-13 09:35:34 +02:00
Johnny Lim f94ce495d8 Fix parameter order for RequestMatcherAssert.doesNotMatch() 
Closes gh-13707
 2018-07-10 11:36:47 -07:00
dreis2211 be837ccb4b Use PropertySources.stream() where possible 
Closes gh-13724
 2018-07-10 15:35:03 +02:00
Andy Wilkinson c1a81cfca0 Prohibit bean overriding by default and analyze override failures 
Closes gh-13609
 2018-07-10 12:28:18 +01:00
Johnny Lim b87b23a44f Fix parameter order for RequestMatcherAssert.doesNotMatch() 
Closes gh-13707
 2018-07-09 15:20:18 -07:00
Stephane Nicoll 60457f1d9a Merge branch '2.0.x' 2018-07-09 13:22:14 +02:00
Stephane Nicoll 44b9aa168e Polish "Improve description of Endpoint exclude" 
Closes gh-13619
 2018-07-09 13:20:43 +02:00
Miguel Gomes 838e6cdbbb Improve description of Endpoint exclude 
See gh-13619
 2018-07-09 13:12:13 +02:00
Brian Clozel 68a3c234be Adapt to API changes in Reactor Netty 
The following issue changed the SSL configuration API for both client
and server: https://github.com/reactor/reactor-netty/issues/370
 2018-07-06 14:45:47 +02:00
Andy Wilkinson fd624c20cf Upgrade to Hikaricp 3.2.0 
Closes gh-13695
 2018-07-03 20:04:55 +01:00
Andy Wilkinson b6b37c91bb Upgrade to Flyway 5.1.3 
Closes gh-13672
 2018-07-03 17:30:48 +01:00
Madhura Bhave 4eff07f6c0 Merge branch '2.0.x' 2018-06-28 12:49:34 -07:00
Madhura Bhave fddc9e9c7e Support multiple paths in DispatcherServletPathProvider 
Closes gh-13603
 2018-06-28 12:36:58 -07:00
Johnny Lim bb60edaca6 Polish 
Closes gh-13534
 2018-06-21 09:24:36 +02:00
Stephane Nicoll d4d169277d Merge branch '2.0.x' 2018-06-21 09:23:43 +02:00
Johnny Lim b9ea0fd5a7 Polish 
See gh-13534
 2018-06-21 09:20:50 +02:00
Stephane Nicoll 9d3ba14686 Fix conditions for CachingConnectionFactory support 
Closes gh-12161
 2018-06-19 19:58:48 +02:00
Stephane Nicoll defa171a32 Merge branch '2.0.x' 2018-06-18 13:41:36 +02:00
Johnny Lim dd3bfdbe42 Use @ManagementContextConfiguration consistently 2018-06-18 13:28:30 +02:00
Brian Clozel cb6c8f76e2 Configure X-Forwarded-* support with Reactor Netty 
This commit configures the new X-Forwarded-* / Forwarded HTTP headers
support with Reactor Netty in its 0.8.0 version.

Closes gh-10900
 2018-06-13 14:55:33 +02:00
Stephane Nicoll c738b73c6f Merge branch '2.0.x' 2018-06-13 09:29:36 +02:00
Johnny Lim 870d7fe16a Use @SpringBootTest.properties in tests and samples 
Closes gh-13453
 2018-06-13 09:24:28 +02:00
Madhura Bhave 6eaae608b5 Merge branch '2.0.x' 2018-06-06 10:49:46 -07:00
Madhura Bhave 461202bc25 EndpointRequest uses empty servlet path if not available 
Fixes gh-13399
 2018-06-06 10:48:42 -07:00
Stephane Nicoll 0d63e7f592 Merge branch '2.0.x' 2018-06-06 09:30:46 +02:00
dreis2211 ba8a32fa4e Replace commons-codec Base64 usage 
See gh-13378
 2018-06-06 09:19:17 +02:00
Phillip Webb 66be6c3396 Polish 2018-06-05 17:44:51 -07:00
Stephane Nicoll 83f7df920b Merge branch '2.0.x' 2018-06-05 13:30:07 +02:00
Stephane Nicoll bf56ec496d Polish 2018-06-05 13:29:56 +02:00
Stephane Nicoll 47634f5587 Polish 2018-06-05 13:21:03 +02:00
Stephane Nicoll 1901008d6f Merge branch '2.0.x' 2018-06-05 13:18:40 +02:00
Stephane Nicoll fff06822dc Polish 2018-06-05 13:15:38 +02:00
Stephane Nicoll d84e2b90d7 Fix wrong usage of ManagementContextConfiguration 
Closes gh-13366
 2018-06-05 13:15:21 +02:00
Stephane Nicoll 3248400665 Merge branch '2.0.x' 2018-06-05 10:12:46 +02:00
Stephane Nicoll b4f8361989 Make JMX metrics domain configurable 
Closes gh-13356
 2018-06-05 10:12:26 +02:00