Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Phillip Webb
2016-11-22 14:54:17 -08:00
parent 50c19250f2 88c84ce234
commit e0dfff2b23
13 changed files with 221 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
View File

@@ -4343,6 +4343,8 @@ used to declare a corresponding queue on the RabbitMQ instance if necessary.
You can enable retries on the `AmqpTemplate` to retry operations, for example in the event
the broker connection is lost. Retries are disabled by default.
[[boot-features-using-amqp-receiving]]
==== Receiving a message
When the Rabbit infrastructure is present, any bean can be annotated with
@@ -4425,9 +4427,7 @@ reached.
[[boot-features-kafka]]
=== Apache Kafka Support
http://kafka.apache.org/[Apache Kafa] is supported by providing auto-configuration of the
`spring-kafka` project.
@@ -4446,8 +4446,8 @@ for more of the supported options.
[[boot-features-kafka-sending-a-message]]
=== Sending a Message
Spring's `KafkaTemplate` is auto-configured and you can autowire them directly in your own
beans:
@@ -4470,8 +4470,8 @@ public class MyBean {
[[boot-features-kafka-receiving-a-message]]
=== Receiving a Message
When the Apache Kafka infrastructure is present, any bean can be annotated with
`@KafkaListener` to create a listener endpoint. If no `KafkaListenerContainerFactory`
has been defined, a default one is configured automatically with keys defined in
@@ -4479,7 +4479,6 @@ has been defined, a default one is configured automatically with keys defined in
The following component creates a listener endpoint on the `someTopic` topic:
[source,java,indent=0]
----
@Component
@@ -4495,9 +4494,8 @@ The following component creates a listener endpoint on the `someTopic` topic:
[[kafka-extra-props]]
[[boot-features-kafka-extra-props]]
=== Additional Kafka Properties
The properties supported by auto configuration are shown in
<<common-application-properties>>. Note that these properties (hyphenated or camelCase)
map directly to the Apache Kafka dotted properties for the most part, refer to the Apache
@@ -4586,6 +4584,8 @@ Lastly, the most extreme (and rarely used) option is to create your own
`RestTemplateBuilder` bean. This will switch off the auto-configuration of a
`RestTemplateBuilder` and will prevent any `RestTemplateCustomizer` beans from being used.
[[boot-features-email]]
== Sending email
The Spring Framework provides an easy abstraction for sending email using the