Commit Graph

1624 Commits

Author SHA1 Message Date
Stephane Nicoll
0e7b037750 Fix build failure 2017-05-14 18:47:54 +02:00
Phillip Webb
fa4de13519 Rework ConfigurationPropertySources
Rework the ConfigurationPropertySources and related adapter classes to
help with performance. The ConfigurationPropertySources class now only
monitors for updates when `.attach` is used. The `.get` methods now
return the adapted version, but no longer checks to see if sources have
been added or removed on each call.

This commit also fixes a few caching issues and makes both the
`PropertyMapper` implementations true static singletons.

See gh-9000
2017-05-09 22:09:40 -07:00
Phillip Webb
fd2e3b3505 Merge branch '1.5.x' 2017-05-09 21:55:31 -07:00
Phillip Webb
931ce15d7f Update copyright header dates 2017-05-09 21:43:52 -07:00
Phillip Webb
4a7dcc8786 Formatting 2017-05-09 21:43:24 -07:00
Stephane Nicoll
275bff39aa Remove deprecated code
Closes gh-8891
2017-05-05 14:32:09 +02:00
Madhura Bhave
ba8bdd2683 Fix actuator path used in tests 2017-05-04 14:59:47 -07:00
Madhura Bhave
2519d73f5e Merge branch '1.5.x' 2017-05-04 13:58:52 -07:00
Madhura Bhave
3d836f7730 Fix test pollution 2017-05-04 12:20:21 -07:00
Madhura Bhave
189e07e9f3 Support values other than String in /env
Fixes gh-9079
2017-05-04 11:35:15 -07:00
Stephane Nicoll
2b4f2c6aba Making sure to stop embedded web servers in tests
Closes gh-9012
2017-05-03 12:04:57 +02:00
Stephane Nicoll
5121b848e1 Making sure to stop embedded web servers in tests
Closes gh-9012
2017-05-03 11:33:42 +02:00
Phillip Webb
8133b7f245 Merge branch '1.5.x' 2017-05-02 21:43:22 -07:00
Phillip Webb
4d4d03ab2c Merge branch '1.4.x' into 1.5.x 2017-05-02 21:33:33 -07:00
Phillip Webb
4a95b2f174 Polish 2017-05-02 20:39:45 -07:00
Stephane Nicoll
64dae5ec3a Merge branch '1.5.x' 2017-05-02 13:26:04 +02:00
Stephane Nicoll
035e27b1d1 Merge branch '1.4.x' into 1.5.x 2017-05-02 13:21:03 +02:00
Stephane Nicoll
8e5bf4b22a Polish CachePublicMetrics
CachePublicMetrics wasn't explicitly tested and was still using field
injection. This commit improves the situation in preparation of the fix
for gh-8984
2017-05-02 13:15:31 +02:00
Phillip Webb
6cdb02050d Reduce InMemoryAuditEventRepository default capacity
Lower the default capacity used in `InMemoryAuditEventRepository` from
4000 to 1000. This should help reduce memory consumption.

Fixes gh-9056
2017-05-01 22:31:39 -07:00
Stephane Nicoll
f42998f5ca Revert "Refine validator and MVC validator configuration"
This commit reverts c9561f0 and 69a8c0d and effectivly fixes gh-8979 but
reintroduces the issue reported in gh-8495.
2017-04-28 11:12:09 +02:00
Madhura Bhave
6184e4154e Test correct binding in '/info' endpoint
Add a test to ensure that the updated configuration properties work
correctly binds environment sources in the `/info` endpoint.

Closes gh-7388
2017-04-27 14:34:29 -07:00
Madhura Bhave
866cf1dda7 Use new configuration properties in actuator
Update `spring-boot-actuator` to use the new configuration properties
support.

See gh-9000
2017-04-27 13:59:25 -07:00
Phillip Webb
45dd9f7144 Polish 2017-04-27 12:04:02 -07:00
Phillip Webb
df82060cad Formatting 2017-04-27 10:12:31 -07:00
Stephane Nicoll
800eb010b1 Change the default JDBC connection pool to Hikari
Closes gh-6013
2017-04-27 16:11:45 +02:00
Vedran Pavic
720e801a76 Make Audit events MVC endpoint after parameter required
Closes gh-9002
2017-04-27 10:54:45 +02:00
Phillip Webb
06558675bb Polish 2017-04-25 09:45:14 -07:00
Madhura Bhave
c2e5fd031a Replace usage of WebMvcConfigurerAdapter
Closes gh-8964
2017-04-24 15:31:39 -07:00
Spring Buildmaster
9768b0a8c2 Next Development Version 2017-04-21 08:32:01 +00:00
Phillip Webb
99a3ec8b74 Merge branch '1.5.x' 2017-04-20 16:01:58 -07:00
Phillip Webb
5f3d5fbec1 Remove public "skip path extension" constant
Remove the public constant to make it clearer that skipping path
extensions is really an internal Spring Boot concern.

