Refactor to enable implementing #7545 without changing the API

diff --git a/server/src/com/vaadin/server/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java
index fa127fa2aae918c8777dc8089a77620106da9f3a..2f660a443d83375e3a29e93b624623cfe0face5e 100644 (file)
--- a/server/src/com/vaadin/server/AbstractClientConnector.java
+++ b/server/src/com/vaadin/server/AbstractClientConnector.java
@@ -572,7 +572,7 @@ public abstract class AbstractClientConnector implements ClientConnector {
         ConnectorResource resource = (ConnectorResource) getResource(key);
         if (resource != null) {
             DownloadStream stream = resource.getStream();
-            stream.writeTo(response);
+            stream.writeResponse(request, response);
             return true;
         } else {
             return false;

diff --git a/server/src/com/vaadin/server/DownloadStream.java b/server/src/com/vaadin/server/DownloadStream.java
index 7bc8a17c03da72fc49d2a1720b07959f044fb339..0c00f9683200de23472200f67a3e2628de098d89 100644 (file)
--- a/server/src/com/vaadin/server/DownloadStream.java
+++ b/server/src/com/vaadin/server/DownloadStream.java
@@ -26,7 +26,6 @@ import java.util.Map;
 
 import javax.servlet.http.HttpServletResponse;
 
-
 /**
  * Downloadable stream.
  * 
@@ -231,14 +230,18 @@ public class DownloadStream implements Serializable {
      * redirect (302 Moved temporarily) is sent instead of the contents of this
      * stream.
      * 
+     * @param request
+     *            the request for which the response should be written
      * @param response
      *            the wrapped response to write this download stream to
+     * 
      * @throws IOException
      *             passed through from the wrapped response
      * 
      * @since 7.0
      */
-    public void writeTo(WrappedResponse response) throws IOException {
+    public void writeResponse(WrappedRequest request, WrappedResponse response)
+            throws IOException {
         if (getParameter("Location") != null) {
             response.setStatus(HttpServletResponse.SC_MOVED_TEMPORARILY);
             response.setHeader("Location", getParameter("Location"));

diff --git a/server/src/com/vaadin/server/GlobalResourceHandler.java b/server/src/com/vaadin/server/GlobalResourceHandler.java
index 7038d5125187898dc01f45aed0903158b9db290e..f3a72a0efc1fccec7fa9350ab1978d56e4d7256a 100644 (file)
--- a/server/src/com/vaadin/server/GlobalResourceHandler.java
+++ b/server/src/com/vaadin/server/GlobalResourceHandler.java
@@ -116,7 +116,7 @@ public class GlobalResourceHandler implements RequestHandler {
                     + " didn't produce any stream.");
         }
 
-        stream.writeTo(response);
+        stream.writeResponse(request, response);
         return true;
     }
 

diff --git a/server/src/com/vaadin/ui/AbstractMedia.java b/server/src/com/vaadin/ui/AbstractMedia.java
index 940d85a8b921e120f40d35dc431e34f319511311..3f59b070b7b13a62722097f2c9b1940de8928fbd 100644 (file)
--- a/server/src/com/vaadin/ui/AbstractMedia.java
+++ b/server/src/com/vaadin/ui/AbstractMedia.java
@@ -97,7 +97,7 @@ public abstract class AbstractMedia extends AbstractComponent {
             URLReference reference = sources.get(sourceIndex);
             ConnectorResource resource = (ConnectorResource) ResourceReference
                     .getResource(reference);
-            resource.getStream().writeTo(response);
+            resource.getStream().writeResponse(request, response);
             return true;
         } else {
             return super.handleConnectorRequest(request, response, path);

diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java
index b1b652381fc1e26cfc693b5a6646bb7f13894648..37f9197285dfb1bfd4c7d79e3172731f5ee21425 100644 (file)
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1589.java
@@ -91,7 +91,7 @@ class MyDynamicResource implements RequestHandler {
                 downloadStream.setParameter("Content-Disposition",
                         "attachment; filename=\"downloadedPNG.png\"");
             }
-            downloadStream.writeTo(response);
+            downloadStream.writeResponse(request, response);
             return true;
         } catch (IOException e) {
             return false;

diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java
index c4c600edaab634cb6993b49a0258f66ee2cc2fd5..1e7fe5d78acdb1148f067948d224001148b25088 100644 (file)
--- a/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java
+++ b/tests/testbench/com/vaadin/tests/tickets/Ticket2292.java
@@ -87,7 +87,7 @@ public class Ticket2292 extends com.vaadin.Application.LegacyApplication
             // Return a stream from the buffer.
             ByteArrayInputStream istream = new ByteArrayInputStream(
                     imagebuffer.toByteArray());
-            new DownloadStream(istream, null, null).writeTo(response);
+            new DownloadStream(istream, null, null).writeResponse(request, response);
             return true;
         } catch (IOException e) {
             return false;