Add IOUtils.toString(URI) and IOUtils.toString(URI, String)

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/io/trunk@1091653 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

src/main/java/org/apache/commons/io/IOUtils.java

@@ -32,6 +32,7 @@
 import java.io.Reader;
 import java.io.Writer;
 import java.net.Socket;
+import java.net.URI;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -602,13 +603,42 @@ public static String toString(Reader input) throws IOException {
         return sw.toString();
     }
 
+    /**
+     * Gets the contents at the given URI.
+     * 
+     * @param uri
+     *            The URI source.
+     * @return The contents of the URL as a String.
+     * @throws IOException if an I/O exception occurs.
+     * @since 2.1.
+     */
+    public static String toString(URI uri) throws IOException {
+        return toString(uri, null);
+    }
+
+    /**
+     * Gets the contents at the given URI.
+     * 
+     * @param uri
+     *            The URI source.
+     * @param encoding
+     *            The encoding name for the URL contents.
+     * @return The contents of the URL as a String.
+     * @throws IOException if an I/O exception occurs.
+     * @since 2.1.
+     */
+    public static String toString(URI uri, String encoding) throws IOException {
+        return toString(uri.toURL(), encoding);
+    }
+
     /**
      * Gets the contents at the given URL.
      * 
      * @param url
      *            The URL source.
      * @return The contents of the URL as a String.
      * @throws IOException if an I/O exception occurs.
+     * @since 2.1.
      */
     public static String toString(URL url) throws IOException {
         return toString(url, null);
@@ -623,6 +653,7 @@ public static String toString(URL url) throws IOException {
      *            The encoding name for the URL contents.
      * @return The contents of the URL as a String.
      * @throws IOException if an I/O exception occurs.
+     * @since 2.1.
      */
     public static String toString(URL url, String encoding) throws IOException {
         InputStream inputStream = url.openStream();

src/test/java/org/apache/commons/io/IOUtilsTestCase.java

@@ -27,6 +27,7 @@
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.Reader;
+import java.net.URI;
 import java.net.URL;
 import java.util.Arrays;
 import java.util.List;
@@ -602,6 +603,36 @@ public void testSkipFileInput() throws Exception{
         }
     }
 
+    private void testURIToString(String encoding)
+            throws Exception
+    {
+        URI url = m_testFile.toURI();
+        String out = IOUtils.toString(url, encoding);
+        assertNotNull(out);
+        assertEquals("Wrong output size", FILE_SIZE, out.length());
+    }
+
+    public void testURIToStringNoEncoding()
+            throws Exception
+    {
+        URI url = m_testFile.toURI();
+        String out = IOUtils.toString(url);
+        assertNotNull(out);
+        assertEquals("Wrong output size", FILE_SIZE, out.length());
+    }
+
+    public void testURIToStringNullEncoding()
+            throws Exception
+    {
+        testURIToString(null);
+    }
+
+    public void testURIToStringUsAciiEncoding()
+            throws Exception
+    {
+        testURIToString("US-ASCII");
+    }
+
     private void testURLToString(String encoding)
             throws Exception
     {