Commit Graph

5447 Commits

Author SHA1 Message Date
Brian Clozel 1f897ad923 Fix DefaultErrorWebExceptionHandler test 2019-05-02 10:14:08 +02:00
Johnny Lim 21b05bbafc Polish RSocketServerBootstrap bean name
Closes gh-16700
2019-05-02 09:19:41 +02:00
Stephane Nicoll f056b952d9 Merge branch '2.1.x' 2019-05-02 09:18:21 +02:00
Johnny Lim 1b9a4d5e45 Polish CompressionConnectorCustomizerTests
Closes gh-16699
2019-05-02 09:13:47 +02:00
Madhura Bhave cc99b13ecb Merge branch '2.1.x' 2019-05-01 10:26:31 -07:00
Madhura Bhave c9752f165f Fix javadoc 2019-05-01 10:23:52 -07:00
Andy Wilkinson 538030b57e Merge branch '2.1.x'
Closes gh-16693
2019-05-01 11:20:56 +01:00
Andy Wilkinson 881fbeff43 Test the Gradle Plugin against Gradle 5.4.1
Closes gh-16576
2019-05-01 10:47:35 +01:00
Johnny Lim cb0e3c793b Polish
Closes gh-16688
2019-05-01 08:41:44 +02:00
Stephane Nicoll ed538a2e31 Merge branch '2.1.x' 2019-05-01 08:41:27 +02:00
Stephane Nicoll 19413c0c71 Polish
See gh-16688
2019-05-01 08:41:07 +02:00
Stephane Nicoll 8045bf1f50 Polish "Allow configuration of auto-timed metrics"
Closes gh-15988
2019-05-01 08:17:06 +02:00
Tadaya Tsuyukubo 4df6f5dee0 Allow configuration of auto-timed metrics
When `management.metrics.web.server.auto-time-requests` is enabled
(default=true), Spring Boot collects metrics on controller methods even
when they are not annotated with `@Timed`.

When this happens, created metrics are based on the default
`@Timed` configuration and there is no way to customize the
configuration of those auto-timed controller metrics.

This commit adds default configurations to auto-timed requests on both
client and server sides.

See gh-15988
2019-05-01 08:16:42 +02:00
Madhura Bhave 3d814a5288 Move to Reactor Dysprosium snapshots
This should fix the NoClassDefFound errors after moving to Framework
snapshots
2019-04-30 17:09:40 -07:00
Madhura Bhave ffd979c2bb Document missing SpringApplication events
This commit also documents `ContextRefreshedEvent` and
`WebServerInitializedEvent`.

Closes gh-7382
2019-04-30 16:46:48 -07:00
Madhura Bhave fd97066604 Use MergedAnnotation.getRoot() method
Closes gh-16661
2019-04-30 16:19:18 -07:00
Madhura Bhave 8b30ad21bb Merge pull request #16622 from Kedar Joshi
* pr/16622:
  Polish "Document use of @Profile with @ConfigurationProperties scanning"
  Document use of @Profile with @ConfigurationProperties scanning
2019-04-30 16:08:42 -07:00
Madhura Bhave d4435e015c Polish "Document use of @Profile with @ConfigurationProperties scanning"
Closes gh-16622
2019-04-30 16:07:33 -07:00
Kedar Joshi 13b155eb2a Document use of @Profile with @ConfigurationProperties scanning
See gh-16612
2019-04-30 15:59:04 -07:00
Brian Clozel c4938055b4 Polish "Separate compound properties in appendices"
Closes gh-16480
2019-04-30 15:32:26 +02:00
dreis2211 5b63b807ad Separate compound properties in appendices 2019-04-30 15:25:39 +02:00
Stephane Nicoll 922ceed63a Polish "Auto-configure ReactiveStringRedisTemplate if necessary"
Closes gh-16604
2019-04-30 14:51:47 +02:00
Qiang Lee 866233bd2f Auto-configure ReactiveStringRedisTemplate if necessary
See gh-16604
2019-04-30 14:43:35 +02:00
Stephane Nicoll 81543873d4 Merge branch '2.1.x' 2019-04-30 14:33:12 +02:00
ielatif 3ffbe256f1 Exclude HikariCP specific dependency from Quartz
Closes gh-16628
2019-04-30 14:31:17 +02:00
Tetsuya Hasegawa 56c769f05c Remove redundant info
Closes gh-16668
2019-04-30 09:05:48 +02:00
Stephane Nicoll 05957689f4 Polish "Add jOOQ to SQL logging group"
Closes gh-16678
2019-04-30 08:57:32 +02:00
Maciej Walkowiak d7722e328a Add jOOQ to SQL logging group
See gh-16678
2019-04-30 08:55:07 +02:00
Toshiaki Maki e203f6a5f5 Fix typo
Closes gh-16684
2019-04-30 08:40:35 +02:00
Johnny Lim e22c2e5687 Polish
Closes gh-16685
2019-04-30 08:24:18 +02:00
Madhura Bhave a0d425332d Use ImportBeanDefintionRegistrar directly instead of import selector
Closes gh-16679
2019-04-29 18:01:31 -07:00
Andy Wilkinson 5639685770 Polish "Prefer file: to jar:file: URLs in launcher"
See gh-16248
2019-04-29 14:41:03 +01:00
hengyunabc c1b34d0307 Prefer file: to jar:file: URLs in launcher
See gh-16248
2019-04-29 14:39:20 +01:00
Stephane Nicoll 704da1750b Polish "Add support for Hazelcast YAML configuration"
Closes gh-16632
2019-04-29 15:16:43 +02:00
Rafal Leszko 82e18ae88f Add support for Hazelcast YAML configuration
Since Hazlecast 3.12, YAML configuration format is supported in
addition to XML. Therefore, this change makes Spring Boot automatically
discover not only `hazelcast.xml` (and `hazelcast-client.xml`), but also
`hazelcast.yaml` (and `hazelcast-client.yaml`).

