[RESTEASY-1733]:Sse can't server for a get url without 'Accept: text/…

…event-stream' header
resteasy · Oct 19, 2017 · c9f1c83 · c9f1c83
1 parent 2436670
commit c9f1c83
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 12 deletions.
diff --git a/...jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/sse/SseEventSinkInterceptor.java b/...jaxrs/src/main/java/org/jboss/resteasy/plugins/providers/sse/SseEventSinkInterceptor.java
@@ -21,21 +21,39 @@ public class SseEventSinkInterceptor implements ContainerRequestFilter
    @Override
    public void filter(ContainerRequestContext requestContext) throws IOException
    {
-      if (requestContext.getAcceptableMediaTypes().contains(MediaType.SERVER_SENT_EVENTS_TYPE)) {
-         SseEventOutputImpl sink = new SseEventOutputImpl(new SseEventProvider());
-         // make sure we register this as being an async method
-         if(requestContext instanceof PostMatchContainerRequestContext) {
-            ((PostMatchContainerRequestContext) requestContext).getResourceMethod().markMethodAsAsync();
-         }
-         ResteasyProviderFactory.getContextDataMap().put(SseEventSink.class, sink);
-         ResteasyProviderFactory.getContextData(Cleanables.class).addCleanable(new Cleanable()
+      if (requestContext.getAcceptableMediaTypes().contains(MediaType.SERVER_SENT_EVENTS_TYPE))
+      {
+         enableSse(requestContext);
+         return;
+      }
+      if (requestContext instanceof PostMatchContainerRequestContext)
+      {
+         PostMatchContainerRequestContext postContext = (PostMatchContainerRequestContext) requestContext;
+         for (MediaType produce : postContext.getResourceMethod().getProduces())
          {
-            @Override
-            public void clean() throws Exception
+            if (produce.equals(MediaType.SERVER_SENT_EVENTS_TYPE))
             {
-               sink.flushResponseToClient();
+               enableSse(requestContext);
+               return;
             }
-         });
+         }
+
       }
    }
+   private void enableSse(ContainerRequestContext requestContext) {
+      SseEventOutputImpl sink = new SseEventOutputImpl(new SseEventProvider());
+      // make sure we register this as being an async method
+      if(requestContext instanceof PostMatchContainerRequestContext) {
+         ((PostMatchContainerRequestContext) requestContext).getResourceMethod().markMethodAsAsync();
+      }
+      ResteasyProviderFactory.getContextDataMap().put(SseEventSink.class, sink);
+      ResteasyProviderFactory.getContextData(Cleanables.class).addCleanable(new Cleanable()
+      {
+         @Override
+         public void clean() throws Exception
+         {
+            sink.flushResponseToClient();
+         }
+      });
+   }
 }
diff --git a/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/sse/SseTest.java b/testsuite/integration-tests/src/test/java/org/jboss/resteasy/test/providers/sse/SseTest.java
@@ -15,6 +15,7 @@
 import javax.ws.rs.client.Entity;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
 import javax.ws.rs.sse.InboundSseEvent;
 import javax.ws.rs.sse.SseEventSource;
 import javax.xml.bind.JAXBElement;
@@ -405,6 +406,18 @@ public void testXmlEvent() throws Exception
        Assert.assertEquals("xmldata is expceted", jaxbElement.getValue(), "xmldata");
      }
 
+    @Test
+    @InSequence(11)
+    public void testGetSseEvent() throws Exception
+    {
+       Client client =  ClientBuilder.newClient();
+       WebTarget target = client.target(generateURL("/service/server-sent-events/events"));
+       Response response = target.request().get();
+       Assert.assertEquals("response OK is expected", response.getStatus(), 200);
+       Assert.assertEquals("text/event-stream is expected" , response.getMediaType(), MediaType.SERVER_SENT_EVENTS_TYPE);
+       client.close();
+     }
+
 //    @Test
 //    //This will open a browser and test with html sse client
 //    public void testHtmlSse() throws Exception