updating jetty to jetty-9.2.16.v2016040

[gigi.git] / lib / jetty / org / eclipse / jetty / servlet / ServletTester.java

diff --git a/lib/jetty/org/eclipse/jetty/servlet/ServletTester.java b/lib/jetty/org/eclipse/jetty/servlet/ServletTester.java
index 2317195a183c0b1b854a3ad7aefff94b16af2eb9..4ad1fd9ffd07957b73bbb47f9f54bacdee63f102 100644 (file)
--- a/lib/jetty/org/eclipse/jetty/servlet/ServletTester.java
+++ b/lib/jetty/org/eclipse/jetty/servlet/ServletTester.java
@@ -1,6 +1,6 @@
 //
 //  ========================================================================
-//  Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
+//  Copyright (c) 1995-2016 Mort Bay Consulting Pty. Ltd.
 //  ------------------------------------------------------------------------
 //  All rights reserved. This program and the accompanying materials
 //  are made available under the terms of the Eclipse Public License v1.0
@@ -23,6 +23,7 @@ import java.nio.ByteBuffer;
 import java.util.EnumSet;
 import java.util.Enumeration;
 import java.util.Map;
+import java.util.concurrent.TimeUnit;
 
 import javax.servlet.DispatcherType;
 import javax.servlet.Filter;
@@ -33,11 +34,16 @@ import org.eclipse.jetty.server.LocalConnector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
 import org.eclipse.jetty.util.Attributes;
+import org.eclipse.jetty.util.BufferUtil;
 import org.eclipse.jetty.util.component.ContainerLifeCycle;
+import org.eclipse.jetty.util.log.Log;
+import org.eclipse.jetty.util.log.Logger;
 import org.eclipse.jetty.util.resource.Resource;
 
 public class ServletTester extends ContainerLifeCycle
 {
+    private static final Logger LOG = Log.getLogger(ServletTester.class);
+    
     private final Server _server=new Server();
     private final LocalConnector _connector=new LocalConnector(_server);
     private final ServletContextHandler _context;
@@ -97,7 +103,7 @@ public class ServletTester extends ContainerLifeCycle
         return _context.getAttribute(name);
     }
 
-    public Enumeration getAttributeNames()
+    public Enumeration<String> getAttributeNames()
     {
         return _context.getAttributeNames();
     }
@@ -122,7 +128,7 @@ public class ServletTester extends ContainerLifeCycle
         return _context.setInitParameter(name,value);
     }
 
-    public Enumeration getInitParameterNames()
+    public Enumeration<String> getInitParameterNames()
     {
         return _context.getInitParameterNames();
     }
@@ -162,8 +168,6 @@ public class ServletTester extends ContainerLifeCycle
         _context.setResourceBase(resourceBase);
     }
 
-    private final ServletHandler _handler;
-
     public ServletTester()
     {
         this("/",ServletContextHandler.SECURITY|ServletContextHandler.SESSIONS);
@@ -177,7 +181,6 @@ public class ServletTester extends ContainerLifeCycle
     public ServletTester(String contextPath,int options)
     {
         _context=new ServletContextHandler(_server,contextPath,options);
-        _handler=_context.getServletHandler();
         _server.setConnectors(new Connector[]{_connector});
         addBean(_server);
     }
@@ -189,15 +192,40 @@ public class ServletTester extends ContainerLifeCycle
 
     public String getResponses(String request) throws Exception
     {
+        if (LOG.isDebugEnabled())
+        {
+            LOG.debug("Request: {}",request);
+        }
         return _connector.getResponses(request);
     }
-
+    
+    public String getResponses(String request, long idleFor,TimeUnit units) throws Exception
+    {
+        if (LOG.isDebugEnabled())
+        {
+            LOG.debug("Request: {}",request);
+        }
+        return _connector.getResponses(request, idleFor, units);
+    }
+    
     public ByteBuffer getResponses(ByteBuffer request) throws Exception
     {
+        if (LOG.isDebugEnabled())
+        {
+            LOG.debug("Request (Buffer): {}",BufferUtil.toUTF8String(request));
+        }
         return _connector.getResponses(request);
     }
+    
+    public ByteBuffer getResponses(ByteBuffer requestsBuffer,long idleFor,TimeUnit units) throws Exception
+    {
+        if (LOG.isDebugEnabled())
+        {
+            LOG.debug("Requests (Buffer): {}",BufferUtil.toUTF8String(requestsBuffer));
+        }
+        return _connector.getResponses(requestsBuffer, idleFor, units);
+    }
 
-    /* ------------------------------------------------------------ */
     /** Create a port based connector.
      * This methods adds a port connector to the server
      * @return A URL to access the server via the connector.