GH-7: Add checkstyle and javaformat plugins
Fixes: #7 * Run `./gradlew format` * Updates from PR review suggestions
This commit is contained in:
@@ -24,7 +24,6 @@ import org.springframework.messaging.support.MessageBuilder;
|
||||
import org.springframework.util.MimeTypeUtils;
|
||||
|
||||
/**
|
||||
*
|
||||
* @author Christian Tzolov
|
||||
*/
|
||||
public class ByteArrayTextToString implements Function<Message<?>, Message<?>> {
|
||||
@@ -35,17 +34,17 @@ public class ByteArrayTextToString implements Function<Message<?>, Message<?>> {
|
||||
if (message.getPayload() instanceof byte[]) {
|
||||
final MessageHeaders headers = message.getHeaders();
|
||||
String contentType = headers.containsKey(MessageHeaders.CONTENT_TYPE)
|
||||
? headers.get(MessageHeaders.CONTENT_TYPE).toString()
|
||||
: MimeTypeUtils.APPLICATION_JSON_VALUE;
|
||||
? headers.get(MessageHeaders.CONTENT_TYPE).toString() : MimeTypeUtils.APPLICATION_JSON_VALUE;
|
||||
|
||||
if (contentType.contains("text") || contentType.contains("json") || contentType.contains("x-spring-tuple")) {
|
||||
if (contentType.contains("text") || contentType.contains("json")
|
||||
|| contentType.contains("x-spring-tuple")) {
|
||||
message = MessageBuilder.withPayload(new String(((byte[]) message.getPayload())))
|
||||
.copyHeaders(message.getHeaders())
|
||||
.build();
|
||||
.copyHeaders(message.getHeaders())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
return message;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -29,12 +29,11 @@ import org.springframework.messaging.support.MessageBuilder;
|
||||
import org.springframework.util.MimeTypeUtils;
|
||||
|
||||
/**
|
||||
* The {@link Function} to deserialize {@code byte[]} payload into a Map
|
||||
* if {@link MessageHeaders#CONTENT_TYPE} header is JSON.
|
||||
* Otherwise, the message is returned as is.
|
||||
* The {@link Function} to deserialize {@code byte[]} payload into a Map if
|
||||
* {@link MessageHeaders#CONTENT_TYPE} header is JSON. Otherwise, the message is returned
|
||||
* as is.
|
||||
*
|
||||
* @author Artem Bilan
|
||||
*
|
||||
* @since 4.0
|
||||
*/
|
||||
public class JsonBytesToMap implements Function<Message<?>, Message<?>> {
|
||||
@@ -51,15 +50,13 @@ public class JsonBytesToMap implements Function<Message<?>, Message<?>> {
|
||||
public Message<?> apply(Message<?> message) {
|
||||
if (message.getPayload() instanceof byte[] payload) {
|
||||
MessageHeaders headers = message.getHeaders();
|
||||
String contentType =
|
||||
headers.containsKey(MessageHeaders.CONTENT_TYPE)
|
||||
? headers.get(MessageHeaders.CONTENT_TYPE).toString()
|
||||
: MimeTypeUtils.APPLICATION_JSON_VALUE;
|
||||
String contentType = headers.containsKey(MessageHeaders.CONTENT_TYPE)
|
||||
? headers.get(MessageHeaders.CONTENT_TYPE).toString() : MimeTypeUtils.APPLICATION_JSON_VALUE;
|
||||
|
||||
if (contentType.contains("json")) {
|
||||
message = MessageBuilder.withPayload(payloadToMapIfCan(payload))
|
||||
.copyHeaders(message.getHeaders())
|
||||
.build();
|
||||
.copyHeaders(message.getHeaders())
|
||||
.build();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -32,6 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat;
|
||||
public class ByteArrayTextToStringTests {
|
||||
|
||||
private static final String MESSAGE = "hello world";
|
||||
|
||||
private static Function<Message<?>, Message<?>> converter;
|
||||
|
||||
@BeforeAll
|
||||
|
||||
Reference in New Issue
Block a user