Merge "Removed trailing \n in inbound event raw data."

Author: pavelbucek

media/sse/src/main/java/org/glassfish/jersey/media/sse/InboundEvent.java

@@ -229,7 +229,7 @@ private InboundEvent(final String name,
         this.id = id;
         this.comment = comment;
         this.reconnectDelay = reconnectDelay;
-        this.data = data;
+        this.data = stripLastLineBreak(data);
         this.messageBodyWorkers = messageBodyWorkers;
         this.annotations = annotations;
         this.mediaType = mediaType;
@@ -389,7 +389,7 @@ private <T> T readAndCast(GenericType<T> type, MediaType effectiveMediaType, Mes
                     annotations,
                     effectiveMediaType,
                     headers,
-                    new ByteArrayInputStream(stripLastLineBreak(data)));
+                    new ByteArrayInputStream(data));
         } catch (IOException ex) {
             throw new ProcessingException(ex);
         }

media/sse/src/test/java/org/glassfish/jersey/media/sse/InboundEventReaderTest.java

@@ -46,9 +46,15 @@
 import java.nio.charset.Charset;
 import java.util.Collections;
 
+import javax.ws.rs.RuntimeType;
 import javax.ws.rs.core.MediaType;
 
+import javax.inject.Singleton;
+
 import org.glassfish.jersey.internal.util.collection.MultivaluedStringMap;
+import org.glassfish.jersey.message.MessageBodyWorkers;
+import org.glassfish.jersey.message.internal.MessageBodyFactory;
+import org.glassfish.jersey.message.internal.MessagingBinders;
 
 import org.glassfish.hk2.api.ServiceLocator;
 import org.glassfish.hk2.utilities.ServiceLocatorUtilities;
@@ -94,52 +100,58 @@ public void testReadWithLF() throws Exception {
         ByteArrayInputStream inputStream = new ByteArrayInputStream("event: custom-message\ndata: message 1".getBytes());
         InboundEvent event = parse(inputStream);
         assertEquals("custom-message", event.getName());
-        assertEquals("message 1\n", new String(event.getRawData(), Charset.defaultCharset()));
+        assertDataEquals("message 1", event);
     }
 
     @Test
     public void testReadWithCRLF() throws Exception {
         ByteArrayInputStream inputStream = new ByteArrayInputStream("event: custom-message\r\ndata: message 1".getBytes());
         InboundEvent event = parse(inputStream);
         assertEquals("custom-message", event.getName());
-        assertEquals("message 1\n", new String(event.getRawData(), Charset.defaultCharset()));
+        assertDataEquals("message 1", event);
     }
 
     @Test
     public void testReadWithCR() throws Exception {
         ByteArrayInputStream inputStream = new ByteArrayInputStream("event: custom-message\rdata: message 1".getBytes());
         InboundEvent event = parse(inputStream);
         assertEquals("custom-message", event.getName());
-        assertEquals("message 1\n", new String(event.getRawData(), Charset.defaultCharset()));
+        assertDataEquals("message 1", event);
     }
 
     @Test
     public void testReadWithMultipleSpaces() throws Exception {
         ByteArrayInputStream inputStream = new ByteArrayInputStream("event:     custom-message\rdata:   message 1".getBytes());
         InboundEvent event = parse(inputStream);
         assertEquals("custom-message", event.getName());
-        assertEquals("message 1\n", new String(event.getRawData(), Charset.defaultCharset()));
+        assertDataEquals("message 1", event);
     }
 
     @Test
     public void testReadWithMultipleEndingDelimiter() throws Exception {
         ByteArrayInputStream inputStream = new ByteArrayInputStream("event: custom-message\rdata: message 1\r".getBytes());
         InboundEvent event = parse(inputStream);
         assertEquals("custom-message", event.getName());
-        assertEquals("message 1\n", new String(event.getRawData(), Charset.defaultCharset()));
+        assertDataEquals("message 1", event);
     }
 
     private static InboundEvent parse(InputStream stream) throws IOException {
         return locator.getService(InboundEventReader.class).readFrom(InboundEvent.class, InboundEvent.class, new Annotation[0],
                 MediaType.valueOf(SseFeature.SERVER_SENT_EVENTS), headers, stream);
     }
 
+    private void assertDataEquals(final String expectedData, final InboundEvent event) {
+        assertEquals(expectedData, event.readData());
+        assertEquals(expectedData, new String(event.getRawData(), Charset.defaultCharset()));
+    }
+
     private static class TestBinder extends AbstractBinder {
 
         @Override
         protected void configure() {
-            bind(InboundEventReader.class)
-                    .to(InboundEventReader.class);
+            install(new MessagingBinders.MessageBodyProviders(null, RuntimeType.SERVER));
+            bindAsContract(MessageBodyFactory.class).to(MessageBodyWorkers.class).in(Singleton.class);
+            bind(InboundEventReader.class).to(InboundEventReader.class);
         }
     }
 }