Skip to content

Commit 12c3540

Browse files
committed
Fix Sonar Issues
1 parent db617ec commit 12c3540

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

Diff for: spring-kafka/src/main/java/org/springframework/kafka/listener/PartitionPausingBackOffManagerFactory.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public void setTimingAdjustmentEnabled(boolean timingAdjustmentEnabled) {
118118
*
119119
* @param timingAdjustmentManager the adjustmentManager to be used.
120120
*/
121-
public void setTimingAdjustmentManager(KafkaConsumerTimingAdjuster timingAdjustmentManager) {
121+
public final void setTimingAdjustmentManager(KafkaConsumerTimingAdjuster timingAdjustmentManager) {
122122
Assert.isTrue(this.timingAdjustmentEnabled, () -> "TimingAdjustment is disabled for this factory.");
123123
this.timingAdjustmentManager = timingAdjustmentManager;
124124
}
@@ -127,7 +127,7 @@ public void setTimingAdjustmentManager(KafkaConsumerTimingAdjuster timingAdjustm
127127
* Set the {@link TaskExecutor} that will be used in the {@link KafkaConsumerTimingAdjuster}.
128128
* @param taskExecutor the taskExecutor to be used.
129129
*/
130-
public void setTaskExecutor(TaskExecutor taskExecutor) {
130+
public final void setTaskExecutor(TaskExecutor taskExecutor) {
131131
Assert.isTrue(this.timingAdjustmentEnabled, () -> "TimingAdjustment is disabled for this factory.");
132132
this.taskExecutor = taskExecutor;
133133
}

Diff for: spring-kafka/src/main/java/org/springframework/kafka/retrytopic/RetryTopicConfigurationSupport.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import java.time.Clock;
2020
import java.util.ArrayList;
21+
import java.util.Arrays;
2122
import java.util.List;
2223
import java.util.function.Consumer;
2324
import java.util.stream.Collectors;
@@ -362,7 +363,7 @@ public static class BlockingRetriesConfigurer {
362363
@SuppressWarnings("varargs")
363364
@SafeVarargs
364365
public final BlockingRetriesConfigurer retryOn(Class<? extends Exception>... exceptions) {
365-
this.retryableExceptions = exceptions;
366+
this.retryableExceptions = Arrays.copyOf(exceptions, exceptions.length);
366367
return this;
367368
}
368369

Diff for: spring-kafka/src/main/java/org/springframework/kafka/support/converter/BatchMessagingMessageConverter.java

+16-10
Original file line numberDiff line numberDiff line change
@@ -157,18 +157,9 @@ public Message<?> toMessage(List<ConsumerRecord<?, ?>> records, @Nullable Acknow
157157
List<Headers> natives = new ArrayList<>();
158158
List<ConsumerRecord<?, ?>> raws = new ArrayList<>();
159159
List<ConversionException> conversionFailures = new ArrayList<>();
160-
if (this.headerMapper != null) {
161-
rawHeaders.put(KafkaHeaders.BATCH_CONVERTED_HEADERS, convertedHeaders);
162-
}
163-
else {
164-
rawHeaders.put(KafkaHeaders.NATIVE_HEADERS, natives);
165-
}
166-
if (this.rawRecordHeader) {
167-
rawHeaders.put(KafkaHeaders.RAW_DATA, raws);
168-
}
160+
addToRawHeaders(rawHeaders, convertedHeaders, natives, raws, conversionFailures);
169161
commonHeaders(acknowledgment, consumer, rawHeaders, keys, topics, partitions, offsets, timestampTypes,
170162
timestamps);
171-
rawHeaders.put(KafkaHeaders.CONVERSION_FAILURES, conversionFailures);
172163
boolean logged = false;
173164
String info = null;
174165
for (ConsumerRecord<?, ?> record : records) {
@@ -210,6 +201,21 @@ public Message<?> toMessage(List<ConsumerRecord<?, ?>> records, @Nullable Acknow
210201
return MessageBuilder.createMessage(payloads, kafkaMessageHeaders);
211202
}
212203

204+
private void addToRawHeaders(Map<String, Object> rawHeaders, List<Map<String, Object>> convertedHeaders,
205+
List<Headers> natives, List<ConsumerRecord<?, ?>> raws, List<ConversionException> conversionFailures) {
206+
207+
if (this.headerMapper != null) {
208+
rawHeaders.put(KafkaHeaders.BATCH_CONVERTED_HEADERS, convertedHeaders);
209+
}
210+
else {
211+
rawHeaders.put(KafkaHeaders.NATIVE_HEADERS, natives);
212+
}
213+
if (this.rawRecordHeader) {
214+
rawHeaders.put(KafkaHeaders.RAW_DATA, raws);
215+
}
216+
rawHeaders.put(KafkaHeaders.CONVERSION_FAILURES, conversionFailures);
217+
}
218+
213219
private Object obtainPayload(Type type, ConsumerRecord<?, ?> record, List<ConversionException> conversionFailures) {
214220
return this.recordConverter == null || !containerType(type)
215221
? extractAndConvertValue(record, type)

0 commit comments

Comments
 (0)