[wicket] branch wicket-7.x updated: WICKET-6669 Use the scope and name of the first provided resource for IScopeAwareTextResourceProcessor#process()

[mgrigorov]

This is an automated email from the ASF dual-hosted git repository.

mgrigorov pushed a commit to branch wicket-7.x
in repository https://gitbox.apache.org/repos/asf/wicket.git


The following commit(s) were added to refs/heads/wicket-7.x by this push:
     new 8566ed2  WICKET-6669 Use the scope and name of the first provided 
resource for IScopeAwareTextResourceProcessor#process()
8566ed2 is described below

commit 8566ed24031641c060871cb0732b7171fd2deac8
Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org>
AuthorDate: Thu May 23 09:03:18 2019 +0300

    WICKET-6669 Use the scope and name of the first provided resource for 
IScopeAwareTextResourceProcessor#process()
    
    The same is already done in ConcatBundleResource#getCacheKey()
---
 .../resource/IScopeAwareTextResourceProcessor.java    |  2 +-
 .../wicket/resource/ITextResourceCompressor.java      |  2 +-
 .../wicket/resource/bundles/ConcatBundleResource.java | 19 +++++++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git 
a/wicket-core/src/main/java/org/apache/wicket/resource/IScopeAwareTextResourceProcessor.java
 
b/wicket-core/src/main/java/org/apache/wicket/resource/IScopeAwareTextResourceProcessor.java
index 169d600..42bceb7 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/resource/IScopeAwareTextResourceProcessor.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/resource/IScopeAwareTextResourceProcessor.java
@@ -35,5 +35,5 @@ public interface IScopeAwareTextResourceProcessor extends 
ITextResourceCompresso
         *          The name of the package resource
         * @return The processed input
         */
-       public String process(String input, Class<?> scope, String name);
+       String process(String input, Class<?> scope, String name);
 }
diff --git 
a/wicket-core/src/main/java/org/apache/wicket/resource/ITextResourceCompressor.java
 
b/wicket-core/src/main/java/org/apache/wicket/resource/ITextResourceCompressor.java
index dcbffe6..25b8569 100644
--- 
a/wicket-core/src/main/java/org/apache/wicket/resource/ITextResourceCompressor.java
+++ 
b/wicket-core/src/main/java/org/apache/wicket/resource/ITextResourceCompressor.java
@@ -27,5 +27,5 @@ public interface ITextResourceCompressor
         * @param original
         * @return compressed text resource
         */
-       public String compress(String original);
+       String compress(String original);
 }
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 95087c4..62f57a2 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
@@ -32,6 +32,7 @@ import org.apache.wicket.request.resource.AbstractResource;
 import org.apache.wicket.request.resource.IResource;
 import org.apache.wicket.request.resource.ResourceReference;
 import org.apache.wicket.request.resource.caching.IStaticCacheableResource;
+import org.apache.wicket.resource.IScopeAwareTextResourceProcessor;
 import org.apache.wicket.resource.ITextResourceCompressor;
 import org.apache.wicket.util.io.ByteArrayOutputStream;
 import org.apache.wicket.util.io.IOUtils;
@@ -174,14 +175,28 @@ public class ConcatBundleResource extends 
AbstractResource implements IStaticCac
        {
                ByteArrayOutputStream output = new ByteArrayOutputStream();
                for (IResourceStream curStream : resources)
+               {
                        IOUtils.copy(curStream.getInputStream(), output);
+               }
 
                byte[] bytes = output.toByteArray();
 
-               if (getCompressor() != null)
+               final ITextResourceCompressor textResourceCompressor = 
getCompressor();
+               if (textResourceCompressor != null)
                {
                        String nonCompressed = new String(bytes, "UTF-8");
-                       bytes = 
getCompressor().compress(nonCompressed).getBytes("UTF-8");
+
+                       if (textResourceCompressor instanceof 
IScopeAwareTextResourceProcessor)
+                       {
+                               final ResourceReference reference = 
providedResources.get(0).getReference();
+                               final Class<?> scope = reference.getScope();
+                               final String name = reference.getName();
+                               bytes = ((IScopeAwareTextResourceProcessor) 
textResourceCompressor).process(nonCompressed, scope, name).getBytes("UTF-8");
+                       }
+                       else
+                       {
+                               bytes = 
textResourceCompressor.compress(nonCompressed).getBytes("UTF-8");
+                       }
                }
 
                return bytes;