Return-Path: Delivered-To: apmail-incubator-abdera-commits-archive@locus.apache.org Received: (qmail 50752 invoked from network); 25 May 2007 19:45:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 25 May 2007 19:45:45 -0000 Received: (qmail 59546 invoked by uid 500); 25 May 2007 19:45:50 -0000 Delivered-To: apmail-incubator-abdera-commits-archive@incubator.apache.org Received: (qmail 59514 invoked by uid 500); 25 May 2007 19:45:50 -0000 Mailing-List: contact abdera-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: abdera-dev@incubator.apache.org Delivered-To: mailing list abdera-commits@incubator.apache.org Received: (qmail 59505 invoked by uid 99); 25 May 2007 19:45:50 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2007 12:45:50 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 May 2007 12:45:44 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 559C21A981C; Fri, 25 May 2007 12:45:24 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r541758 - /incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/EncodingUtil.java Date: Fri, 25 May 2007 19:45:24 -0000 To: abdera-commits@incubator.apache.org From: jmsnell@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070525194524.559C21A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jmsnell Date: Fri May 25 12:45:23 2007 New Revision: 541758 URL: http://svn.apache.org/viewvc?view=rev&rev=541758 Log: Allow callers to pass in their own regex pattern for the santize function. Modified: incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/EncodingUtil.java Modified: incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/EncodingUtil.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/EncodingUtil.java?view=diff&rev=541758&r1=541757&r2=541758 ============================================================================== --- incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/EncodingUtil.java (original) +++ incubator/abdera/java/trunk/protocol/src/main/java/org/apache/abdera/protocol/util/EncodingUtil.java Fri May 25 12:45:23 2007 @@ -34,16 +34,34 @@ public class EncodingUtil { + public static final String SANITIZE_PATTERN = "[^A-Za-z0-9\\%!$&\\\\'()*+,;=]"; + public static String sanitize(String slug) { - return sanitize(slug, null, false, null); + return sanitize(slug, null, false, null, SANITIZE_PATTERN); } public static String sanitize(String slug, String filler) { - return sanitize(slug, filler, false, null); + return sanitize(slug, filler, false, null, SANITIZE_PATTERN); } public static String sanitize(String slug, String filler, boolean lower) { - return sanitize(slug, filler, lower, null); + return sanitize(slug, filler, lower, null, SANITIZE_PATTERN); + } + + public static String sanitize(String slug, String filler, String pattern) { + return sanitize(slug, filler, false, null, pattern); + } + + public static String sanitize(String slug, String filler, boolean lower, String pattern) { + return sanitize(slug, filler, lower, null, pattern); + } + + public static String sanitize( + String slug, + String filler, + boolean lower, + Normalizer.Form form) { + return sanitize(slug,filler,lower,form,SANITIZE_PATTERN); } /** @@ -59,7 +77,8 @@ String slug, String filler, boolean lower, - Normalizer.Form form) { + Normalizer.Form form, + String pattern) { if (slug == null) return null; if (lower) slug = slug.toLowerCase(); if (form != null) { @@ -73,7 +92,7 @@ slug = Escaping.encode(slug, Constants.PATH); } if (filler != null) { - slug = slug.replaceAll("[^A-Za-z0-9\\%!$&\\\\'()*+,;=]",filler); + slug = slug.replaceAll(pattern,filler); } else { slug = Escaping.encode(slug, Constants.PATHNODELIMS); }