Commit Graph

5631 Commits

Author SHA1 Message Date
Andy Wilkinson dad0574fd5 In absence of HAL browser, serve browsers JSON from actuator entry point
Following the changes made to combines the /links and /hal endpoints
into a single /actuator endpoint, a web browser accessing /actuator
would receive a 406 response if HAL browser was not on the classpath.

This commit updates the /actuator main entry point so that it will
serve JSON to a web browser when HAL browser is not on the classpath.

The actuator's embedded documentation has also been updated to reflect
the recent changes.

Closes gh-3696
2015-08-10 16:02:33 +01:00
Stephane Nicoll 3763eda64e Merge branch '1.2.x' 2015-08-10 16:36:11 +02:00
Stephane Nicoll 1ee31e73d3 Avoid NPE if @ConfigurationProperties is not present
The annotation processor detects `@ConfigurationProperties` bean or
method definition and merges manual meta-data. The former step will fail
with a NPE if the annotation is not present on the classpath. This could
happen if the annotation processor is added to a module that is not
actually using Spring Boot.

We now have a defensive check that skips that steps but still attempts to
merge manual meta-data if present.

Closes gh-3720
2015-08-10 16:34:30 +02:00
Andy Wilkinson 25709385e6 Update Hypermedia samples following /hal and /links being combined
See gh-3696
2015-08-10 14:21:22 +01:00
Stephane Nicoll 04b1de2d1d Add package-name option for spring init
For some reason, we forgot to add an attribute to customize the package
name when using spring init. This is now the case.

Closes gh-3716
2015-08-10 14:32:50 +02:00
Dave Syer 25ac258d22 Clarify plugin documentation for requiresUnpack 2015-08-10 12:52:00 +01:00
Andy Wilkinson 1e4c972c3d Fix customJodaDateTimeFormat to specify time zone when creating Date
See gh-3569
2015-08-10 12:36:54 +01:00
Dave Syer 68af0a73ec Clarify documentation in a few areas
Fixes gh-3527
2015-08-10 11:50:48 +01:00
Andy Wilkinson a62ec1028c Upgrade to Jackson 2.6.1
Closes gh-3569
2015-08-10 11:44:13 +01:00
Andy Wilkinson 58db5a3889 Combine /links and /hal into a single /actuator endpoint
This commit provides a single endpoint, /actuator, that serves HTML
(the HAL browser) or JSON depending on the request’s accept header
that enables discovery of all of the actuator’s other endpoints.

When the management context path is configured, the /actuator endpoint
moves to the configured path, e.g. if the management context path is
set to /management, the actuator endpoint will be available from
/management.

Closes gh-3696
2015-08-10 11:40:35 +01:00
Dave Syer ce512a18f3 Add test to support binding nested properties
See gh-3539
2015-08-10 11:22:47 +01:00
Dave Syer 2985b0e9d8 Clarify init params in Jersey autoconfig (only servlet and filter)
See gh-3557
2015-08-10 10:50:49 +01:00
Stephane Nicoll 7bc5322034 Merge branch '1.2.x' 2015-08-09 09:04:17 +02:00
Thomas Traude 2b6d7a3f15 Update URL to Groovy Docs
Closes gh-3715
2015-08-09 09:03:54 +02:00
Stephane Nicoll 3507451c9a Merge branch '1.2.x' 2015-08-07 16:03:47 +02:00
Stephane Nicoll f88d548de0 Fix typo
Closes gh-3700
2015-08-07 16:03:25 +02:00
Stephane Nicoll 95dac0bbec Polish documentation
Improve the documentation on using two entity managers if Spring Data is
used.

Closes gh-3433
2015-08-07 10:13:34 +02:00
Stephane Nicoll bae3dcba33 Polish error pages documentation
Make it more clear that the `ErrorPage` path requires an URL mapping to
be registered.

Closes gh-3698
2015-08-07 10:05:02 +02:00
Stephane Nicoll 20c1c617ef Polish
See gh-3684
2015-08-06 13:30:35 +02:00
Stephane Nicoll eae9682117 Avoid package tangle 2015-08-06 13:20:10 +02:00
Andy Wilkinson e482da06b8 Merge branch 'gh-3643' 2015-08-06 12:07:16 +01:00
Andy Wilkinson 9fcc860908 Polish contribution
Closes gh-3643
2015-08-06 12:06:39 +01:00
Joao Pedro Evangelista 7568af1710 Add auto-configuration of HttpPutContentFormFilter
Closes gh-3652
2015-08-06 12:06:28 +01:00
Andy Wilkinson ffe2e9b66b Clarify javadoc of SpringApplication.configureProfiles
Closes gh-2671
2015-08-06 11:47:27 +01:00
Andy Wilkinson 1a11ed20ba Provide a property to configure conversion word used to log exceptions
This commit adds a new property, logging.exception-conversion-word,
that can be used to configure the conversion word that is used when
logging exceptions. The default value, %rEx, will log exceptions
with the root cause first and include class packaging information in
the stack trace. The new property is supported when using either
Logback or Log4J2.

