Restore and deprecate NonblockingServletHolder

Author: Luca Di Grazia

dataset/GitHub_Java/dropwizard.dropwizard/dropwizard-jetty/src/main/java/io/dropwizard/jetty/NonblockingServletHolder.java

@@ -1,5 +1,6 @@
 package io.dropwizard.jetty;
 
+import org.eclipse.jetty.io.EofException;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.servlet.ServletHolder;
 
@@ -12,7 +13,12 @@
 /**
  * A {@link ServletHolder} subclass which removes the synchronization around servlet initialization
  * by requiring a pre-initialized servlet holder.
+ *
+ * @deprecated If necessary, use {@link ServletHolder} or {@link org.eclipse.jetty.servlet.FilterHolder} directly.
+ * This class will be removed in Dropwizard 2.1.0.
  */
+@SuppressWarnings("unused")
+@Deprecated
 public class NonblockingServletHolder extends ServletHolder {
     private final Servlet servlet;
 
@@ -47,6 +53,11 @@ public void handle(Request baseRequest,
         }
         try {
             servlet.service(request, response);
+        } catch (EofException ignored) {
+            // Want to ignore the EofException as this signifies the client has disconnected or the
+            // response has already been written. The problem with using an ExceptionMapper is that
+            // we don't actually want to write a response given that the connection has already been
+            // closed
         } finally {
             baseRequest.setAsyncSupported(asyncSupported, null);
         }

dataset/GitHub_Java/dropwizard.dropwizard/dropwizard-jetty/src/test/java/io/dropwizard/jetty/NonblockingServletHolderTest.java

@@ -28,20 +28,20 @@ public class NonblockingServletHolderTest {
     private final ServletResponse response = mock(ServletResponse.class);
 
     @Test
-    void hasAServlet() throws Exception {
+    public void hasAServlet() throws Exception {
         assertThat(holder.getServlet())
                 .isEqualTo(servlet);
     }
 
     @Test
-    void servicesRequests() throws Exception {
+    public void servicesRequests() throws Exception {
         holder.handle(baseRequest, request, response);
 
         verify(servlet).service(request, response);
     }
 
     @Test
-    void servicesRequestHandleEofException() throws Exception {
+    public void servicesRequestHandleEofException() throws Exception {
         doThrow(new EofException()).when(servlet).service(eq(request), eq(response));
         assertThatCode(() -> {
             holder.handle(baseRequest, request, response);
@@ -50,15 +50,15 @@ void servicesRequestHandleEofException() throws Exception {
     }
 
     @Test
-    void servicesRequestException() throws Exception {
+    public void servicesRequestException() throws Exception {
         doThrow(new IOException()).when(servlet).service(eq(request), eq(response));
         assertThatExceptionOfType(IOException.class).isThrownBy(() -> {
             holder.handle(baseRequest, request, response);
         });
     }
 
     @Test
-    void temporarilyDisablesAsyncRequestsIfDisabled() throws Exception {
+    public void temporarilyDisablesAsyncRequestsIfDisabled() throws Exception {
         holder.setAsyncSupported(false);
 
         holder.handle(baseRequest, request, response);
@@ -70,7 +70,7 @@ void temporarilyDisablesAsyncRequestsIfDisabled() throws Exception {
     }
 
     @Test
-    void isEagerlyInitialized() throws Exception {
+    public void isEagerlyInitialized() throws Exception {
         assertThat(holder.getInitOrder())
                 .isEqualTo(1);
     }