See gh-8765
2017-04-20 13:31:04 -07:00
Spring Buildmaster
d719d2cbbc Next Development Version 2017-04-20 12:46:19 +00:00
Phillip Webb
81fef71fcb Merge branch '1.5.x' 2017-04-19 22:48:46 -07:00
Phillip Webb
c9561f031c Refine validator and MVC validator configuration
Update `ValidationAutoConfiguration` and `WebMvcAutoConfiguration` to
ensure as much as possible that only a single Validator bean of each
type is registered.

Validation auto-configuration now does the following:
- If no validator is found: Registers a `LocalValidatorFactoryBean`
  (providing both Spring and JSR validation)
- If the user defines a Spring & JSR validator: Backs off
- If the user defines only a JSR validator: Adapts it to a Spring
  validator (without exposing another JSR implementation)

WebMvcAutoConfiguration auto-configuration has been updated to make
MVC validation follow common Spring Boot patterns:
- If not validator beans are found (due to the user excluding
  ValidationAutoConfiguration) a new `mvcValidator` bean will be
  registered.
- If a single validator bean is found it will be used for MVC
  validation.
- If multiple validator beans are defined it will either use the one
  named `mvcValidator` or it will register a new `mvcValidator` bean

Any automatically registered `mvcValidator` bean will not implement
the JSR validator interface.

Finally, it is no longer possible to provide an MVC validator via a
`WebMvcConfigurer`.

Fixes gh-8495
2017-04-19 22:18:12 -07:00
Phillip Webb
9166bb5fae Polish 2017-04-19 12:00:36 -07:00
Phillip Webb
75f8e8a593 Fix actuator path used in tests
Fixup path changes that were missed during 1.5.x merge.
2017-04-19 11:58:07 -07:00
Phillip Webb
724be85b95 Polish 2017-04-19 11:57:48 -07:00
Stephane Nicoll
b100caa041 Fix import 2017-04-19 11:18:57 +02:00
Phillip Webb
94209e2883 Merge branch '1.5.x' 2017-04-18 15:06:43 -07:00
Andy Wilkinson
b9be0e3e0f Skip actuator path extension content negotiation
Allow `PathExtensionContentNegotiationStrategy` to be bypassed by
actuator endpoints. Prior to this commit calling `/loggers/com.aaa.cab`
would return a HTTP 406 response due to `.cab` being a known extension.

Fixes gh-8765
2017-04-18 14:56:11 -07:00
Phillip Webb
8eb79b3c0f Polish 2017-04-18 11:13:12 -07:00
Stephane Nicoll
56c68ca6cf Merge branch '1.5.x' 2017-04-18 10:43:08 +02:00
Stephane Nicoll
6c14420221 Merge branch '1.4.x' into 1.5.x 2017-04-18 10:42:48 +02:00
Stephane Nicoll
9a5346f29c Polish "Fix statsd metrics collection for names with ":""
Closes gh-8906
2017-04-18 10:40:14 +02:00
Odín del Río
9e705c83c8 Fix statsd metrics collection for names with ":"
Statsd server is ignoring malformed metrics. This change introduces
a basic sanitizing to metric names for avoid losing those metrics.

See gh-8906
2017-04-18 10:40:14 +02:00
Phillip Webb
383640d5ec Merge branch '1.5.x' 2017-04-17 22:15:33 -07:00
Phillip Webb
f46d799f31 Polish 2017-04-17 22:08:51 -07:00
Madhura Bhave
757be57d48 Merge branch '1.5.x' 2017-04-17 15:25:27 -07:00
Madhura Bhave
3fe0b844a6 Make HealthMvcEndpoint conditional on missing bean 2017-04-17 14:49:45 -07:00
Madhura Bhave
bcd79dd992 Move all actuators under /application
Context path can be configured via `management.context-path`.

Closes gh-6886
2017-04-14 15:15:44 -07:00