From e856ca694d52e1df0ebea8e956f8f15f2c8c3cc4 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Thu, 23 Apr 2020 07:37:12 +0200 Subject: [PATCH] Remove dependency on javax.xml.bind This is primarily to make it complient with JDK 11/13, plus we were only using it in one place for logging --- .../cloud/stream/binder/EmbeddedHeaderUtils.java | 5 +---- .../cloud/stream/binder/MessageConverterTests.java | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/EmbeddedHeaderUtils.java b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/EmbeddedHeaderUtils.java index 75f6125c8..1193c43f8 100644 --- a/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/EmbeddedHeaderUtils.java +++ b/spring-cloud-stream/src/main/java/org/springframework/cloud/stream/binder/EmbeddedHeaderUtils.java @@ -21,8 +21,6 @@ import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import javax.xml.bind.DatatypeConverter; - import org.springframework.integration.support.json.Jackson2JsonObjectMapper; import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; @@ -49,8 +47,7 @@ public abstract class EmbeddedHeaderUtils { private static final Jackson2JsonObjectMapper objectMapper = new Jackson2JsonObjectMapper(); public static String decodeExceptionMessage(Message requestMessage) { - return "Could not convert message: " - + DatatypeConverter.printHexBinary((byte[]) requestMessage.getPayload()); + return "Could not convert message: " + requestMessage; } /** diff --git a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java index 0e49b6e4e..dc4a5c20d 100644 --- a/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java +++ b/spring-cloud-stream/src/test/java/org/springframework/cloud/stream/binder/MessageConverterTests.java @@ -133,7 +133,6 @@ public class MessageConverterTests { catch (Exception e) { String s = EmbeddedHeaderUtils.decodeExceptionMessage(message); assertThat(e).isInstanceOf(BufferUnderflowException.class); - assertThat(s).startsWith("Could not convert message: FF63"); } }