Commit Graph

1735 Commits

Author SHA1 Message Date
Stephane Nicoll
ad3a14141f Polish endpoints metadata
This commit introduces manual metadata for the endpoints.all.* namespace
and polish the appendix following the work that happened in #9692
2017-08-17 11:34:08 +02:00
Stephane Nicoll
80793b3148 Cleanup additional meta-data
The new endpoint infrastructure does not provide a `path` property so
the manual metadata for older endpoints have been removed.
2017-08-17 11:07:02 +02:00
Stephane Nicoll
19e211a1c2 Add Status endpoint
This commit adds a new `/application/status` endpoint that provides only
the Health's status of an application.

Previously, `/application/health` was returning full health details or
only the status depending on configuration. Those two use cases are now
separate in two endpoints that can be configured, secured and enabled
separately.

Closes gh-9721
2017-08-16 15:30:41 +02:00
Stephane Nicoll
b9bbe9ee01 Polish 2017-08-16 13:52:40 +02:00
Stephane Nicoll
74b552826b Remove EndpointProperties
`EndpointProperties` is a left over of the infrastructure in 1.x and is
no longer used. Besides the `endpoints.enabled` property is now
`endpoints.all.enabled`.

Closes gh-10016
2017-08-16 13:41:32 +02:00
Stephane Nicoll
151f7ef325 Reinstate JMX customizations of Endpoints ObjectName
This commit restores the configuration properties used to configure how
the ObjectName of an endpoint is generated. For consistency, those
properties have been renamed to `management.jmx`

Closes gh-10005
2017-08-16 13:37:24 +02:00
Andy Wilkinson
914b3588b0 Update test as response may be received before server has deleted file
Previously, the heap dump endpoint test asserted that the temporary
heap dump file had been deleted as soon as the client received a
response. This led to intermittent test failures as the input
stream is closed after its contents have been sent to the client,
creating a race condition between the client receiving the response
and then asserting that the file had been deleted and the server
close the input stream and deleting the temporary file.

This commit updates the test so that, after receiving the response, it
will wait for up to 5 seconds for the server to have deleted the
temporary heap dump file.
2017-08-11 20:26:09 +01:00
Andy Wilkinson
41e6b2adbe Improve diagnostics when temporary heap dump file can't be deleted 2017-08-11 18:57:56 +01:00
Andy Wilkinson
e7a3b3c4e2 Polish 2017-08-11 18:46:05 +01:00
Andy Wilkinson
cf2bf0c2b9 Work around javadoc bug when linking to annotation attributes
If an annotation attribute is linked to in javadoc before the
javadoc processor encounters a usage of the annotation, the javadoc
tool fails with a class cast exception. This is a known issue [1]
but it has been closed as won't fix so we need to work around it.
Sadly, the only reasonable way to do so appears to be to remove
the links to the annotation attributes and only link to the annotation
itself.

[1] https://bugs.openjdk.java.net/browse/JDK-8170447
2017-08-11 17:45:17 +01:00
Andy Wilkinson
b49c1f6925 Pave the way for reworking the Actuator's CloudFoundry support
See gh-9996
2017-08-11 16:38:41 +01:00
Andy Wilkinson
ee16332745 Update Actuator to use the new endpoint infrastructure
This commit migrates the Actuator onto the new endpoint infrastruture.
In addition to the existing support for accessing the endpoints via
JMX and HTTP using Spring MVC, support for access via HTTP using
Jersey and WebFlux has been added. This includes using a separate
management port where we now spin up an additional, appropriately
configured servlet or reactive web server to expose the management
context on a different HTTP port to the main application.

Closes gh-2921
Closes gh-5389
Closes gh-9796
2017-08-11 16:38:41 +01:00
Stephane Nicoll
7e97495cdf Expose Jolokia directly rather than via an endpoint
Jolokia is a 100% web concern and does not fit in the Endpoint
infrastructure. This commit removes `JolokiaMvcEndpoint` and exposes
the servlet directly instead while still being part of the
management context. As such, the Jolokia servlet is exposed beneath
the management context path and will move to a separate port when
the management port is not the same as the main server port.

