Commit Graph

12997 Commits

Author SHA1 Message Date
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 83e81e13f2 Add support of metadata generation for Endpoints
This commit improves the configuration metadata annotation processor to
explicitly handle `@Endpoint` annotated class. Adding a new endpoint on
a project potentially creates the following keys:

* `endpoints.<id>.enabled`
* `endpoints.<id>.cache.time-to-live`
* `endpoints.<id>.jmx.enabled`
* `endpoints.<id>.web.enabled`

Default values are extracted from the annotation type. If an endpoint
is restricted to a given tech, properties from unrelated techs are not
generated.

Closes gh-9692
2017-08-17 11:05:45 +02:00
Stephane Nicoll 25d2d55383 Merge branch '1.5.x' 2017-08-17 09:41:49 +02:00
Stephane Nicoll cbc3c8f496 Update license to Github standard template
Closes gh-10026
2017-08-17 09:41:36 +02:00
Stephane Nicoll 758370a70f Merge branch '1.5.x' 2017-08-16 18:18:29 +02:00
Stephane Nicoll fc52f6b859 Merge pull request #10012 from tabish121:amqphub-thrid-party
* pr/10012:
  Polish "Add link to AMQP 1.0 JMS Binding Spring Boot starter"
  Add link to AMQP 1.0 JMS Binding Spring Boot starter
2017-08-16 18:18:18 +02:00
Stephane Nicoll d6f99de6c0 Polish "Add link to AMQP 1.0 JMS Binding Spring Boot starter"
Closes gh-10012
2017-08-16 18:17:52 +02:00
Timothy Bish f4bd36b96c Add link to AMQP 1.0 JMS Binding Spring Boot starter
See gh-10012
2017-08-16 18:14:00 +02:00
Stephane Nicoll d5ba8f671a Make Spring Boot Antlib's integration tests compatible with JDK 9
Closes gh-10021
2017-08-16 17:41:20 +02:00
Andy Wilkinson 7a82660bb1 Make ModifiedClassPathRunner compatible with JDK 9
Closes gh-10020
2017-08-16 16:05:14 +02:00
Andy Wilkinson a07833fb51 Make BootRunIntegrationTests compatible with Java 9
Closes gh-10019
2017-08-16 15:52:22 +02:00
Stephane Nicoll 3cf0f65179 Remove regression tests for older Mockito versions
Closes gh-9904
2017-08-16 15:44:17 +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
Stephane Nicoll 35cf0c56a8 Merge branch '1.5.x' 2017-08-14 16:15:17 +02:00
Stephane Nicoll cabd798353 Polish NestedConfigurationProperty documentation
Closes gh-9895
2017-08-14 16:13:54 +02:00
Stephane Nicoll 33d6991d90 Merge pull request #10003 from gytis:master
* pr/10003:
  Upgrade to Narayana 5.6.4.Final
2017-08-14 15:46:30 +02:00
Gytis Trikleris fa7a216052 Upgrade to Narayana 5.6.4.Final
Closes gh-10003
2017-08-14 15:45:59 +02:00
Stephane Nicoll d0e0fdec1d Merge branch '1.5.x' 2017-08-14 15:45:41 +02:00
Stephane Nicoll 7db7ccf9fe Merge pull request #10004 from gytis:1.5.x
* pr/10004:
  Upgrade to Narayana 5.5.30.Final
2017-08-14 15:45:18 +02:00
Gytis Trikleris 4d42d89d71 Upgrade to Narayana 5.5.30.Final
Closes gh-10004
2017-08-14 15:44:46 +02:00
Stephane Nicoll bcf6b12dce Merge pull request #10000 from olegz:GH-9999
* pr/10000:
  Polish "Expose SpringBootCondition's logger"
  Expose SpringBootCondition's logger
2017-08-14 11:45:34 +02:00
Stephane Nicoll fa85308ab9 Polish "Expose SpringBootCondition's logger"
Closes gh-10000
2017-08-14 11:44:40 +02:00
Oleg Zhurakousky 58826644d1 Expose SpringBootCondition's logger
See gh-10000
2017-08-14 11:42:14 +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
Andy Wilkinson e92cb115e3 Merge branch 'gh-9843' 2017-08-11 13:12:38 +01:00
Andy Wilkinson a3f5aaafef Update the documentation following changes to Jolokia's auto-config
See gh-9843
2017-08-11 13:12:31 +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
Stephane Nicoll 2eb3da5b4d Merge branch '1.5.x' 2017-08-11 12:27:07 +02:00
Stephane Nicoll c73fde31ec Merge pull request #9989 from blasd:1.5.x
* pr/9989:
  Polish "Add missing dependency management for Jetty"
  Add missing dependency management for Jetty
2017-08-11 12:26:48 +02:00
Stephane Nicoll 4956829ba9 Polish "Add missing dependency management for Jetty"
Closes gh-9989
2017-08-11 12:26:16 +02:00
Benoit Lacelle 8f943c5a20 Add missing dependency management for Jetty
See gh-9989
2017-08-11 12:24:45 +02: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 0fd64db871 Merge branch '1.5.x' 2017-08-09 12:08:22 +01:00
Andy Wilkinson 9750d2e59d Fix OAuth2 sample integration test to expect corrected property names
See gh-9944
2017-08-09 12:07:57 +01:00
Andy Wilkinson b817dc1e04 Merge branch '1.5.x' 2017-08-09 12:02:16 +01:00
Andy Wilkinson 5c8fc72b41 Merge pull request #9965 from Philippe Sam-Long
* gh-9965:
  Clarify docs on effect RANDOM_PORT or DEFINED_PORT has on transactions
2017-08-09 12:02:08 +01:00
pulsation c9faefc562 Clarify docs on effect RANDOM_PORT or DEFINED_PORT has on transactions
Previously, when read too quickly, the current note may lead a user to
think that RANDOM_PORT or DEFINED_PORT directly affect transaction
management. This is not the case.

This commit attempts to clarify that the difference in transaction
behaviour is due to transactions being bound to a particular thread
and separate threads being used for the client and server when
tests are making HTTP requests.

Closes gh-9965
2017-08-09 11:57:34 +01:00
Andy Wilkinson 63cd0afadb Merge branch '1.5.x' 2017-08-09 11:53:47 +01:00
Andy Wilkinson 9f9cef1e6b Merge pull request #9940 from Johnny Lim
* gh-9940:
  Add more ConditionalOnClass checks in HealthIndicatorAutoConfiguration
2017-08-09 11:53:03 +01:00
Johnny Lim ee3de15e37 Add more ConditionalOnClass checks in HealthIndicatorAutoConfiguration
Closes gh-9940
2017-08-09 11:52:18 +01:00
Andy Wilkinson 66f9696a44 Merge branch '1.5.x' 2017-08-09 11:46:53 +01:00