add charset conversion when reading message body

Author: juancgalvis

async/async-rabbit/src/main/java/org/reactivecommons/async/rabbit/converters/json/JacksonMessageConverter.java

@@ -6,13 +6,15 @@
 import org.reactivecommons.api.domain.Command;
 import org.reactivecommons.api.domain.DomainEvent;
 import org.reactivecommons.async.api.AsyncQuery;
-import org.reactivecommons.async.rabbit.RabbitMessage;
 import org.reactivecommons.async.commons.communications.Message;
 import org.reactivecommons.async.commons.converters.MessageConverter;
 import org.reactivecommons.async.commons.exceptions.MessageConversionException;
+import org.reactivecommons.async.rabbit.RabbitMessage;
 
 import java.io.IOException;
+import java.io.UnsupportedEncodingException;
 import java.nio.charset.Charset;
+import java.nio.charset.StandardCharsets;
 
 public class JacksonMessageConverter implements MessageConverter {
     private static final String ENCODING = Charset.defaultCharset().name();
@@ -28,7 +30,7 @@ public JacksonMessageConverter(ObjectMapper objectMapper) {
     @Override
     public <T> AsyncQuery<T> readAsyncQuery(Message message, Class<T> bodyClass) {
         try {
-            final AsyncQueryJson asyncQueryJson = objectMapper.readValue(message.getBody(), AsyncQueryJson.class);
+            final AsyncQueryJson asyncQueryJson = readValue(message, AsyncQueryJson.class);
             final T value = objectMapper.treeToValue(asyncQueryJson.getQueryData(), bodyClass);
             return new AsyncQuery<>(asyncQueryJson.getResource(), value);
         } catch (IOException e) {
@@ -39,7 +41,7 @@ public <T> AsyncQuery<T> readAsyncQuery(Message message, Class<T> bodyClass) {
     @Override
     public <T> DomainEvent<T> readDomainEvent(Message message, Class<T> bodyClass) {
         try {
-            final DomainEventJson domainEventJson = objectMapper.readValue(message.getBody(), DomainEventJson.class);
+            final DomainEventJson domainEventJson = readValue(message, DomainEventJson.class);
             final T value = objectMapper.treeToValue(domainEventJson.getData(), bodyClass);
             return new DomainEvent<>(domainEventJson.getName(), domainEventJson.getEventId(), value);
         } catch (IOException e) {
@@ -50,7 +52,7 @@ public <T> DomainEvent<T> readDomainEvent(Message message, Class<T> bodyClass) {
     @Override
     public <T> Command<T> readCommand(Message message, Class<T> bodyClass) {
         try {
-            final CommandJson commandJson = objectMapper.readValue(message.getBody(), CommandJson.class);
+            final CommandJson commandJson = readValue(message, CommandJson.class);
             final T value = objectMapper.treeToValue(commandJson.getData(), bodyClass);
             return new Command<>(commandJson.getName(), commandJson.getCommandId(), value);
         } catch (IOException e) {
@@ -61,7 +63,9 @@ public <T> Command<T> readCommand(Message message, Class<T> bodyClass) {
     @Override
     public <T> T readValue(Message message, Class<T> valueClass) {
         try {
-            return objectMapper.readValue(message.getBody(), valueClass);
+            byte[] utf8Body = ensureEncoding(message.getBody(), message.getProperties().getContentEncoding(),
+                    StandardCharsets.UTF_8.name());
+            return objectMapper.readValue(utf8Body, valueClass);
         } catch (IOException e) {
             throw new MessageConversionException("Failed to convert Message content", e);
         }
@@ -71,21 +75,21 @@ public <T> T readValue(Message message, Class<T> valueClass) {
     @SuppressWarnings("unchecked")
     public <T> Command<T> readCommandStructure(Message message) {
         final CommandJson commandJson = readValue(message, CommandJson.class);
-        return new Command<>(commandJson.getName(), commandJson.getCommandId(), (T)commandJson.getData());
+        return new Command<>(commandJson.getName(), commandJson.getCommandId(), (T) commandJson.getData());
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public <T> DomainEvent<T> readDomainEventStructure(Message message) {
         final DomainEventJson eventJson = readValue(message, DomainEventJson.class);
-        return new DomainEvent<>(eventJson.getName(), eventJson.getEventId(), (T)eventJson.getData());
+        return new DomainEvent<>(eventJson.getName(), eventJson.getEventId(), (T) eventJson.getData());
     }
 
     @Override
     @SuppressWarnings("unchecked")
     public <T> AsyncQuery<T> readAsyncQueryStructure(Message message) {
         final AsyncQueryJson asyncQueryJson = readValue(message, AsyncQueryJson.class);
-        return new AsyncQuery<>(asyncQueryJson.getResource(), (T)asyncQueryJson.getQueryData());
+        return new AsyncQuery<>(asyncQueryJson.getResource(), (T) asyncQueryJson.getQueryData());
     }
 
     @Override
@@ -94,8 +98,7 @@ public Message toMessage(Object object) {
         try {
             String jsonString = this.objectMapper.writeValueAsString(object);
             bytes = jsonString.getBytes(ENCODING);
-        }
-        catch (IOException e) {
+        } catch (IOException e) {
             throw new MessageConversionException("Failed to convert Message content", e);
         }
         RabbitMessage.RabbitMessageProperties props = new RabbitMessage.RabbitMessageProperties();
@@ -105,6 +108,14 @@ public Message toMessage(Object object) {
         return new RabbitMessage(bytes, props);
     }
 
+    private byte[] ensureEncoding(byte[] data, String fromEncoding, String toEncoding)
+            throws UnsupportedEncodingException {
+        if (fromEncoding.equalsIgnoreCase(toEncoding)) {
+            return data;
+        }
+        return new String(data, fromEncoding).getBytes(toEncoding);
+    }
+
     @Data
     private static class AsyncQueryJson {
         private String resource;

async/async-rabbit/src/test/java/org/reactivecommons/async/rabbit/converters/json/JacksonMessageConverterTest.java

@@ -7,6 +7,8 @@
 import org.reactivecommons.api.domain.DomainEvent;
 import org.reactivecommons.async.api.AsyncQuery;
 import org.reactivecommons.async.commons.communications.Message;
+import org.reactivecommons.async.commons.exceptions.MessageConversionException;
+import org.reactivecommons.async.rabbit.RabbitMessage;
 
 import java.io.IOException;
 import java.util.Date;
@@ -90,4 +92,34 @@ void shouldConvertToQueryStructure() {
         assertThat(jsonNode.findValue("name").asText()).isEqualTo("sample1");
     }
 
+    @Test
+    void shouldNotFailWhenOriginCharsetIsNotUTF8() {
+        // Arrange
+        final String name = "example with word containing tilde áéíóúñ";
+        final SampleClass data = new SampleClass("35", name, new Date());
+        final Message message = sampleEncodedMessage(new AsyncQuery<>("query.name", data), "windows-1252");
+        // Act
+        final AsyncQuery<Object> query = converter.readAsyncQueryStructure(message);
+        // Assert
+        assertThat(query.getQueryData()).isInstanceOf(JsonNode.class);
+        assertThat(query.getResource()).isEqualTo("query.name");
+        final JsonNode jsonNode = (JsonNode) query.getQueryData();
+        assertThat(jsonNode.findValue("name").asText()).isEqualTo(name);
+    }
+
+    private Message sampleEncodedMessage(Object object, String encoding) {
+        byte[] bytes;
+        try {
+            String jsonString = this.objectMapper.writeValueAsString(object);
+            bytes = jsonString.getBytes(encoding);
+        } catch (IOException e) {
+            throw new MessageConversionException("Failed to convert Message content", e);
+        }
+        RabbitMessage.RabbitMessageProperties props = new RabbitMessage.RabbitMessageProperties();
+        props.setContentType("application/json");
+        props.setContentEncoding(encoding);
+        props.setContentLength(bytes.length);
+        return new RabbitMessage(bytes, props);
+    }
+
 }