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

Fix new Sonar smells

Browse Source
This commit is contained in:
Artem Bilan
2019-09-29 10:21:16 -04:00
parent 0d45644f00
commit 2115cf6224
2 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-kafka/src/main/java/org/springframework/kafka/listener/KafkaMessageListenerContainer.java
View File

@@ -337,7 +337,7 @@ public class KafkaMessageListenerContainer<K, V> // NOSONAR line count
publishConsumerFailedToStart();
}
}
catch (@SuppressWarnings("unused") InterruptedException e) {
catch (@SuppressWarnings(UNUSED) InterruptedException e) {
Thread.currentThread().interrupt();
}
}
@@ -829,7 +829,7 @@ public class KafkaMessageListenerContainer<K, V> // NOSONAR line count
this.containerProperties.getMicrometerTags());
}
}
catch (@SuppressWarnings("unused") IllegalStateException ex) {
catch (@SuppressWarnings(UNUSED) IllegalStateException ex) {
// NOSONAR - no micrometer or meter registry
}
return holder;
@@ -1508,7 +1508,7 @@ public class KafkaMessageListenerContainer<K, V> // NOSONAR line count
try {
Thread.sleep(this.nackSleep);
}
catch (@SuppressWarnings("unused") InterruptedException e) {
catch (@SuppressWarnings(UNUSED) InterruptedException e) {
Thread.currentThread().interrupt();
}
this.nackSleep = -1;

66
spring-kafka/src/main/java/org/springframework/kafka/support/DefaultKafkaHeaderMapper.java
View File

@@ -271,38 +271,8 @@ public class DefaultKafkaHeaderMapper extends AbstractKafkaHeaderMapper {
source.forEach(header -> {
if (!(header.key().equals(JSON_TYPES))) {
if (jsonTypes != null && jsonTypes.containsKey(header.key())) {
Class<?> type = Object.class;
String requestedType = jsonTypes.get(header.key());
boolean trusted = false;
try {
trusted = trusted(requestedType);
if (trusted) {
type = ClassUtils.forName(requestedType, null);
}
}
catch (Exception e) {
logger.error(e, () -> "Could not load class for header: " + header.key());
}
if (String.class.equals(type) && header.value().length > 0 && header.value()[0] != '"') {
headers.put(header.key(), new String(header.value(), getCharset()));
}
else {
if (trusted) {
try {
Object value = decodeValue(header, type);
headers.put(header.key(), value);
}
catch (IOException e) {
logger.error(e, () ->
"Could not decode json type: " + new String(header.value()) + " for key: "
+ header.key());
headers.put(header.key(), header.value());
}
}
else {
headers.put(header.key(), new NonTrustedHeaderType(header.value(), requestedType));
}
}
populateJsonValueHeader(header, requestedType, headers);
}
else {
headers.put(header.key(), headerValueToAddIn(header));
@@ -311,6 +281,40 @@ public class DefaultKafkaHeaderMapper extends AbstractKafkaHeaderMapper {
});
}
private void populateJsonValueHeader(Header header, String requestedType, Map<String, Object> headers) {
Class<?> type = Object.class;
boolean trusted = false;
try {
trusted = trusted(requestedType);
if (trusted) {
type = ClassUtils.forName(requestedType, null);
}
}
catch (Exception e) {
logger.error(e, () -> "Could not load class for header: " + header.key());
}
if (String.class.equals(type) && header.value().length > 0 && header.value()[0] != '"') {
headers.put(header.key(), new String(header.value(), getCharset()));
}
else {
if (trusted) {
try {
Object value = decodeValue(header, type);
headers.put(header.key(), value);
}
catch (IOException e) {
logger.error(e, () ->
"Could not decode json type: " + new String(header.value()) + " for key: "
+ header.key());
headers.put(header.key(), header.value());
}
}
else {
headers.put(header.key(), new NonTrustedHeaderType(header.value(), requestedType));
}
}
}
private Object decodeValue(Header h, Class<?> type) throws IOException, LinkageError {
ObjectMapper headerObjectMapper = getObjectMapper();
Object value = headerObjectMapper.readValue(h.value(), type);