Repository: wicket Updated Branches: refs/heads/master 22592e5a2 -> 4c648e6e3
WICKET-6113 Improve ResourceStreamResource API by passing Attributes to #getResourceStream() Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4c648e6e Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4c648e6e Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4c648e6e Branch: refs/heads/master Commit: 4c648e6e3f27fe0f0a4e23263491d04bfa91bf7d Parents: 22592e5 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Wed Mar 9 18:42:15 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Mar 9 18:42:15 2016 +0100 ---------------------------------------------------------------------- .../request/resource/ResourceStreamResource.java | 17 ++++++++++------- .../resource/TextTemplateResourceReference.java | 2 +- .../repeater/data/table/export/ExportToolbar.java | 2 +- 3 files changed, 12 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/4c648e6e/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java index 3c70f3a..b781206 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/ResourceStreamResource.java @@ -34,7 +34,7 @@ import org.slf4j.LoggerFactory; /** - * TODO javadoc + * A {@link AbstractResource resource} that loads its data from {@link IResourceStream} */ public class ResourceStreamResource extends AbstractResource { @@ -42,7 +42,7 @@ public class ResourceStreamResource extends AbstractResource private static final Logger logger = LoggerFactory.getLogger(ResourceStreamResource.class); - private IResourceStream stream; + private final IResourceStream stream; private String fileName; private ContentDisposition contentDisposition = ContentDisposition.INLINE; private String textEncoding; @@ -119,24 +119,27 @@ public class ResourceStreamResource extends AbstractResource /** * Lazy or dynamic initialization of the wrapped IResourceStream(Writer) + * + * @param attributes + * The request attributes * @return the underlying IResourceStream. May be {@code null}. */ - protected IResourceStream getResourceStream() + protected IResourceStream getResourceStream(Attributes attributes) { return stream; } - private IResourceStream internalGetResourceStream() + private IResourceStream internalGetResourceStream(Attributes attributes) { - final IResourceStream resourceStream = getResourceStream(); - Checks.notNull(resourceStream, "%s#getResourceStream() should not return null!", getClass().getName()); + final IResourceStream resourceStream = getResourceStream(attributes); + Checks.notNull(resourceStream, "%s#getResourceStream(attributes) should not return null!", getClass().getName()); return resourceStream; } @Override protected ResourceResponse newResourceResponse(Attributes attributes) { - final IResourceStream resourceStream = internalGetResourceStream(); + final IResourceStream resourceStream = internalGetResourceStream(attributes); ResourceResponse data = new ResourceResponse(); Time lastModifiedTime = resourceStream.lastModifiedTime(); if (lastModifiedTime != null) http://git-wip-us.apache.org/repos/asf/wicket/blob/4c648e6e/wicket-core/src/main/java/org/apache/wicket/resource/TextTemplateResourceReference.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/TextTemplateResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/resource/TextTemplateResourceReference.java index dbaa81a..6d761d9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/TextTemplateResourceReference.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/TextTemplateResourceReference.java @@ -143,7 +143,7 @@ public class TextTemplateResourceReference extends ResourceReference implements resource = new ResourceStreamResource(null) { @Override - protected IResourceStream getResourceStream() + protected IResourceStream getResourceStream(Attributes attributes) { IModel<Map<String, Object>> variables = TextTemplateResourceReference.this.variablesModel; String stringValue = textTemplate.asString(variables.getObject()); http://git-wip-us.apache.org/repos/asf/wicket/blob/4c648e6e/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java ---------------------------------------------------------------------- diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java index 4c0facb..999246e 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java @@ -202,7 +202,7 @@ public class ExportToolbar extends AbstractToolbar IResource resource = new ResourceStreamResource() { @Override - protected IResourceStream getResourceStream() + protected IResourceStream getResourceStream(Attributes attributes) { return new DataExportResourceStreamWriter(dataExporter, getTable()); }
