[java-opensaml COMMIT] in /trunk/opensaml-util/src: main/java/org/opensaml/util/net/UrlBuilder.java test/java/org/ope...

[noreply at shibboleth.net]

Author: putmanb
Date: Wed Jan 30 15:17:37 2013
New Revision: 3184

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3184&view=rev
Log:
Change UrlBuilder to throw original java.net.URL MalformedURLException on construction.

Modified:
    trunk/opensaml-util/src/main/java/org/opensaml/util/net/UrlBuilder.java
    trunk/opensaml-util/src/test/java/org/opensaml/util/net/UrlBuilderTest.java

Modified: trunk/opensaml-util/src/main/java/org/opensaml/util/net/UrlBuilder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-util/src/main/java/org/opensaml/util/net/UrlBuilder.java?rev=3184&r1=3183&r2=3184&view=diff
==============================================================================
--- trunk/opensaml-util/src/main/java/org/opensaml/util/net/UrlBuilder.java (original)
+++ trunk/opensaml-util/src/main/java/org/opensaml/util/net/UrlBuilder.java Wed Jan 30 15:17:37 2013
@@ -72,55 +72,52 @@
      * 
      * @param baseURL URL to parse and use as basis for creating other URLs
      * 
-     * @throws IllegalArgumentException thrown if the given base URL is not well formed
-     */
-    public UrlBuilder(String baseURL) {
-        try {
-            URL url = new URL(baseURL);
-
-            setScheme(url.getProtocol());
-
-            String userInfo = url.getUserInfo();
-            if (!Strings.isNullOrEmpty(userInfo)) {
-                if (userInfo.contains(":")) {
-                    String[] userInfoComps = userInfo.split(":");
-                    setUsername(UriSupport.urlDecode(userInfoComps[0]));
-                    setPassword(UriSupport.urlDecode(userInfoComps[1]));
+     * @throws MalformedURLException thrown if the given base URL is not well formed
+     * 
+     */
+    public UrlBuilder(String baseURL) throws MalformedURLException {
+        URL url = new URL(baseURL);
+        
+        setScheme(url.getProtocol());
+        
+        String userInfo = url.getUserInfo();
+        if (!Strings.isNullOrEmpty(userInfo)) {
+            if (userInfo.contains(":")) {
+                String[] userInfoComps = userInfo.split(":");
+                setUsername(UriSupport.urlDecode(userInfoComps[0]));
+                setPassword(UriSupport.urlDecode(userInfoComps[1]));
+            } else {
+                setUsername(userInfo);
+            }
+        }
+        
+        setHost(url.getHost());
+        setPort(url.getPort());
+        setPath(url.getPath());
+        
+        queryParams = new ArrayList<Pair<String, String>>();
+        String queryString = url.getQuery();
+        if (!Strings.isNullOrEmpty(queryString)) {
+            String[] queryComps = queryString.split("&");
+            String queryComp;
+            String[] paramComps;
+            String paramName;
+            String paramValue;
+            for (int i = 0; i < queryComps.length; i++) {
+                queryComp = queryComps[i];
+                if (!queryComp.contains("=")) {
+                    paramName = UriSupport.urlDecode(queryComp);
+                    queryParams.add(new Pair<String, String>(paramName, null));
                 } else {
-                    setUsername(userInfo);
+                    paramComps = queryComp.split("=");
+                    paramName = UriSupport.urlDecode(paramComps[0]);
+                    paramValue = UriSupport.urlDecode(paramComps[1]);
+                    queryParams.add(new Pair<String, String>(paramName, paramValue));
                 }
             }
-
-            setHost(url.getHost());
-            setPort(url.getPort());
-            setPath(url.getPath());
-
-            queryParams = new ArrayList<Pair<String, String>>();
-            String queryString = url.getQuery();
-            if (!Strings.isNullOrEmpty(queryString)) {
-                String[] queryComps = queryString.split("&");
-                String queryComp;
-                String[] paramComps;
-                String paramName;
-                String paramValue;
-                for (int i = 0; i < queryComps.length; i++) {
-                    queryComp = queryComps[i];
-                    if (!queryComp.contains("=")) {
-                        paramName = UriSupport.urlDecode(queryComp);
-                        queryParams.add(new Pair<String, String>(paramName, null));
-                    } else {
-                        paramComps = queryComp.split("=");
-                        paramName = UriSupport.urlDecode(paramComps[0]);
-                        paramValue = UriSupport.urlDecode(paramComps[1]);
-                        queryParams.add(new Pair<String, String>(paramName, paramValue));
-                    }
-                }
-            }
-
-            setFragment(url.getRef());
-        } catch (MalformedURLException e) {
-            throw new IllegalArgumentException("Given URL is not well formed", e);
-        }
+        }
+        
+        setFragment(url.getRef());
     }
 
     /**

Modified: trunk/opensaml-util/src/test/java/org/opensaml/util/net/UrlBuilderTest.java

[... 98 lines stripped ...]