Repository: deltaspike Updated Branches: refs/heads/master 0b8924f75 -> 595a53f44
DELTASPIKE-963 refactored Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/595a53f4 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/595a53f4 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/595a53f4 Branch: refs/heads/master Commit: 595a53f4424d0edb6f356a7f155c25910f53c7fc Parents: 0b8924f Author: Thomas Andraschko <[email protected]> Authored: Wed Jul 22 21:28:28 2015 +0200 Committer: Thomas Andraschko <[email protected]> Committed: Wed Jul 22 21:28:28 2015 +0200 ---------------------------------------------------------------------- .../deltaspike/jsf/impl/util/JsfUtils.java | 83 ++++++-------------- 1 file changed, 26 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/595a53f4/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java index 9b6a0d7..b69abae 100644 --- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java +++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/util/JsfUtils.java @@ -118,25 +118,7 @@ public abstract class JsfUtils finalUrl.append("&"); } - if (encodeValues) - { - finalUrl.append(JsfUtils.encodeURLParameterValue(key, externalContext)); - } - else - { - finalUrl.append(key); - } - - finalUrl.append("="); - - if (encodeValues) - { - finalUrl.append(JsfUtils.encodeURLParameterValue(parameterValue, externalContext)); - } - else - { - finalUrl.append(parameterValue); - } + appendUrlParameter(finalUrl, key, parameterValue, encodeValues, externalContext); } } } @@ -175,25 +157,7 @@ public abstract class JsfUtils finalUrl.append("?"); } - if (encodeValues) - { - finalUrl.append(JsfUtils.encodeURLParameterValue(name, externalContext)); - } - else - { - finalUrl.append(name); - } - - finalUrl.append("="); - - if (encodeValues) - { - finalUrl.append(JsfUtils.encodeURLParameterValue(value, externalContext)); - } - else - { - finalUrl.append(value); - } + appendUrlParameter(finalUrl, name, value, encodeValues, externalContext); return finalUrl.toString(); } @@ -233,25 +197,7 @@ public abstract class JsfUtils finalUrl.append("&"); } - if (encodeValues) - { - finalUrl.append(JsfUtils.encodeURLParameterValue(entry.getKey(), externalContext)); - } - else - { - finalUrl.append(entry.getKey()); - } - - finalUrl.append("="); - - if (encodeValues) - { - finalUrl.append(JsfUtils.encodeURLParameterValue(value, externalContext)); - } - else - { - finalUrl.append(value); - } + appendUrlParameter(finalUrl, entry.getKey(), value, encodeValues, externalContext); } } } @@ -259,6 +205,29 @@ public abstract class JsfUtils return finalUrl.toString(); } + protected static void appendUrlParameter(StringBuilder url, String name, String value, boolean encode, ExternalContext externalContext) + { + if (encode) + { + url.append(encodeURLParameterValue(name, externalContext)); + } + else + { + url.append(name); + } + + url.append("="); + + if (encode) + { + url.append(encodeURLParameterValue(value, externalContext)); + } + else + { + url.append(value); + } + } + /** * Encodes the given value using URLEncoder.encode() with the charset returned * from ExternalContext.getResponseCharacterEncoding().