Closes gh-3684
2015-08-06 11:37:54 +01:00
Stephane Nicoll 67d29c13f5 Fix typo 2015-08-06 11:52:51 +02:00
Stephane Nicoll e88c58828f Polish documentation
Upgrade documentation for the `hal` and `links` endpoints as they are
not using the root anymore.

Closes gh-3621
2015-08-06 11:13:53 +02:00
Phillip Webb 28f32da74f Don't user root path for HAL endpoints
Update LinksMvcEndpoint and HalBrowserMvcEndpoint so that no longer try
to use the `/` context path. Links are now available from `/links` and
the HAL browser is available from `/hal`.

The actuator HAL browser now works with either WebJars or the Spring
Data version. It also now transforms the initial HTML so that the
form is pre-populated with `/links`.

When using Spring Data's HAL browser, the root includes a link to
`/links` with a rel of `actuator`.

See gh-3621
2015-08-06 00:29:00 -07:00
Phillip Webb 44aacd9559 Polish 2015-08-06 00:25:18 -07:00
Phillip Webb 51fb2e32f6 Fix link elements in restdoc headings
Replace `Link :` prefixes in the restdoc headings with link icons next
to the HTTP request. This fixes render issues with the titles and allows
the TOC to still function correctly.

Fixes gh-3689
2015-08-06 00:25:18 -07:00
Phillip Webb 1fba24ffe4 Generate rest documentation in compile phase
Update `spring-boot-actuator-docs` to generate rest documentation in
the compile phase.
2015-08-06 00:25:07 -07:00
Phillip Webb 9a53707014 Add @ImportAutoConfiguration annotation for tests
Add a new `@ImportAutoConfiguration` annotation that can be used by
tests that wish to selectively import certain auto-configuration
classes. Also add `@AutoConfigurationPackage` so that package
registration is decoupled from `@EnableAutoConfiguration`.

An added benefit of the change is @EnableAutoConfigurationImportSelector
can now be subclassed to provide custom annotation support if needed.

Fixes gh-3660
See gh-2772
2015-08-05 14:58:19 -07:00
Phillip Webb 8d92236eea Polish 2015-08-05 12:09:23 -07:00
Phillip Webb 3ff878a94b Remove `include` from @EnableAutoConfiguration
Revert commit 1d31d23e29 to
remove `include` from `@EnableAutoConfiguration`. We'll
add a dedicated annotation instead to fix this.

See gh-3660
2015-08-05 10:03:43 -07:00
Andy Wilkinson 059a30610f Revert "Upgrade to Jackson 2.6.0"
This reverts commit f76197066c.

See gh-3569
2015-08-05 17:57:54 +01:00
Andy Wilkinson b396d0d291 Update logging defaults to show class packaging info and log cause first
This commit updates the default logging configuration for both Logback
and Log4J 2 to include class packaging information when logging
exceptions and to log the root cause first.

Closes gh-3398
Closes gh-3399
2015-08-05 17:20:10 +01:00
Andy Wilkinson f76197066c Upgrade to Jackson 2.6.0
Closes gh-3569
2015-08-05 16:58:04 +01:00
Andy Wilkinson aa43d3f3a3 Update to HikariCP 2.3.9
Closes gh-3675
2015-08-05 16:57:34 +01:00
Andy Wilkinson d2238c3ff7 Upgrade to de.flapdoodle.embed:de.flapdoodle.embed.mongo 1.48.2
Closes gh-3676
2015-08-05 16:57:10 +01:00
Andy Wilkinson 30fd66654e Upgrade to Undertow 1.2.10.Final
Closes gh-3677
2015-08-05 16:56:27 +01:00
Andy Wilkinson d496bfedd0 Upgrade to Commons Pool 2 2.4.2
Closes gh-3678
2015-08-05 16:55:58 +01:00
Andy Wilkinson 5659d5bce3 Upgrade to Hibernate Validator 5.2.1.Final
Closes gh-3679
2015-08-05 16:55:19 +01:00
Andy Wilkinson d072cd9149 Upgrade to org.mariadb.jdbc:mariadb-java-client 1.2.0
Closes gh-3680
2015-08-05 16:54:48 +01:00
Andy Wilkinson ea34c709c9 Upgrade to Jedis 2.7.3
Closes gh-3682
2015-08-05 16:54:15 +01:00
Andy Wilkinson cd55771dd7 Upgrade to Spring HATEOAS 0.18.0.RELEASE
Closes gh-3683
2015-08-05 16:53:47 +01:00
Andy Wilkinson 2d57803705 Merge branch '1.2.x' 2015-08-05 16:52:23 +01:00
Andy Wilkinson 890fb9665d Upgrade to Spring Loaded 1.2.4.RELEASE
Closes gh-3681
2015-08-05 16:51:49 +01:00
Andy Wilkinson 6870f17482 Merge branch '1.2.x' 2015-08-05 16:37:20 +01:00
Andy Wilkinson dd4c542e32 Upgrade to Undertow 1.1.8.Final
Closes gh-3674
2015-08-05 16:33:00 +01:00
Andy Wilkinson c4d0f949d4 Upgrade to mysql:mysql-connector-java 5.1.36
Closes gh-3673
2015-08-05 16:32:31 +01:00