Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.springframework.classify.BinaryExceptionClassifier;
import org.springframework.core.log.LogAccessor;
import org.springframework.kafka.support.TopicPartitionOffset;
import org.springframework.kafka.support.converter.ConversionException;
import org.springframework.kafka.support.serializer.DeserializationException;
import org.springframework.lang.Nullable;
import org.springframework.messaging.converter.MessageConversionException;
Expand Down Expand Up @@ -141,6 +142,7 @@ public int deliveryAttempt(TopicPartitionOffset topicPartitionOffset) {
* <ul>
* <li>{@link DeserializationException}</li>
* <li>{@link MessageConversionException}</li>
* <li>{@link ConversionException}</li>
* <li>{@link MethodArgumentResolutionException}</li>
* <li>{@link NoSuchMethodException}</li>
* <li>{@link ClassCastException}</li>
Expand All @@ -163,6 +165,7 @@ public void addNotRetryableException(Class<? extends Exception> exceptionType) {
* <ul>
* <li>{@link DeserializationException}</li>
* <li>{@link MessageConversionException}</li>
* <li>{@link ConversionException}</li>
* <li>{@link MethodArgumentResolutionException}</li>
* <li>{@link NoSuchMethodException}</li>
* <li>{@link ClassCastException}</li>
Expand Down Expand Up @@ -191,6 +194,7 @@ public final void addNotRetryableExceptions(Class<? extends Exception>... except
* <ul>
* <li>{@link DeserializationException}</li>
* <li>{@link MessageConversionException}</li>
* <li>{@link ConversionException}</li>
* <li>{@link MethodArgumentResolutionException}</li>
* <li>{@link NoSuchMethodException}</li>
* <li>{@link ClassCastException}</li>
Expand Down Expand Up @@ -234,6 +238,7 @@ private static ExtendedBinaryExceptionClassifier configureDefaultClassifier() {
Map<Class<? extends Throwable>, Boolean> classified = new HashMap<>();
classified.put(DeserializationException.class, false);
classified.put(MessageConversionException.class, false);
classified.put(ConversionException.class, false);
classified.put(MethodArgumentResolutionException.class, false);
classified.put(NoSuchMethodException.class, false);
classified.put(ClassCastException.class, false);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import org.mockito.InOrder;

import org.springframework.kafka.KafkaException;
import org.springframework.kafka.support.converter.ConversionException;
import org.springframework.kafka.support.serializer.DeserializationException;

/**
Expand Down Expand Up @@ -68,6 +69,10 @@ consumer, mock(MessageListenerContainer.class)))
handler.handle(new DeserializationException("intended", null, false, illegalState), records,
consumer, mock(MessageListenerContainer.class));
assertThat(recovered.get()).isSameAs(record1);
recovered.set(null);
handler.handle(new ConversionException("intended", null), records,
consumer, mock(MessageListenerContainer.class));
assertThat(recovered.get()).isSameAs(record1);
handler.addNotRetryableExceptions(IllegalStateException.class);
recovered.set(null);
recovererShouldFail.set(true);
Expand All @@ -77,7 +82,7 @@ consumer, mock(MessageListenerContainer.class)))
assertThat(recovered.get()).isSameAs(record1);
InOrder inOrder = inOrder(consumer);
inOrder.verify(consumer).seek(new TopicPartition("foo", 0), 0L); // not recovered so seek
inOrder.verify(consumer, times(2)).seek(new TopicPartition("foo", 1), 1L);
inOrder.verify(consumer, times(3)).seek(new TopicPartition("foo", 1), 1L);
inOrder.verify(consumer).seek(new TopicPartition("foo", 0), 0L); // recovery failed
inOrder.verify(consumer, times(2)).seek(new TopicPartition("foo", 1), 1L);
inOrder.verifyNoMoreInteractions();
Expand Down
2 changes: 2 additions & 0 deletions src/reference/asciidoc/kafka.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4611,6 +4611,7 @@ The exceptions that are considered fatal, by default, are:

* `DeserializationException`
* `MessageConversionException`
* `ConversionException`
* `MethodArgumentResolutionException`
* `NoSuchMethodException`
* `ClassCastException`
Expand Down Expand Up @@ -4863,6 +4864,7 @@ The exceptions that are considered fatal, by default, are:

* `DeserializationException`
* `MessageConversionException`
* `ConversionException`
* `MethodArgumentResolutionException`
* `NoSuchMethodException`
* `ClassCastException`
Expand Down