SpringCloud/spring-cloud-stream
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GH-1605 Fixed Conflict Fences in JavaDocs

Browse Source 
Resolves #1605
This commit is contained in:
Oleg Zhurakousky
2019-02-07 18:25:06 +01:00
parent a197fdd036
commit e3475383db
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/ConsumerProperties.java
View File

@@ -72,18 +72,11 @@ public class ConsumerProperties {
private int instanceIndex = -1;
/**
* <<<<<<< HEAD The number of attempts to process the message (including the first) in
* the event of processing failures. This is a RetryTemplate configuration which is
* provided by the framework. Default: 3. Set to 1 to disable retry. You can also
* provide custom RetryTemplate in the event you want to take complete control of the
* RetryTemplate. Simply configure it as @Bean inside your application configuration.
* ======= The number of attempts to process the message (including the first) in the
* event of processing failures. This is a RetryTemplate configuration which is
* provided by the framework. Default: 3. Set to 1 to disable retry. You can also
* provide custom RetryTemplate in the event you want to take complete control of the
* RetryTemplate. Simply configure it as @Bean inside your application configuration.
* If you need to be binding specific, then you can reference a specific RetryTemplate
* by name with the retry-template configuration. >>>>>>> 2.2.x
* The number of attempts to process the message (including the first) in the event of
* processing failures. This is a RetryTemplate configuration which is provided by the
* framework. Default: 3. Set to 1 to disable retry. You can also provide custom
* RetryTemplate in the event you want to take complete control of the RetryTemplate.
* Simply configure it as @Bean inside your application configuration.
*/
private int maxAttempts = 3;
@@ -118,8 +111,6 @@ public class ConsumerProperties {
private boolean defaultRetryable = true;
/**
* <<<<<<< HEAD A map of Throwable class names in the key and a boolean in the value.
* Specify those exceptions (and subclasses) that will or won't be retried. =======
* Allows you to further qualify which RetryTemplate to use for a specific consumer
* binding..
*/
@@ -127,7 +118,7 @@ public class ConsumerProperties {
/**
* A map of Throwable class names in the key and a boolean in the value. Specify those
* exceptions (and subclasses) that will or won't be retried. >>>>>>> 2.2.x
* exceptions (and subclasses) that will or won't be retried.
*/
private Map<Class<? extends Throwable>, Boolean> retryableExceptions = new LinkedHashMap<>();
@@ -136,7 +127,7 @@ public class ConsumerProperties {
* middleware that does not support message headers natively and requires header
* embedding. This option is useful when consuming data from non-Spring Cloud Stream
* applications when native headers are not supported. When set to headers, uses the
* middleware’s native header mechanism. When set to embeddedHeaders, embeds headers
* middleware’s native header mechanism. When set to 'embeddedHeaders', embeds headers
* into the message payload. Default: depends on binder implementation. Rabbit and
* Kafka binders currently distributed with spring cloud stream support headers
* natively.