Commit Graph

12972 Commits

Author SHA1 Message Date
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
Andy Wilkinson dc33ec1ad9 Merge pull request #9914 from Dennis Kieselhorst
* gh-9914:
  Avoid NPE in AnnotationsPropertySource if getAnnotations returns null
  Polish "Avoid NPE in PropertyMappingContextCustomizer"
  Avoid NPE in PropertyMappingContextCustomizer
2017-08-09 11:44:19 +01:00
Andy Wilkinson 7967c64d65 Avoid NPE in AnnotationsPropertySource if getAnnotations returns null
Closes gh-9914
2017-08-09 11:42:38 +01:00
Andy Wilkinson 25d0cc167e Polish "Avoid NPE in PropertyMappingContextCustomizer"
See gh-9914
2017-08-09 11:41:39 +01:00
Dennis Kieselhorst e7a6b8c260 Avoid NPE in PropertyMappingContextCustomizer
See gh-9914
2017-08-09 11:40:41 +01:00
Andy Wilkinson fcec8a9b0b Merge branch '1.5.x' 2017-08-09 11:28:35 +01:00
Andy Wilkinson 3cc22ecffb Merge pull request #9944 from Christian Bühler
* gh-9944:
  Polish "Fix logged property names when initializing OAuth2 client"
  Fix logged property names when initializing OAuth2 client
2017-08-09 11:27:44 +01:00
Andy Wilkinson e08d09f5a3 Polish "Fix logged property names when initializing OAuth2 client"
See gh-9944
2017-08-09 11:26:56 +01:00
Christian Bühler 6babd41f19 Fix logged property names when initializing OAuth2 client
Closes gh-9944
2017-08-09 11:23:51 +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 83c8c0b848 Fix layout of endpoint tables
See gh-9924
2017-08-04 13:15:18 +01:00
Andy Wilkinson befe6e6d0b Merge branch '1.5.x' 2017-08-04 12:57:29 +01:00
Andy Wilkinson b90803249e Start building against Spring Framework 4.3.11 snapshots
See gh-9956
2017-08-04 12:47:54 +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
Andy Wilkinson 6090fd3eb0 Merge branch '1.5.x' 2017-08-03 21:38:10 +01:00
Andy Wilkinson debf285772 Update the Maven Wrapper using Takari Maven Plugin 0.4.1
See gh-9928
2017-08-03 21:37:05 +01:00
Andy Wilkinson 5c06bd5ab9 Merge branch '1.5.x' 2017-08-03 21:23:28 +01:00
Andy Wilkinson 1f37da5b06 Merge pull request #9938 from Johnny Lim
* gh-9938:
  Polish
2017-08-03 21:17:42 +01:00
Johnny Lim 56f47e1a50 Polish
Closes gh-9938
2017-08-03 21:17:10 +01:00
Andy Wilkinson 09b41a33e8 Wait for process to exit when stopping DevTools integration test apps 2017-08-03 21:00:22 +01:00
Andy Wilkinson 4106615425 Merge branch '1.5.x' 2017-08-03 19:52:27 +01:00
Andy Wilkinson 7a87c69dd0 Normalize spec when creating jar URL by removing /../ and /./
Previously when Handler was creating a URL from a context URL and a
spec, any occurrances of /../ or /./ in the spec would be left as-is.
This differed from the JDK's Handler implementation which normalizes
the URL by modifying the path to remove any occurrences of /../ or
/./

This commit updates our Handler implementation to align it with the
JDK's. Tests have been added to assert that, given the same inputs,
the two Handler classes produce the same output.

Closes gh-9917
2017-08-03 19:48:58 +01:00
Andy Wilkinson 4f45b2bb52 Merge branch 'endpoint-infrastructure' 2017-08-03 18:44:19 +01:00
Andy Wilkinson 9687a5041e Add support for making endpoints accessible via HTTP
This commit adds support for exposing endpoint operations over HTTP.
Jersey, Spring MVC, and WebFlux are all supported but the programming
model remains web framework agnostic. When using WebFlux, blocking
operations are automatically performed on a separate thread using
Reactor's scheduler support. Support for web-specific extensions is
provided via a new `@WebEndpointExtension` annotation.

Closes gh-7970
Closes gh-9946
Closes gh-9947
2017-08-03 18:44:11 +01:00