Closes gh-9843
2017-08-11 13:12:30 +01:00
Andy Wilkinson
5351ceb673 Correct name of ManagementContextConfiguration in spring.factories
Closes gh-7545
2017-08-10 12:50:35 +01:00
Andy Wilkinson
0aa39d0279 Improve the package structure of spring-boot-actuator module
Closes gh-7545
2017-08-10 12:08:01 +01:00
Andy Wilkinson
63cd0afadb Merge branch '1.5.x' 2017-08-09 11:53:47 +01:00
Johnny Lim
ee3de15e37 Add more ConditionalOnClass checks in HealthIndicatorAutoConfiguration
Closes gh-9940
2017-08-09 11:52:18 +01:00
Andy Wilkinson
7c52bb3a37 Improve the structure of the Liquibase endpoint's response
Closes gh-9974
2017-08-08 15:35:13 +01:00
Andy Wilkinson
f38cb7b5d8 Improve structure of Flyway endpoint response, add missing properties
Closes gh-9973
2017-08-08 10:35:26 +01:00
Andy Wilkinson
abf39915e8 Polish 2017-08-04 11:12:33 +01:00
Andy Wilkinson
e9aeb9ad63 Polish 2017-08-04 11:00:36 +01:00
Madhura Bhave
3d878e642a Remove unused properties from tests 2017-08-01 10:24:47 -07:00
Madhura Bhave
ea087b9bac Move liquibase config properties to spring.liquibase
Closes gh-9897
2017-08-01 10:24:47 -07:00
Madhura Bhave
f9e316306a Move Flyway config properties to spring.flyway
Closes gh-9896
2017-08-01 10:24:47 -07:00
Andy Wilkinson
bb55f49396 Remove concept of sensitivity from Actuator's endpoints
Closes gh-9924
2017-08-01 10:05:09 +01:00
Andy Wilkinson
8f42007aa1 Improve the structure of the response from the env endpoint
Closes gh-9864
2017-08-01 07:39:03 +01:00
Phillip Webb
e1602fe59a Polish 2017-07-31 20:46:56 -07:00
Andy Wilkinson
37bef961ea Merge branch '1.5.x' 2017-07-31 15:33:18 +01:00
Andy Wilkinson
5a8a86375d Sanitize individual env entry that is matched exactly
Closes gh-9918
See gh-8282
2017-07-31 15:27:55 +01:00
Andy Wilkinson
9f75da9a8f Simplify the Actuator's hypermedia support
This commit replaces the Acuator's support for hypermedia with a
single endpoint that returns HAL-formatted links to all of the
available endpoints. This is done without requiring Spring HATEOAS
to be on the classpath in a similar manner to the existing
CloudFoundry discovery endpoint.

Closes gh-9901
2017-07-30 22:43:05 +01:00
Andy Wilkinson
4a61e45644 Require separate management port to use management context path of /
Closes gh-9898
2017-07-30 22:42:01 +01:00
Andy Wilkinson
fb3d79c750 Drop support for self-hosted Actuator docs
Closes gh-9899
2017-07-29 09:19:53 +01:00
Phillip Webb
30ff329e3d Polish 2017-07-28 10:11:49 -07:00
Stephane Nicoll
92e48f6ee2 Fix build failure
This test definitely doesn't need Aspect processing since the project
doesn't have a dependency on `aspectjweaver`

Closes gh-9880
2017-07-28 13:43:58 +02:00
Stephane Nicoll
b9b284d3d0 Merge branch '1.5.x' 2017-07-28 12:02:54 +02:00
Stephane Nicoll
5c13b8bf50 Separate custom schema configuration for Liquibase test
Unfortunately, creating the schema in code did not offer the right
condition to reproduce the error scenario. This commit restore the
initial intent, but separating the configuration and cleaning the
created context properly.

See gh-9862
2017-07-28 11:59:15 +02:00
Stephane Nicoll
7736cb1dc5 Fix test so that it doesn't leave a datasource hanging around
Closes gh-9862
2017-07-28 11:43:28 +02:00
Stephane Nicoll
edee342d80 Merge branch '1.5.x' 2017-07-28 10:24:11 +02:00
Stephane Nicoll
7e21178f63 Polish "Use configured schema in Liquibase endpoint"
Closes gh-9862
2017-07-28 10:21:27 +02:00
Craig Andrews
3e13970fe0 Use configured schema in Liquibase endpoint
This commit makes sure that the Liquibase endpoint uses the configured
schema.

See gh-98£62
2017-07-28 10:21:27 +02:00
Phillip Webb
9127c48fb5 Fixup warnings 2017-07-27 16:39:49 -07:00
Spring Buildmaster
17a5bb0be4 Next development version 2017-07-27 08:00:21 +00:00
Phillip Webb
07556cda51 Restructure boot.test.context package
Split up `org.springframework.boot.test.context` into distinct packages
for `runner` and `assertj`.

See gh-9875
2017-07-26 17:47:59 -07:00
Phillip Webb
497457c397 Rename ApplicationContextTester -> Runner
Rename `ApplicationContextTester` and related classes to
`ApplicationContextRunner` and refactor existing tests to use correctly
named variables.

See gh-9875
2017-07-26 17:46:06 -07:00
Spring Buildmaster
41c5c0e7c9 Next development version 2017-07-26 08:30:55 +00:00
Emanuel Campolo
2626a3a795 Use lambdas when possible
Replace anonymous inner classes with lambda declarations (when possible
using method references).

See gh-9781
2017-07-25 00:53:38 -07:00
Emanuel Campolo
798fe5ed53 Collapse catch clauses
Use multi-catch for exceptions whenever possible.

See gh-9781
2017-07-25 00:53:37 -07:00
Emanuel Campolo
4a189bdee7 Replace Collections.sort() with direct sort call
Replace existing `Collections.sort(...)` calls with `.sort(...)`
directly on the collection instance.

See gh-9781
2017-07-25 00:53:37 -07:00
Emanuel Campolo
04fdec6f8b Replace explicit generics with diamond operator
Where possible, explicit generic declarations to use the Java 8 diamond
operator.

See gh-9781
2017-07-25 00:53:37 -07:00
Andy Wilkinson
6df1be3f1a Merge branch '1.5.x' 2017-07-22 08:22:35 +01:00