svn commit: r1604570 - in /jena/trunk/jena-arq/src: main/java/org/apache/jena/riot/lang/LangCSV.java test/java/org/apache/jena/riot/lang/TestLangCSV.java

[jpz6311whu]

Author: jpz6311whu
Date: Sun Jun 22 13:17:52 2014
New Revision: 1604570

URL: http://svn.apache.org/r1604570
Log:
JENA-625: change to IRILib.encodeUriComponent(String) for URI encoding

Modified:
    jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java
    jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangCSV.java

Modified: 
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java?rev=1604570&r1=1604569&r2=1604570&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java 
(original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/lang/LangCSV.java 
Sun Jun 22 13:17:52 2014
@@ -29,6 +29,7 @@ import org.apache.jena.atlas.csv.CSVPars
 import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.RDFLanguages;
 import org.apache.jena.riot.system.ErrorHandler;
+import org.apache.jena.riot.system.IRILib;
 import org.apache.jena.riot.system.IRIResolver;
 import org.apache.jena.riot.system.ParserProfile;
 import org.apache.jena.riot.system.RiotLib;
@@ -140,21 +141,7 @@ public class LangCSV implements LangRIOT
        }
        
        public static String encodeURIComponent(String s) {
-           String result;
-
-           try {
-               result = URLEncoder.encode(s, "UTF-8")
-                       .replaceAll("\\+", "%20")
-                       .replaceAll("\\%21", "!")
-                       .replaceAll("\\%27", "'")
-                       .replaceAll("\\%28", "(")
-                       .replaceAll("\\%29", ")")
-                       .replaceAll("\\%7E", "~");
-           } catch (UnsupportedEncodingException e) {
-               result = s;
-           }
-
-           return result;
+           return IRILib.encodeUriComponent(s);
        }
        
        public static Node caculateSubject(int rowNum, String filename){

Modified: 
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangCSV.java
URL: 
http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangCSV.java?rev=1604570&r1=1604569&r2=1604570&view=diff
==============================================================================
--- 
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangCSV.java 
(original)
+++ 
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangCSV.java 
Sun Jun 22 13:17:52 2014
@@ -50,7 +50,7 @@ public class TestLangCSV extends BaseTes
                String[] s1 = { "`~!@#$%^&*()-_=+[{]}|\\;:'\"<.>/?", 
"NonURICharacters" };
                String[] s2 = {
                                //"<"+ LangCSV.caculateSubject(1, FILE_NAME) + 
"> <" + FILE_URI + 
"#%60%7E%21%40%23%24%25%5E%26*%28%29-_%3D%2B%5B%7B%5D%7D%7C%5C%3B%3A%27%22%3C.%3E%2F%3F>
 'NonURICharacters' ; ",
-                               " [] <" + FILE_URI + 
"#%60~!%40%23%24%25%5E%26*()-_%3D%2B%5B%7B%5D%7D%7C%5C%3B%3A'%22%3C.%3E%2F%3F> 
'NonURICharacters' ; ",
+                               " [] <" + FILE_URI + 
"#%60~%21%40%23%24%25%5E%26%2A%28%29-_%3D%2B%5B%7B%5D%7D%7C%5C%3B%3A%27%22%3C.%3E%2F%3F>
 'NonURICharacters' ; ",
                                " <http://w3c/future-csv-vocab/row> 1 ." };
                assertIsomorphicWith(s1, s2);
        }