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

Fix Sonar issues

Browse Source
This commit is contained in:
Gary Russell
2019-12-27 12:25:29 -05:00
parent 20414508fb
commit 24e1148fea
3 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-kafka-test/src/main/java/org/springframework/kafka/test/rule/EmbeddedKafkaRule.java
View File

@@ -19,12 +19,11 @@ package org.springframework.kafka.test.rule;
import java.util.Map;
import org.junit.rules.ExternalResource;
import org.junit.rules.TestRule;
import org.springframework.kafka.test.EmbeddedKafkaBroker;
/**
* A {@link TestRule} wrapper around an {@link EmbeddedKafkaBroker}.
* A {@link org.junit.rules.TestRule} wrapper around an {@link EmbeddedKafkaBroker}.
*
* @author Artem Bilan
*

22
spring-kafka/src/main/java/org/springframework/kafka/listener/DefaultAfterRollbackProcessor.java
View File

@@ -29,7 +29,6 @@ import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.kafka.support.SeekUtils;
import org.springframework.lang.Nullable;
import org.springframework.util.backoff.BackOff;
import org.springframework.util.backoff.FixedBackOff;
/**
* Default implementation of {@link AfterRollbackProcessor}. Seeks all
@@ -66,11 +65,12 @@ public class DefaultAfterRollbackProcessor<K, V> extends FailedRecordProcessor i
* 'maxFailures' have occurred for a topic/partition/offset.
* @param maxFailures the maxFailures; a negative value is treated as infinity.
* @deprecated in favor of {@link #DefaultAfterRollbackProcessor(BackOff)}.
* <b>IMPORTANT</b> When using a {@link FixedBackOff}, the maxAttempts property
* represents retries (one less than maxFailures). To retry indefinitely, use a
* fixed or exponential {@link BackOff} configured appropriately.
* To use the other constructor with the semantics of this one, with maxFailures
* equal to 3, use {@code new DefaultAfterRollbackProcessor(new FixedBackOff(0L, 2L)}.
* <b>IMPORTANT</b> When using a
* {@link org.springframework.util.backoff.FixedBackOff}, the maxAttempts property
* represents retries (one less than maxFailures). To retry indefinitely, use a fixed
* or exponential {@link BackOff} configured appropriately. To use the other
* constructor with the semantics of this one, with maxFailures equal to 3, use
* {@code new DefaultAfterRollbackProcessor(new FixedBackOff(0L, 2L)}.
* @since 2.2.1
*/
@Deprecated
@@ -105,11 +105,11 @@ public class DefaultAfterRollbackProcessor<K, V> extends FailedRecordProcessor i
* @param recoverer the recoverer; if null, the default (logging) recoverer is used.
* @param maxFailures the maxFailures; a negative value is treated as infinity.
* @deprecated in favor of {@link #DefaultAfterRollbackProcessor(BackOff)}.
* <b>IMPORTANT</b> When using a {@link FixedBackOff}, the maxAttempts property
* represents retries (one less than maxFailures). To retry indefinitely, use a
* fixed or exponential {@link BackOff} configured appropriately.
* To use the other constructor with the semantics of this one, with maxFailures
* equal to 3, use
* <b>IMPORTANT</b> When using a
* {@link org.springframework.util.backoff.FixedBackOff}, the maxAttempts property
* represents retries (one less than maxFailures). To retry indefinitely, use a fixed
* or exponential {@link BackOff} configured appropriately. To use the other
* constructor with the semantics of this one, with maxFailures equal to 3, use
* {@code new DefaultAfterRollbackProcessor(recoverer, new FixedBackOff(0L, 2L)}.
* @since 2.2
*/

31
spring-kafka/src/main/java/org/springframework/kafka/listener/SeekToCurrentErrorHandler.java
View File

@@ -32,14 +32,10 @@ import org.springframework.classify.BinaryExceptionClassifier;
import org.springframework.kafka.KafkaException;
import org.springframework.kafka.listener.ContainerProperties.AckMode;
import org.springframework.kafka.support.SeekUtils;
import org.springframework.kafka.support.serializer.DeserializationException;
import org.springframework.lang.Nullable;
import org.springframework.messaging.converter.MessageConversionException;
import org.springframework.messaging.handler.invocation.MethodArgumentResolutionException;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
import org.springframework.util.backoff.BackOff;
import org.springframework.util.backoff.FixedBackOff;
/**
* An error handler that seeks to the current offset for each topic in the remaining
@@ -73,11 +69,12 @@ public class SeekToCurrentErrorHandler extends FailedRecordProcessor implements
* 'maxFailures' have occurred for a topic/partition/offset.
* @param maxFailures the maxFailures; a negative value is treated as infinity.
* @deprecated in favor of {@link #SeekToCurrentErrorHandler(BackOff)}.
* <b>IMPORTANT</b> When using a {@link FixedBackOff}, the maxAttempts property
* represents retries (one less than maxFailures). To retry indefinitely, use a
* fixed or exponential {@link BackOff} configured appropriately.
* To use the other constructor with the semantics of this one, with maxFailures
* equal to 3, use {@code new SeekToCurrentErrorHandler(new FixedBackOff(0L, 2L)}.
* <b>IMPORTANT</b> When using a
* {@link org.springframework.util.backoff.FixedBackOff}, the maxAttempts property
* represents retries (one less than maxFailures). To retry indefinitely, use a fixed
* or exponential {@link BackOff} configured appropriately. To use the other
* constructor with the semantics of this one, with maxFailures equal to 3, use
* {@code new SeekToCurrentErrorHandler(new FixedBackOff(0L, 2L)}.
* @since 2.2.1
*/
@Deprecated
@@ -112,11 +109,11 @@ public class SeekToCurrentErrorHandler extends FailedRecordProcessor implements
* @param recoverer the recoverer; if null, the default (logging) recoverer is used.
* @param maxFailures the maxFailures; a negative value is treated as infinity.
* @deprecated in favor of {@link #SeekToCurrentErrorHandler(BiConsumer, BackOff)}.
* <b>IMPORTANT</b> When using a {@link FixedBackOff}, the maxAttempts property
* represents retries (one less than maxFailures). To retry indefinitely, use a
* fixed or exponential {@link BackOff} configured appropriately.
* To use the other constructor with the semantics of this one, with maxFailures
* equal to 3, use
* <b>IMPORTANT</b> When using a
* {@link org.springframework.util.backoff.FixedBackOff}, the maxAttempts property
* represents retries (one less than maxFailures). To retry indefinitely, use a fixed
* or exponential {@link BackOff} configured appropriately. To use the other
* constructor with the semantics of this one, with maxFailures equal to 3, use
* {@code new SeekToCurrentErrorHandler(recoverer, new FixedBackOff(0L, 2L)}.
* @since 2.2
*/
@@ -155,9 +152,9 @@ public class SeekToCurrentErrorHandler extends FailedRecordProcessor implements
* (until exhaustion) or not. If not, we go straight to the recoverer. By default,
* the following exceptions will not be retried:
* <ul>
* <li>{@link DeserializationException}</li>
* <li>{@link MessageConversionException}</li>
* <li>{@link MethodArgumentResolutionException}</li>
* <li>{@link org.springframework.kafka.support.serializer.DeserializationException}</li>
* <li>{@link org.springframework.messaging.converter.MessageConversionException}</li>
* <li>{@link org.springframework.messaging.handler.invocation.MethodArgumentResolutionException}</li>
* <li>{@link NoSuchMethodException}</li>
* <li>{@link ClassCastException}</li>
* </ul>