You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2014/12/05 17:17:28 UTC
wicket git commit: WICKET-5780 Code review
Repository: wicket
Updated Branches:
refs/heads/master 7b8b67673 -> 326d80b68
WICKET-5780 Code review
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/326d80b6
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/326d80b6
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/326d80b6
Branch: refs/heads/master
Commit: 326d80b680dfd46ddc47951fbda0df2071bc4ba5
Parents: 7b8b676
Author: Andrea Del Bene <ad...@apache.org>
Authored: Fri Dec 5 17:16:29 2014 +0100
Committer: Andrea Del Bene <ad...@apache.org>
Committed: Fri Dec 5 17:17:09 2014 +0100
----------------------------------------------------------------------
.../ContextRelativeResourceReference.java | 13 ++-----
.../ContextRelativeResourceReferenceTest.java | 36 +++++++-------------
.../wicket/util/resource/ResourceUtils.java | 7 ++--
3 files changed, 20 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/326d80b6/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResourceReference.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResourceReference.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResourceReference.java
index 4d7b81f..55d281c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResourceReference.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/ContextRelativeResourceReference.java
@@ -40,9 +40,6 @@ public class ContextRelativeResourceReference extends ResourceReference
/** The minfied postfix. */
private final String minPostfix;
- /** The context relative resource. */
- private final ContextRelativeResource contextRelativeResource;
-
/**
* Instantiates a new context relative resource reference for the given name. The resource
* will be minified in DEPLOYMENT mode and "min" will be used as postfix.
@@ -103,7 +100,6 @@ public class ContextRelativeResourceReference extends ResourceReference
this.minPostfix = minPostfix;
this.minifyIt = minifyIt;
- this.contextRelativeResource = buildContextRelativeResource(name, minPostfix);
}
/**
@@ -141,13 +137,10 @@ public class ContextRelativeResourceReference extends ResourceReference
&& Application.get().getResourceSettings().getUseMinifiedResources();
}
- /* (non-Javadoc)
- * @see org.apache.wicket.request.resource.ResourceReference#getResource()
- */
@Override
public final ContextRelativeResource getResource()
{
- return contextRelativeResource;
+ return buildContextRelativeResource(getName(), minPostfix);
}
/**
@@ -155,7 +148,7 @@ public class ContextRelativeResourceReference extends ResourceReference
*
* @return true, if resource can be minified
*/
- public final boolean isMinifyIt()
+ public boolean isMinifyIt()
{
return minifyIt;
}
@@ -166,7 +159,7 @@ public class ContextRelativeResourceReference extends ResourceReference
*
* @return the minified postfix
*/
- public final String getMinPostfix()
+ public String getMinPostfix()
{
return minPostfix;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/326d80b6/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java
index 80c31bd..1e923ce 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java
@@ -16,39 +16,20 @@
*/
package org.apache.wicket.request.resource;
-import org.apache.wicket.mock.MockApplication;
+import org.apache.wicket.WicketTestCase;
+import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTester;
import org.junit.Assert;
-import org.junit.BeforeClass;
import org.junit.Test;
-public class ContextRelativeResourceReferenceTest
+public class ContextRelativeResourceReferenceTest extends WicketTestCase
{
- private static WicketTester tester;
-
static final String RESOURCE_NAME = "/foo/baar/myLibrary";
static final String ALREADY_MINIFIED = RESOURCE_NAME + ".min.js";
static final String TO_BE_MINIFIED = RESOURCE_NAME + ".js";
static final String CUSTOM_SUFFIX = "compress";
- @BeforeClass
- static public void setUp()
- {
- MockApplication application = new MockApplication()
- {
- @Override
- protected void init()
- {
- super.init();
- getResourceSettings().setUseMinifiedResources(true);
- }
- };
-
- tester = new WicketTester(application);
- }
-
-
@Test
public void testMinifyResource() throws Exception
{
@@ -73,7 +54,16 @@ public class ContextRelativeResourceReferenceTest
ContextRelativeResourceReference resourceReference = new ContextRelativeResourceReference(TO_BE_MINIFIED, CUSTOM_SUFFIX);
Assert.assertTrue(testResourceKey(resourceReference, RESOURCE_NAME + "." + CUSTOM_SUFFIX + ".js"));
}
-
+
+ @Override
+ protected WicketTester newWicketTester(WebApplication app)
+ {
+ WicketTester tester = super.newWicketTester(app);
+ app.getResourceSettings().setUseMinifiedResources(true);
+
+ return tester;
+ }
+
private boolean testResourceKey(ContextRelativeResourceReference resourceReference, String expectedName)
{
ContextRelativeResource resource = resourceReference.getResource();
http://git-wip-us.apache.org/repos/asf/wicket/blob/326d80b6/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java
index 5fd28dc..edcd96c 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/ResourceUtils.java
@@ -31,13 +31,14 @@ import org.apache.wicket.util.string.Strings;
*/
public class ResourceUtils
{
+ /** The default postfix for minified names (ex: /css/mystyle.min.css) **/
public static final String MIN_POSTFIX_DEFAULT = "min";
-
+ /** Regular expression patter to extract the locale from the filename (ex: de_DE) **/
private static final Pattern LOCALE_PATTERN = Pattern.compile("_([a-z]{2})(_([A-Z]{2})(_([^_]+))?)?$");
-
+ /** Stores standard ISO country codes from {@code java.util.Locale} **/
private final static Set<String> isoCountries = new HashSet<>(
Arrays.asList(Locale.getISOCountries()));
-
+ /** Stores standard ISO language codes from {@code java.util.Locale} **/
private final static Set<String> isoLanguages = new HashSet<>(
Arrays.asList(Locale.getISOLanguages()));