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

GH-1313: Remove more unnecessary null checks

Browse Source
This commit is contained in:
Gary Russell
2021-03-30 12:14:09 -04:00
parent 8de660be7b
commit 5e412de9b1
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
spring-amqp/src/main/java/org/springframework/amqp/core/Message.java
View File

@@ -125,17 +125,13 @@ public class Message implements Serializable {
}
private String getBodyContentAsString() {
if (this.body == null) {
return null;
}
try {
boolean nullProps = this.messageProperties == null;
String contentType = nullProps ? null : this.messageProperties.getContentType();
String contentType = this.messageProperties.getContentType();
if (MessageProperties.CONTENT_TYPE_SERIALIZED_OBJECT.equals(contentType)) {
return SerializationUtils.deserialize(new ByteArrayInputStream(this.body), ALLOWED_LIST_PATTERNS,
ClassUtils.getDefaultClassLoader()).toString();
}
String encoding = encoding(nullProps);
String encoding = encoding();
if (MessageProperties.CONTENT_TYPE_TEXT_PLAIN.equals(contentType)
|| MessageProperties.CONTENT_TYPE_JSON.equals(contentType)
|| MessageProperties.CONTENT_TYPE_JSON_ALT.equals(contentType)
@@ -150,8 +146,8 @@ public class Message implements Serializable {
return this.body.toString() + "(byte[" + this.body.length + "])"; //NOSONAR
}
private String encoding(boolean nullProps) {
String encoding = nullProps ? null : this.messageProperties.getContentEncoding();
private String encoding() {
String encoding = this.messageProperties.getContentEncoding();
if (encoding == null) {
encoding = bodyEncoding;
}