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

Sonar Polishing

Browse Source 
Fix new code smells.
This commit is contained in:
Gary Russell
2018-11-04 13:19:30 -05:00
parent 87a1b9988e
commit f8ea5bc5b3
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-kafka/src/main/java/org/springframework/kafka/core/KafkaTemplate.java
View File

@@ -284,8 +284,8 @@ public class KafkaTemplate<K, V> implements KafkaOperations<K, V> {
}
return result;
}
catch (SkipAbortException e) {
throw ((RuntimeException) e.getCause());
catch (SkipAbortException e) { // NOSONAR - exception flow control
throw ((RuntimeException) e.getCause()); // NOSONAR - lost stack trace
}
catch (Exception e) {
producer.abortTransaction();

26
spring-kafka/src/main/java/org/springframework/kafka/support/serializer/ErrorHandlingDeserializer.java
View File

@@ -58,24 +58,16 @@ public class ErrorHandlingDeserializer<T> implements ExtendedDeserializer<T> {
}
public ErrorHandlingDeserializer(Deserializer<T> delegate) {
this.delegate =
delegate instanceof ExtendedDeserializer
? (ExtendedDeserializer<T>) delegate
: ExtendedDeserializer.Wrapper.ensureExtended(delegate);
this.delegate = setupDelegate(delegate);
}
@SuppressWarnings("unchecked")
@Override
public void configure(Map<String, ?> configs, boolean isKey) {
if (isKey && configs.containsKey(KEY_DESERIALIZER_CLASS)) {
try {
Object value = configs.get(KEY_DESERIALIZER_CLASS);
Class<?> clazz = value instanceof Class ? (Class<?>) value : ClassUtils.forName((String) value, null);
Object delegate = clazz.newInstance();
this.delegate =
delegate instanceof ExtendedDeserializer
? (ExtendedDeserializer<T>) delegate
: ExtendedDeserializer.Wrapper.ensureExtended((Deserializer<T>) delegate);
this.delegate = setupDelegate(clazz.newInstance());
}
catch (ClassNotFoundException | LinkageError | InstantiationException | IllegalAccessException e) {
throw new IllegalStateException(e);
@@ -85,11 +77,7 @@ public class ErrorHandlingDeserializer<T> implements ExtendedDeserializer<T> {
try {
Object value = configs.get(VALUE_DESERIALIZER_CLASS);
Class<?> clazz = value instanceof Class ? (Class<?>) value : ClassUtils.forName((String) value, null);
Object delegate = clazz.newInstance();
this.delegate =
delegate instanceof ExtendedDeserializer
? (ExtendedDeserializer<T>) delegate
: ExtendedDeserializer.Wrapper.ensureExtended((Deserializer<T>) delegate);
this.delegate = setupDelegate(clazz.newInstance());
}
catch (ClassNotFoundException | LinkageError | InstantiationException | IllegalAccessException e) {
throw new IllegalStateException(e);
@@ -100,6 +88,14 @@ public class ErrorHandlingDeserializer<T> implements ExtendedDeserializer<T> {
this.isKey = isKey;
}
@SuppressWarnings("unchecked")
private ExtendedDeserializer<T> setupDelegate(Object delegate) {
Assert.isInstanceOf(Deserializer.class, delegate, "'delegate' must be a 'Deserializer', not a ");
return delegate instanceof ExtendedDeserializer
? (ExtendedDeserializer<T>) delegate
: ExtendedDeserializer.Wrapper.ensureExtended((Deserializer<T>) delegate);
}
@Override
public T deserialize(String topic, byte[] data) {
try {