WICKET-4312 Do not strip the jsessionid from the url for resources Minor improvements - check for valid input, make the items fully immutable
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/95ed0553 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/95ed0553 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/95ed0553 Branch: refs/heads/master Commit: 95ed0553bfca5bdf73fd287612836527d5694269 Parents: 38e928c Author: martin-g <[email protected]> Authored: Thu Dec 22 13:33:42 2011 +0200 Committer: martin-g <[email protected]> Committed: Thu Dec 22 13:33:42 2011 +0200 ---------------------------------------------------------------------- .../resource/header/CssContentHeaderItem.java | 10 +++++----- .../resource/header/CssReferenceHeaderItem.java | 8 ++++---- .../resource/header/CssUrlReferenceHeaderItem.java | 6 +++--- .../header/JavaScriptContentHeaderItem.java | 4 ++-- .../header/JavaScriptReferenceHeaderItem.java | 10 +++++----- .../header/JavaScriptUrlReferenceHeaderItem.java | 8 ++++---- .../resource/header/OnDomReadyHeaderItem.java | 5 +++-- .../wicket/resource/header/OnEventHeaderItem.java | 13 +++++++------ .../wicket/resource/header/OnLoadHeaderItem.java | 5 +++-- .../wicket/resource/header/StringHeaderItem.java | 5 +++-- 10 files changed, 39 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/95ed0553/wicket-core/src/main/java/org/apache/wicket/resource/header/CssContentHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/header/CssContentHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/resource/header/CssContentHeaderItem.java index 377e9b5..92d3a77 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/header/CssContentHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/header/CssContentHeaderItem.java @@ -16,13 +16,13 @@ */ package org.apache.wicket.resource.header; -import java.util.Arrays; -import java.util.Collections; - import org.apache.wicket.request.Response; import org.apache.wicket.util.string.CssUtils; import org.apache.wicket.util.string.Strings; +import java.util.Arrays; +import java.util.Collections; + /** * {@link HeaderItem} for internal (embedded in the header) css content. * @@ -30,8 +30,8 @@ import org.apache.wicket.util.string.Strings; */ public class CssContentHeaderItem extends CssHeaderItem { - private CharSequence css; - private String id; + private final CharSequence css; + private final String id; /** * Creates a new {@code CSSContentHeaderItem}. http://git-wip-us.apache.org/repos/asf/wicket/blob/95ed0553/wicket-core/src/main/java/org/apache/wicket/resource/header/CssReferenceHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/header/CssReferenceHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/resource/header/CssReferenceHeaderItem.java index 1415b5d..a08042f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/header/CssReferenceHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/header/CssReferenceHeaderItem.java @@ -34,10 +34,10 @@ import org.apache.wicket.util.string.Strings; */ public class CssReferenceHeaderItem extends CssHeaderItem implements IReferenceHeaderItem { - private ResourceReference reference; - private String media; - private PageParameters pageParameters; - private String condition; + private final ResourceReference reference; + private final String media; + private final PageParameters pageParameters; + private final String condition; /** * Creates a new {@code CSSReferenceHeaderItem}. http://git-wip-us.apache.org/repos/asf/wicket/blob/95ed0553/wicket-core/src/main/java/org/apache/wicket/resource/header/CssUrlReferenceHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/header/CssUrlReferenceHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/resource/header/CssUrlReferenceHeaderItem.java index 417da21..6a56bae 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/header/CssUrlReferenceHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/header/CssUrlReferenceHeaderItem.java @@ -30,9 +30,9 @@ import org.apache.wicket.util.string.UrlUtils; */ public class CssUrlReferenceHeaderItem extends CssHeaderItem { - private String url; - private String media; - private String condition; + private final String url; + private final String media; + private final String condition; /** * Creates a new {@code CSSUrlReferenceHeaderItem}. http://git-wip-us.apache.org/repos/asf/wicket/blob/95ed0553/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptContentHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptContentHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptContentHeaderItem.java index cc16a29..7f7d50f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptContentHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptContentHeaderItem.java @@ -30,8 +30,8 @@ import org.apache.wicket.util.string.Strings; */ public class JavaScriptContentHeaderItem extends JavaScriptHeaderItem { - private CharSequence javaScript; - private String id; + private final CharSequence javaScript; + private final String id; /** * Creates a new {@code JavaScriptContentHeaderItem}. http://git-wip-us.apache.org/repos/asf/wicket/blob/95ed0553/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptReferenceHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptReferenceHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptReferenceHeaderItem.java index 4c16241..20c99bd 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptReferenceHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptReferenceHeaderItem.java @@ -37,11 +37,11 @@ public class JavaScriptReferenceHeaderItem extends JavaScriptHeaderItem implements IReferenceHeaderItem { - private ResourceReference reference; - private String id; - private PageParameters pageParameters; - private boolean defer; - private String charset; + private final ResourceReference reference; + private final String id; + private final PageParameters pageParameters; + private final boolean defer; + private final String charset; /** * Creates a new {@code JavaScriptReferenceHeaderItem}. http://git-wip-us.apache.org/repos/asf/wicket/blob/95ed0553/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptUrlReferenceHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptUrlReferenceHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptUrlReferenceHeaderItem.java index aec65d1..fd45fc0 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptUrlReferenceHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/header/JavaScriptUrlReferenceHeaderItem.java @@ -32,10 +32,10 @@ import org.apache.wicket.util.string.UrlUtils; */ public class JavaScriptUrlReferenceHeaderItem extends JavaScriptHeaderItem { - private String url; - private String id; - private boolean defer; - private String charset; + private final String url; + private final String id; + private final boolean defer; + private final String charset; /** * Creates a new {@code JavaScriptUrlReferenceHeaderItem}. http://git-wip-us.apache.org/repos/asf/wicket/blob/95ed0553/wicket-core/src/main/java/org/apache/wicket/resource/header/OnDomReadyHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/header/OnDomReadyHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/resource/header/OnDomReadyHeaderItem.java index 5b5aeb7..6dab8fd 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/header/OnDomReadyHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/header/OnDomReadyHeaderItem.java @@ -22,6 +22,7 @@ import org.apache.wicket.Application; import org.apache.wicket.request.Response; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.settings.IJavaScriptLibrarySettings; +import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.JavaScriptUtils; /** @@ -45,7 +46,7 @@ public class OnDomReadyHeaderItem extends HeaderItem return new OnDomReadyHeaderItem(javaScript); } - private CharSequence javaScript; + private final CharSequence javaScript; /** * Construct. @@ -54,7 +55,7 @@ public class OnDomReadyHeaderItem extends HeaderItem */ public OnDomReadyHeaderItem(CharSequence javaScript) { - this.javaScript = javaScript; + this.javaScript = Args.notEmpty(javaScript, "javaScript"); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/95ed0553/wicket-core/src/main/java/org/apache/wicket/resource/header/OnEventHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/header/OnEventHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/resource/header/OnEventHeaderItem.java index 466ae7e..7f5c408 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/header/OnEventHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/header/OnEventHeaderItem.java @@ -22,6 +22,7 @@ import org.apache.wicket.Application; import org.apache.wicket.request.Response; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.settings.IJavaScriptLibrarySettings; +import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.JavaScriptUtils; /** @@ -48,9 +49,9 @@ public class OnEventHeaderItem extends HeaderItem return new OnEventHeaderItem(target, event, javaScript); } - private String target; - private String event; - private CharSequence javaScript; + private final String target; + private final String event; + private final CharSequence javaScript; /** * Construct. @@ -61,9 +62,9 @@ public class OnEventHeaderItem extends HeaderItem */ public OnEventHeaderItem(String target, String event, CharSequence javaScript) { - this.target = target; - this.event = event; - this.javaScript = javaScript; + this.target = Args.notEmpty(target, "target"); + this.event = Args.notEmpty(event, "event"); + this.javaScript = Args.notEmpty(javaScript, "javaScript"); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/95ed0553/wicket-core/src/main/java/org/apache/wicket/resource/header/OnLoadHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/header/OnLoadHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/resource/header/OnLoadHeaderItem.java index bcf25ae..470db60 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/header/OnLoadHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/header/OnLoadHeaderItem.java @@ -22,6 +22,7 @@ import org.apache.wicket.Application; import org.apache.wicket.request.Response; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.settings.IJavaScriptLibrarySettings; +import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.JavaScriptUtils; /** @@ -44,7 +45,7 @@ public class OnLoadHeaderItem extends HeaderItem return new OnLoadHeaderItem(javaScript); } - private CharSequence javaScript; + private final CharSequence javaScript; /** * Construct. @@ -53,7 +54,7 @@ public class OnLoadHeaderItem extends HeaderItem */ public OnLoadHeaderItem(CharSequence javaScript) { - this.javaScript = javaScript; + this.javaScript = Args.notEmpty(javaScript, "javaScript"); } /** http://git-wip-us.apache.org/repos/asf/wicket/blob/95ed0553/wicket-core/src/main/java/org/apache/wicket/resource/header/StringHeaderItem.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/header/StringHeaderItem.java b/wicket-core/src/main/java/org/apache/wicket/resource/header/StringHeaderItem.java index 3e8ab0d..c36d22b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/header/StringHeaderItem.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/header/StringHeaderItem.java @@ -19,6 +19,7 @@ package org.apache.wicket.resource.header; import java.util.Collections; import org.apache.wicket.request.Response; +import org.apache.wicket.util.lang.Args; /** * Free form {@code HeaderItem}. No checks are performed on what is added to the header. @@ -40,7 +41,7 @@ public class StringHeaderItem extends HeaderItem return new StringHeaderItem(string); } - private CharSequence string; + private final CharSequence string; /** * Construct. @@ -49,7 +50,7 @@ public class StringHeaderItem extends HeaderItem */ public StringHeaderItem(CharSequence string) { - this.string = string; + this.string = Args.notEmpty(string, "string"); } /**
