Repository: wicket Updated Branches: refs/heads/master d4c7cdbe7 -> 5c829c4ac
WICKET-5909 Session style is not taken into account when loading mounted resources. Rename IStaticCacheableResource#getCacheableResourceStream() to #getResourceStream(). Merge PackageResource#getCacheableResourceStream() and #getResourceStream() by preserving the behavior of #getCacheableResourceStream() Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5c829c4a Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5c829c4a Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5c829c4a Branch: refs/heads/master Commit: 5c829c4ac40d95c78010697dd093aceba4b54877 Parents: d4c7cdb Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Jul 7 22:33:27 2015 +0300 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Jul 7 22:33:27 2015 +0300 ---------------------------------------------------------------------- .../apache/wicket/markup/html/media/Source.java | 2 +- .../resource/ContextRelativeResource.java | 2 +- .../request/resource/PackageResource.java | 24 ++++---------------- .../caching/IStaticCacheableResource.java | 4 ++-- .../version/LastModifiedResourceVersion.java | 2 +- .../version/MessageDigestResourceVersion.java | 2 +- .../resource/bundles/ConcatBundleResource.java | 4 ++-- .../org/apache/wicket/util/image/ImageUtil.java | 2 +- .../BasicResourceReferenceMapperTest.java | 4 +--- .../resource/JavaScriptPackageResourceTest.java | 7 +----- .../request/resource/caching/TestResource.java | 2 +- 11 files changed, 16 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/5c829c4a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java index c9b6e5f..bf960c5 100755 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/Source.java @@ -200,7 +200,7 @@ public class Source extends WebMarkupContainer // type of the package resource if(resourceReference instanceof PackageResourceReference){ PackageResource resource = ((PackageResourceReference)resourceReference).getResource(); - IResourceStream resourceStream = resource.getCacheableResourceStream(); + IResourceStream resourceStream = resource.getResourceStream(); String contentType = resourceStream.getContentType(); tag.put("type", contentType); } http://git-wip-us.apache.org/repos/asf/wicket/blob/5c829c4a/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResource.java index 1dd312a..d5f5e8b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResource.java @@ -82,7 +82,7 @@ public class ContextRelativeResource extends AbstractResource implements IStatic } @Override - public IResourceStream getCacheableResourceStream() + public IResourceStream getResourceStream() { return new WebExternalResourceStream(path); } http://git-wip-us.apache.org/repos/asf/wicket/blob/5c829c4a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java index 1bec519..899e4c4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResource.java @@ -255,7 +255,7 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl @Override public Serializable getCacheKey() { - IResourceStream stream = getCacheableResourceStream(); + IResourceStream stream = getResourceStream(); // if resource stream can not be found do not cache if (stream == null) @@ -299,7 +299,7 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl { final ResourceResponse resourceResponse = new ResourceResponse(); - final IResourceStream resourceStream = getCacheableResourceStream(); + final IResourceStream resourceStream = getResourceStream(); // bail out if resource stream could not be found if (resourceStream == null) @@ -429,31 +429,15 @@ public class PackageResource extends AbstractResource implements IStaticCacheabl return resourceResponse; } - - /** - - * Locate resource stream for current resource. Be aware that method takes the current wicket session's - * locale and style into account when locating the stream. - * - * @return resource stream or <code>null</code> if not found - * - * @see org.apache.wicket.request.resource.caching.IStaticCacheableResource#getCacheableResourceStream() - */ - @Override - public IResourceStream getCacheableResourceStream() - { - return internalGetResourceStream(getCurrentStyle(), getCurrentLocale()); - } - /** * locate resource stream for current resource * * @return resource stream or <code>null</code> if not found - * @deprecated use {@link #getCacheableResourceStream} instead. */ + @Override public IResourceStream getResourceStream() { - return getCacheableResourceStream(); + return internalGetResourceStream(getCurrentStyle(), getCurrentLocale()); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/5c829c4a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IStaticCacheableResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IStaticCacheableResource.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IStaticCacheableResource.java index e3ed5fc..e580851 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IStaticCacheableResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/IStaticCacheableResource.java @@ -39,7 +39,7 @@ public interface IStaticCacheableResource extends IResource /** * get unique caching key for the resource stream produced by - * {@link #getCacheableResourceStream()} + * {@link #getResourceStream()} * * @return serializable key with properly supports {@link #equals(Object)} and * {@link #hashCode()} @@ -52,5 +52,5 @@ public interface IStaticCacheableResource extends IResource * * @return stream or <code>null</code> if no stream could be found */ - IResourceStream getCacheableResourceStream(); + IResourceStream getResourceStream(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/5c829c4a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java index 1ba8de2..76f0f19 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java @@ -41,7 +41,7 @@ public class LastModifiedResourceVersion implements IResourceVersion public String getVersion(IStaticCacheableResource resource) { // get last modified timestamp of resource - IResourceStream stream = resource.getCacheableResourceStream(); + IResourceStream stream = resource.getResourceStream(); // if resource stream can not be found do not cache if (stream == null) http://git-wip-us.apache.org/repos/asf/wicket/blob/5c829c4a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java index 9652e05..96a22c0 100644 --- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java +++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/MessageDigestResourceVersion.java @@ -122,7 +122,7 @@ public class MessageDigestResourceVersion implements IResourceVersion @Override public String getVersion(IStaticCacheableResource resource) { - IResourceStream stream = resource.getCacheableResourceStream(); + IResourceStream stream = resource.getResourceStream(); // if resource stream can not be found do not cache if (stream == null) http://git-wip-us.apache.org/repos/asf/wicket/blob/5c829c4a/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatBundleResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatBundleResource.java b/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatBundleResource.java index 3f494ac..95087c4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatBundleResource.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/bundles/ConcatBundleResource.java @@ -137,7 +137,7 @@ public class ConcatBundleResource extends AbstractResource implements IStaticCac for (IReferenceHeaderItem curItem : providedResources) { IResourceStream stream = ((IStaticCacheableResource)curItem.getReference() - .getResource()).getCacheableResourceStream(); + .getResource()).getResourceStream(); if (stream == null) { reportError(curItem.getReference(), "Cannot get resource stream for "); @@ -254,7 +254,7 @@ public class ConcatBundleResource extends AbstractResource implements IStaticCac } @Override - public IResourceStream getCacheableResourceStream() + public IResourceStream getResourceStream() { List<IResourceStream> resources = collectResourceStreams(); http://git-wip-us.apache.org/repos/asf/wicket/blob/5c829c4a/wicket-core/src/main/java/org/apache/wicket/util/image/ImageUtil.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/image/ImageUtil.java b/wicket-core/src/main/java/org/apache/wicket/util/image/ImageUtil.java index 6309308..fca5877 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/image/ImageUtil.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/image/ImageUtil.java @@ -51,7 +51,7 @@ public class ImageUtil public static CharSequence createBase64EncodedImage(PackageResourceReference imageReference, boolean removeWhitespaces) throws ResourceStreamNotFoundException, IOException { - IResourceStream resourceStream = imageReference.getResource().getCacheableResourceStream(); + IResourceStream resourceStream = imageReference.getResource().getResourceStream(); InputStream inputStream = resourceStream.getInputStream(); try { http://git-wip-us.apache.org/repos/asf/wicket/blob/5c829c4a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java index 2c978ce..8aa8db8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java @@ -29,8 +29,6 @@ import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandle import org.apache.wicket.request.mapper.parameter.INamedParameters; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.mapper.parameter.PageParametersEncoder; -import org.apache.wicket.request.resource.IResource; -import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.caching.FilenameWithVersionResourceCachingStrategy; import org.apache.wicket.request.resource.caching.IResourceCachingStrategy; import org.apache.wicket.request.resource.caching.IStaticCacheableResource; @@ -486,7 +484,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM } @Override - public IResourceStream getCacheableResourceStream() + public IResourceStream getResourceStream() { return new StringResourceStream("foo-bar"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/5c829c4a/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java index 5a869af..022f9d4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java @@ -17,20 +17,18 @@ package org.apache.wicket.request.resource; import java.io.IOException; -import java.io.InputStream; import java.util.Locale; import org.apache.wicket.javascript.IJavaScriptCompressor; import org.apache.wicket.markup.html.PackageResourceTest; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; -import org.apache.wicket.util.io.IOUtils; import org.apache.wicket.util.resource.ResourceStreamNotFoundException; import org.apache.wicket.util.tester.WicketTestCase; import org.junit.Test; /** - * + * Tests for JavaScriptPackageResource */ public class JavaScriptPackageResourceTest extends WicketTestCase { @@ -122,9 +120,6 @@ public class JavaScriptPackageResourceTest extends WicketTestCase tester.startResource(resource); assertEquals(RESOURCE_COMPRESSED, tester.getLastResponseAsString()); - InputStream cacheableStream = resource.getCacheableResourceStream().getInputStream(); - InputStream stream = resource.getCacheableResourceStream().getInputStream(); - assertEquals(IOUtils.toString(cacheableStream), IOUtils.toString(stream)); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/5c829c4a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/TestResource.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/TestResource.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/TestResource.java index da21e4f..e21b6aa 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/TestResource.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/TestResource.java @@ -39,7 +39,7 @@ class TestResource implements IStaticCacheableResource } @Override - public IResourceStream getCacheableResourceStream() + public IResourceStream getResourceStream() { return new StringResourceStream("content"); }
