Merge pull request #61 from reactive-commons/feature/enconding-utf8

ensure utf-8 charset from senders

Author: juancgalvis

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

@@ -12,12 +12,9 @@
 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();
     private static final String CONTENT_TYPE = "application/json";
 
     private final ObjectMapper objectMapper;
@@ -63,9 +60,7 @@ public <T> Command<T> readCommand(Message message, Class<T> bodyClass) {
     @Override
     public <T> T readValue(Message message, Class<T> valueClass) {
         try {
-            byte[] utf8Body = ensureEncoding(message.getBody(), message.getProperties().getContentEncoding(),
-                    StandardCharsets.UTF_8.name());
-            return objectMapper.readValue(utf8Body, valueClass);
+            return objectMapper.readValue(message.getBody(), valueClass);
         } catch (IOException e) {
             throw new MessageConversionException("Failed to convert Message content", e);
         }
@@ -97,25 +92,17 @@ public Message toMessage(Object object) {
         byte[] bytes;
         try {
             String jsonString = this.objectMapper.writeValueAsString(object);
-            bytes = jsonString.getBytes(ENCODING);
+            bytes = jsonString.getBytes(StandardCharsets.UTF_8);
         } catch (IOException e) {
             throw new MessageConversionException("Failed to convert Message content", e);
         }
         RabbitMessage.RabbitMessageProperties props = new RabbitMessage.RabbitMessageProperties();
         props.setContentType(CONTENT_TYPE);
-        props.setContentEncoding(ENCODING);
+        props.setContentEncoding(StandardCharsets.UTF_8.name());
         props.setContentLength(bytes.length);
         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,8 +7,6 @@
 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;
@@ -93,11 +91,11 @@ void shouldConvertToQueryStructure() {
     }
 
     @Test
-    void shouldNotFailWhenOriginCharsetIsNotUTF8() {
+    void shouldNotFailWithTilde() {
         // 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");
+        final Message message = converter.toMessage(new AsyncQuery<>("query.name", data));
         // Act
         final AsyncQuery<Object> query = converter.readAsyncQueryStructure(message);
         // Assert
@@ -107,19 +105,4 @@ void shouldNotFailWhenOriginCharsetIsNotUTF8() {
         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);
-    }
-
 }