See gh-16632
2019-04-29 14:19:10 +02:00
Brian Clozel b527d364dc Reinstate single page reference documentation
This commit reinstates the single-page variant for the Spring Boot
reference documentation.

Now the single and multi-page variants are hosted under the same
`"html"` folder, as `"index.html"` and `"single-index.html"`.
Note that files ending in `"index.html`" are treated as index files by
the spring-doc-resources project and their table of contents do not
display a "Back to index" link.

Fixes gh-16295
2019-04-29 09:04:36 +02:00
Stephane Nicoll 9cde736b59 Merge branch '2.1.x' 2019-04-26 12:01:11 +03:00
Stephane Nicoll 3c5ec8a04c Merge branch '2.0.x' into 2.1.x 2019-04-26 11:53:02 +03:00
Stephane Nicoll ac9ee952c7 Properly merge fix
See gh-16666
2019-04-26 11:52:25 +03:00
dreis2211 cf05959375 Optimize ConfigurationPropertyName.buildToString()
See gh-16658
2019-04-25 17:18:55 +01:00
Phillip Webb 32040e355b Merge branch '2.1.x'
Closes gh-16649
2019-04-24 19:50:41 -07:00
Phillip Webb d4151e0b51 Polish "Use Jackson configuration with JsonPath"
Polish contribution to use a factory method in `AbstractJsonMarshalTester`
rather than additional constructor arguments.

Also change the `JsonContent` tests so that the `Configuration` constructor
is package private. This keeps JsonPath classes out of our public API, at
the expense of limiting custom JsonPath configurations to just our code.

See gh-16629
2019-04-24 19:45:43 -07:00
Phillip Webb 17aaf26590 Use consistent javadoc style for annotation links
Closes gh-13920
2019-04-24 19:37:59 -07:00
Phillip Webb 1e44aba772 Fix compiler warnings and polish
Fix various compiler warnings and apply a little polish.
2019-04-24 19:37:42 -07:00
Diego Berrueta 756a7f12a3 Use Jackson configuration with JsonPath
Update `JacksonTester` so that the JsonPath instance is explicitly configured
with both a `JacksonJsonProvider` and a `JacksonMappingProvider`.

Prior to this commit, the handling of special characters was not symmetrical
between the serialization (handled via the JacksonTester) and the parsing (handled
via JsonPath) due to the fact that JsonPath used `SimpleJson` as its parser.

See gh-16629
2019-04-24 18:15:46 -07:00
Andy Wilkinson 4754386361 Merge branch '2.1.x'
Closes gh-16644
2019-04-24 15:09:41 +01:00
Andy Wilkinson 6b20d13b3d Polish "Prevent double update of metrics when CompositeMeterRegistry exists"
See gh-16221
2019-04-24 15:02:58 +01:00
Johnny Lim cc285d92dd Prevent double update of metrics when CompositeMeterRegistry exists
See gh-16221
2019-04-24 14:54:30 +01:00
Andy Wilkinson b39fdea508 Merge pull request #16474 from Christoph Dreis
* gh-16474:
  Speed up element equality checks in ConfigurationPropertyName

Closes gh-16474
2019-04-24 14:00:46 +01:00
dreis2211 3786dbc869 Speed up element equality checks in ConfigurationPropertyName
See gh-16474
2019-04-24 13:59:53 +01:00