Commit Graph

1656 Commits

Author SHA1 Message Date
Stephane Nicoll 75274d3024 Merge branch '1.5.x' 2017-06-20 14:48:04 +02:00
Stephane Nicoll 3f70638f1c Polish "Use getUsableSpace() in DiskSpaceHealthIndicator"
Closes gh-9544
2017-06-20 14:44:11 +02:00
Huang YunKun 158416fdd0 Use getUsableSpace() in DiskSpaceHealthIndicator
See gh-9544
2017-06-20 14:43:38 +02:00
Andy Wilkinson 4a030d5a7a Drop support for auto-configuring an embedded Elasticsearch node
Elastic have announced [1] that embedded Elasticsearch is no longer
supported. This commit brings us into line with that announcement by
removing the auto-configuration that would create an Elasticsearch
Node and NodeClient.

To use the Elasticsearch auto-configuration, a user must now provide
the address of one or more cluster nodes
(via the spring.elastisearch.cluster-nodes property) which will then
be used to create a TransportClient.

See gh-9374

[1] https://www.elastic.co/blog/elasticsearch-the-server
2017-06-15 19:52:24 +01:00
Phillip Webb b94bb00fa1 Remove need for attached test-jar artifacts
Remove test-jar artifacts from Maven projects and relocate classes. The
majority of utilities now live in the `spring-boot-testsupport` module.

This update will help us to deploy artifacts using the standard Maven
deploy plugin in the future (which doesn't support the filtering of
individual artifacts).

Fixes gh-9493
2017-06-12 21:11:35 -07:00
Andy Wilkinson f7e9ec5f42 Minimise our usage of SocketUtils.findAvailableTcpPort
Closes gh-9382
2017-06-09 14:45:09 +01:00
Spring Buildmaster 05d4d0281c Next Development Version 2017-06-08 12:47:16 +00:00
Andy Wilkinson a72c1b2cba Merge branch '1.5.x' 2017-06-07 14:02:46 +01:00
Andy Wilkinson 9579e95868 Handle explicit disablement of management SSL correctly
Closes gh-9423
2017-06-07 13:57:59 +01:00
Phillip Webb 2c7dd9f519 Polish 2017-06-02 16:00:39 -07:00
Phillip Webb b9fd99e268 Polish 2017-06-02 13:47:28 -07:00
Stephane Nicoll 605dee4700 Allow to reset a log level
This commit ensures that `setLogLevel` on the `LoggingSystem` accepts
a `null` level. A `null` level means any customization sets on that
level should be removed and the default configuration should be used
instead.

Effectively, the level of the parent logger is going to be used when
`setLevel` is called with `null` for a given logger.

Most JMX clients do not accept to pass `null` for an argument so an
empty String is translated to null in that specific case.

Closes gh-8776
2017-06-01 14:31:07 +02:00
Stephane Nicoll bdf2b2e810 Merge branch '1.5.x' 2017-06-01 13:38:03 +02:00
Stephane Nicoll 9fc90a809f Add missing @Test annotations 2017-06-01 13:37:05 +02:00
Andy Wilkinson 5ef29653c7 Polish 2017-05-31 15:05:19 +01:00
Madhura Bhave d745b69630 Replace usages of EnvironmentTestUtils 2017-05-24 14:59:04 -07:00
Phillip Webb 05111a17b8 Polish 2017-05-23 17:04:44 -07:00
Andy Wilkinson d5438c299c Polish "Use try-with-resources to close resources automatically"
- Apply code formatting
- Use try-with-resources in many other places that were missed in the
  pull request

Closes gh-8045
2017-05-23 19:38:48 +01:00
rajadilipkolli 3e797c326a Use try-with-resources to close resources automatically
See gh-8045
2017-05-23 17:34:35 +01:00
Andy Wilkinson 9192db692b Use WebRequest rather than RequestAttributes in ErrorAttributes
This change aligns ErrorAttributes with ResponseEntityExceptionHandler
which takes a WebRequest as a parameter of its handleException method.
WebRequest extends RequestAttributes and provides access to much more
than just the request's attributes. For example request headers and
parameters are available from WebRequest.

Closes gh-7952
Closes gh-6555
2017-05-23 15:15:22 +01:00
Stephane Nicoll 895f06fdfa Polish 2017-05-23 15:23:38 +02:00
Rocky Shang 51d4e88537 Display unconditional classes in auto-config endpoint
Closes gh-9227
2017-05-23 15:23:21 +02:00
Stephane Nicoll 1a00692b27 Merge branch '1.5.x' 2017-05-23 10:52:31 +02:00
Stephane Nicoll d4a0fe5ff9 Polish "Fix configuration properties output for actuator"
Closes gh-9052
2017-05-23 10:48:45 +02:00
Wesley Stratton 7d6293f79d Fix configuration properties output for actuator
See gh-9052
2017-05-23 10:48:45 +02:00
Stephane Nicoll a1adcd9919 Merge branch '1.5.x' 2017-05-22 11:07:25 +02:00
Stephane Nicoll 4cc515054e Merge branch '1.4.x' into 1.5.x 2017-05-22 11:06:40 +02:00
Stephane Nicoll a59000354c Support for TransactionAwareCacheDecorator
This commit makes sure to unwrap any transaction aware cache before
collecting metrics for them.

Closes gh-8984
2017-05-22 11:05:39 +02:00
Eddú Meléndez ce0b1b242b Modify return on post /loggers to HTTP 204
This commit alter the return http status code from 200 to 204.

Closes gh-8919
2017-05-19 09:42:03 +02:00
Phillip Webb 302f038e84 Polish 2017-05-15 20:35:29 -07:00
Andy Wilkinson ee499b029a Merge branch '1.5.x' 2017-05-15 19:58:34 +01:00
Gytis Trikleris 00823d41a9 Log a warning if a health indicator throws an exception
Closes gh-9110
2017-05-15 19:53:55 +01:00
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