You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/07/11 14:53:31 UTC
[1/2] git commit: WICKET-5250 Minified css/js gets compressed
Updated Branches:
refs/heads/master 89ac75bf0 -> d6e7ac80e
WICKET-5250 Minified css/js gets compressed
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d6e7ac80
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d6e7ac80
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d6e7ac80
Branch: refs/heads/master
Commit: d6e7ac80e54b0eb6c3cb8df9a3e437c745de327e
Parents: 6122df4
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Jul 11 15:52:35 2013 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jul 11 15:53:15 2013 +0300
----------------------------------------------------------------------
.../request/resource/CssResourceReference.java | 8 +--
.../resource/JavaScriptResourceReference.java | 8 +--
.../resource/PackageResourceReference.java | 48 +++++++--------
.../resource/PackageResourceReferenceTest.java | 62 ++++++++++----------
4 files changed, 63 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/d6e7ac80/wicket-core/src/main/java/org/apache/wicket/request/resource/CssResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/CssResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/CssResourceReference.java
index 7d15d61..5dbf4f5 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/CssResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/CssResourceReference.java
@@ -76,10 +76,10 @@ public class CssResourceReference extends PackageResourceReference
@Override
public CssPackageResource getResource()
{
- final CssPackageResource resource = new CssPackageResource(getScope(), getName(), getLocale(), getStyle(),
- getVariation());
- removeCompressFlagIfUnnecessary(resource);
- return resource;
+ final CssPackageResource resource = new CssPackageResource(getScope(), getName(), getLocale(), getStyle(),
+ getVariation());
+ removeCompressFlagIfUnnecessary(resource);
+ return resource;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d6e7ac80/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java
index d320f59..212f55a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java
@@ -78,9 +78,9 @@ public class JavaScriptResourceReference extends PackageResourceReference
@Override
public JavaScriptPackageResource getResource()
{
- final JavaScriptPackageResource resource = new JavaScriptPackageResource(getScope(), getName(), getLocale(), getStyle(),
- getVariation());
- removeCompressFlagIfUnnecessary(resource);
- return resource;
+ final JavaScriptPackageResource resource = new JavaScriptPackageResource(getScope(), getName(), getLocale(), getStyle(),
+ getVariation());
+ removeCompressFlagIfUnnecessary(resource);
+ return resource;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/d6e7ac80/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
index a127aa7..1c874ad 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
@@ -129,30 +129,30 @@ public class PackageResourceReference extends ResourceReference
getVariation());
}
- removeCompressFlagIfUnnecessary(resource);
-
- return resource;
- }
-
- /**
- * Method allowing to remove the compress flag if the resource has been detected as a minified one
- * (i.e. ending with .min.EXT)
- * This method is to be called by subclasses overriding <code>getResource</code>
- * if they want to rely on default minification detection handling
- *
- * see WICKET-5250 for further explanation
- * @param resource resource to check
- */
- protected void removeCompressFlagIfUnnecessary(final PackageResource resource)
- {
- String minifiedName = MINIFIED_NAMES_CACHE.get(this);
- if (minifiedName != null && minifiedName != NO_MINIFIED_NAME)
- {
- resource.setCompress(false);
- }
- }
-
- private ResourceReference.UrlAttributes getUrlAttributes(Locale locale, String style, String variation)
+ removeCompressFlagIfUnnecessary(resource);
+
+ return resource;
+ }
+
+ /**
+ * Method allowing to remove the compress flag if the resource has been detected as a minified one
+ * (i.e. ending with .min.EXT)
+ * This method is to be called by subclasses overriding <code>getResource</code>
+ * if they want to rely on default minification detection handling
+ *
+ * see WICKET-5250 for further explanation
+ * @param resource resource to check
+ */
+ protected final void removeCompressFlagIfUnnecessary(final PackageResource resource)
+ {
+ String minifiedName = MINIFIED_NAMES_CACHE.get(this);
+ if (minifiedName != null && minifiedName != NO_MINIFIED_NAME)
+ {
+ resource.setCompress(false);
+ }
+ }
+
+ private ResourceReference.UrlAttributes getUrlAttributes(Locale locale, String style, String variation)
{
IResourceStreamLocator locator = Application.get()
.getResourceSettings()
http://git-wip-us.apache.org/repos/asf/wicket/blob/d6e7ac80/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
index 5bfda28..4fcbd09 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
@@ -206,35 +206,35 @@ public class PackageResourceReferenceTest extends WicketTestCase
}
- /**
- * see WICKET-5250 - for JavaScriptResourceReference
- */
- @Test
- public void testJavaScriptResourceReferenceRespectsMinifiedResourcesDetection() throws Exception
- {
- Application.get().getResourceSettings().setUseMinifiedResources(true);
- final JavaScriptResourceReference notMinified = new JavaScriptResourceReference(PackageResourceReferenceTest.class, "a.js");
- final JavaScriptPackageResource notMinifiedResource = notMinified.getResource();
- Assert.assertTrue("Not minified resource should got its compress flag set to true",notMinifiedResource.getCompress());
-
- final JavaScriptResourceReference alreadyMinified = new JavaScriptResourceReference(PackageResourceReferenceTest.class, "b.min.js");
- final JavaScriptPackageResource alreadyMinifiedResource = alreadyMinified.getResource();
- Assert.assertFalse("Already minified resource should got its compress flag set to false", alreadyMinifiedResource.getCompress());
- }
-
- /**
- * see WICKET-5250 - for CSSResourceReference
- */
- @Test
- public void testCSSResourceReferenceRespectsMinifiedResourcesDetection() throws Exception
- {
- Application.get().getResourceSettings().setUseMinifiedResources(true);
- final CssResourceReference notMinified = new CssResourceReference(PackageResourceReferenceTest.class, "a.css");
- final CssPackageResource notMinifiedResource = notMinified.getResource();
- Assert.assertTrue("Not minified resource should got its compress flag set to true",notMinifiedResource.getCompress());
-
- final CssResourceReference alreadyMinified = new CssResourceReference(PackageResourceReferenceTest.class, "b.min.css");
- final CssPackageResource alreadyMinifiedResource = alreadyMinified.getResource();
- Assert.assertFalse("Already minified resource should got its compress flag set to false", alreadyMinifiedResource.getCompress());
- }
+ /**
+ * see WICKET-5250 - for JavaScriptResourceReference
+ */
+ @Test
+ public void testJavaScriptResourceReferenceRespectsMinifiedResourcesDetection()
+ {
+ Application.get().getResourceSettings().setUseMinifiedResources(true);
+ final JavaScriptResourceReference notMinified = new JavaScriptResourceReference(PackageResourceReferenceTest.class, "a.js");
+ final JavaScriptPackageResource notMinifiedResource = notMinified.getResource();
+ Assert.assertTrue("Not minified resource should got its compress flag set to true", notMinifiedResource.getCompress());
+
+ final JavaScriptResourceReference alreadyMinified = new JavaScriptResourceReference(PackageResourceReferenceTest.class, "b.min.js");
+ final JavaScriptPackageResource alreadyMinifiedResource = alreadyMinified.getResource();
+ Assert.assertFalse("Already minified resource should got its compress flag set to false", alreadyMinifiedResource.getCompress());
+ }
+
+ /**
+ * see WICKET-5250 - for CSSResourceReference
+ */
+ @Test
+ public void testCSSResourceReferenceRespectsMinifiedResourcesDetection()
+ {
+ Application.get().getResourceSettings().setUseMinifiedResources(true);
+ final CssResourceReference notMinified = new CssResourceReference(PackageResourceReferenceTest.class, "a.css");
+ final CssPackageResource notMinifiedResource = notMinified.getResource();
+ Assert.assertTrue("Not minified resource should got its compress flag set to true", notMinifiedResource.getCompress());
+
+ final CssResourceReference alreadyMinified = new CssResourceReference(PackageResourceReferenceTest.class, "b.min.css");
+ final CssPackageResource alreadyMinifiedResource = alreadyMinified.getResource();
+ Assert.assertFalse("Already minified resource should got its compress flag set to false", alreadyMinifiedResource.getCompress());
+ }
}
[2/2] git commit: WICKET-5250
Posted by mg...@apache.org.
WICKET-5250
Updated CssResourceReference and JavaScriptResourceReference to rely on the minification detection provided by PackageResourceReference to toggle the compress flag accordingly to the effective minification of the underlying resource.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6122df49
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6122df49
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6122df49
Branch: refs/heads/master
Commit: 6122df493fb345dc391844544a7e323a7d1ebda6
Parents: 89ac75b
Author: Cedric Gatay <ce...@gatay.fr>
Authored: Sat Jun 29 12:40:07 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Jul 11 15:53:15 2013 +0300
----------------------------------------------------------------------
.../request/resource/CssResourceReference.java | 6 ++--
.../resource/JavaScriptResourceReference.java | 6 ++--
.../resource/PackageResourceReference.java | 34 ++++++++++++++------
.../resource/PackageResourceReferenceTest.java | 33 +++++++++++++++++++
.../org/apache/wicket/request/resource/a.css | 3 ++
.../org/apache/wicket/request/resource/b.css | 3 ++
.../apache/wicket/request/resource/b.min.css | 1 +
7 files changed, 72 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6122df49/wicket-core/src/main/java/org/apache/wicket/request/resource/CssResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/CssResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/CssResourceReference.java
index 55955d7..7d15d61 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/CssResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/CssResourceReference.java
@@ -76,8 +76,10 @@ public class CssResourceReference extends PackageResourceReference
@Override
public CssPackageResource getResource()
{
- return new CssPackageResource(getScope(), getName(), getLocale(), getStyle(),
- getVariation());
+ final CssPackageResource resource = new CssPackageResource(getScope(), getName(), getLocale(), getStyle(),
+ getVariation());
+ removeCompressFlagIfUnnecessary(resource);
+ return resource;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6122df49/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java
index 43e4a0d..d320f59 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/JavaScriptResourceReference.java
@@ -78,7 +78,9 @@ public class JavaScriptResourceReference extends PackageResourceReference
@Override
public JavaScriptPackageResource getResource()
{
- return new JavaScriptPackageResource(getScope(), getName(), getLocale(), getStyle(),
- getVariation());
+ final JavaScriptPackageResource resource = new JavaScriptPackageResource(getScope(), getName(), getLocale(), getStyle(),
+ getVariation());
+ removeCompressFlagIfUnnecessary(resource);
+ return resource;
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6122df49/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
index ca248a0..a127aa7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/PackageResourceReference.java
@@ -129,16 +129,30 @@ public class PackageResourceReference extends ResourceReference
getVariation());
}
- String minifiedName = MINIFIED_NAMES_CACHE.get(this);
- if (minifiedName != null && minifiedName != NO_MINIFIED_NAME)
- {
- resource.setCompress(false);
- }
-
- return resource;
- }
-
- private ResourceReference.UrlAttributes getUrlAttributes(Locale locale, String style, String variation)
+ removeCompressFlagIfUnnecessary(resource);
+
+ return resource;
+ }
+
+ /**
+ * Method allowing to remove the compress flag if the resource has been detected as a minified one
+ * (i.e. ending with .min.EXT)
+ * This method is to be called by subclasses overriding <code>getResource</code>
+ * if they want to rely on default minification detection handling
+ *
+ * see WICKET-5250 for further explanation
+ * @param resource resource to check
+ */
+ protected void removeCompressFlagIfUnnecessary(final PackageResource resource)
+ {
+ String minifiedName = MINIFIED_NAMES_CACHE.get(this);
+ if (minifiedName != null && minifiedName != NO_MINIFIED_NAME)
+ {
+ resource.setCompress(false);
+ }
+ }
+
+ private ResourceReference.UrlAttributes getUrlAttributes(Locale locale, String style, String variation)
{
IResourceStreamLocator locator = Application.get()
.getResourceSettings()
http://git-wip-us.apache.org/repos/asf/wicket/blob/6122df49/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
index 5fe8474..5bfda28 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/PackageResourceReferenceTest.java
@@ -18,6 +18,7 @@ package org.apache.wicket.request.resource;
import java.util.Locale;
+import org.apache.wicket.Application;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.request.resource.IResource.Attributes;
import org.apache.wicket.request.resource.ResourceReference.UrlAttributes;
@@ -204,4 +205,36 @@ public class PackageResourceReferenceTest extends WicketTestCase
Assert.assertEquals("html5.min", html5min.getMinifiedName());
}
+
+ /**
+ * see WICKET-5250 - for JavaScriptResourceReference
+ */
+ @Test
+ public void testJavaScriptResourceReferenceRespectsMinifiedResourcesDetection() throws Exception
+ {
+ Application.get().getResourceSettings().setUseMinifiedResources(true);
+ final JavaScriptResourceReference notMinified = new JavaScriptResourceReference(PackageResourceReferenceTest.class, "a.js");
+ final JavaScriptPackageResource notMinifiedResource = notMinified.getResource();
+ Assert.assertTrue("Not minified resource should got its compress flag set to true",notMinifiedResource.getCompress());
+
+ final JavaScriptResourceReference alreadyMinified = new JavaScriptResourceReference(PackageResourceReferenceTest.class, "b.min.js");
+ final JavaScriptPackageResource alreadyMinifiedResource = alreadyMinified.getResource();
+ Assert.assertFalse("Already minified resource should got its compress flag set to false", alreadyMinifiedResource.getCompress());
+ }
+
+ /**
+ * see WICKET-5250 - for CSSResourceReference
+ */
+ @Test
+ public void testCSSResourceReferenceRespectsMinifiedResourcesDetection() throws Exception
+ {
+ Application.get().getResourceSettings().setUseMinifiedResources(true);
+ final CssResourceReference notMinified = new CssResourceReference(PackageResourceReferenceTest.class, "a.css");
+ final CssPackageResource notMinifiedResource = notMinified.getResource();
+ Assert.assertTrue("Not minified resource should got its compress flag set to true",notMinifiedResource.getCompress());
+
+ final CssResourceReference alreadyMinified = new CssResourceReference(PackageResourceReferenceTest.class, "b.min.css");
+ final CssPackageResource alreadyMinifiedResource = alreadyMinified.getResource();
+ Assert.assertFalse("Already minified resource should got its compress flag set to false", alreadyMinifiedResource.getCompress());
+ }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/6122df49/wicket-core/src/test/java/org/apache/wicket/request/resource/a.css
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/a.css b/wicket-core/src/test/java/org/apache/wicket/request/resource/a.css
new file mode 100644
index 0000000..47eb6ca
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/a.css
@@ -0,0 +1,3 @@
+.a{
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/6122df49/wicket-core/src/test/java/org/apache/wicket/request/resource/b.css
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/b.css b/wicket-core/src/test/java/org/apache/wicket/request/resource/b.css
new file mode 100644
index 0000000..1d90d89
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/b.css
@@ -0,0 +1,3 @@
+.b{
+
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/6122df49/wicket-core/src/test/java/org/apache/wicket/request/resource/b.min.css
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/b.min.css b/wicket-core/src/test/java/org/apache/wicket/request/resource/b.min.css
new file mode 100644
index 0000000..7c4d440
--- /dev/null
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/b.min.css
@@ -0,0 +1 @@
+.b{}
\ No newline at end of file