#1 Reduce debug logging when hitting a MalformedURL

Don't pass exception, is causes very weird RNFE-messages.

Author: Robert Scholte

pom.xml

@@ -30,5 +30,13 @@
       <groupId>org.codehaus.plexus</groupId>
       <artifactId>plexus-container-default</artifactId>
     </dependency>
+    
+    <!-- TEST -->
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>1.9.5</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

src/main/java/org/codehaus/plexus/resource/loader/URLResourceLoader.java

@@ -26,6 +26,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -60,8 +61,6 @@ public PlexusResource getResource( String name )
             throw new ResourceNotFoundException( "URLResourceLoader : No template name provided" );
         }
 
-        Exception exception = null;
-
         for ( Iterator i = paths.iterator(); i.hasNext(); )
         {
             String path = (String) i.next();
@@ -99,6 +98,13 @@ public synchronized InputStream getInputStream()
                     };
                 }
             }
+            catch( MalformedURLException mue )
+            {
+                if ( getLogger().isDebugEnabled() )
+                {
+                    getLogger().debug( "URLResourceLoader: No valid URL '" + path + name + '\'' );
+                }
+            }
             catch ( IOException ioe )
             {
                 if ( getLogger().isDebugEnabled() )
@@ -107,17 +113,10 @@ public synchronized InputStream getInputStream()
                                        "URLResourceLoader: Exception when looking for '" + name + "' at '" + path + "'",
                                        ioe );
                 }
-
-                // only save the first one for later throwing
-                if ( exception == null )
-                {
-                    exception = ioe;
-                }
             }
         }
 
         // here we try to download without any path just the name which can be an url
-        
         try
         {
             URL u = new URL( name );
@@ -143,31 +142,22 @@ public synchronized InputStream getInputStream()
                 };
             }
         }
-        catch ( IOException ioe )
+        catch( MalformedURLException mue )
         {
             if ( getLogger().isDebugEnabled() )
             {
-                getLogger().debug( "URLResourceLoader: Exception when looking for '" + name, ioe );
+                getLogger().debug( "URLResourceLoader: No valid URL '" + name + '\'' );
             }
-
-            // only save the first one for later throwing
-            if ( exception == null )
+        }
+        catch ( IOException ioe )
+        {
+            if ( getLogger().isDebugEnabled() )
             {
-                exception = ioe;
+                getLogger().debug( "URLResourceLoader: Exception when looking for '" + name + '\'', ioe );
             }
-        }
+       }
 
-        // if we never found the template
-        String msg;
-        if ( exception == null )
-        {
-            msg = "URLResourceLoader : Resource '" + name + "' not found.";
-        }
-        else
-        {
-            msg = exception.getMessage();
-        }
         // convert to a general Velocity ResourceNotFoundException
-        throw new ResourceNotFoundException( msg );
+        throw new ResourceNotFoundException( name );
     }
 }

src/test/java/org/codehaus/plexus/resource/loader/URLResourceLoaderTest.java

@@ -0,0 +1,48 @@
+package org.codehaus.plexus.resource.loader;
+
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoMoreInteractions;
+import junit.framework.TestCase;
+
+import org.codehaus.plexus.logging.Logger;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+public class URLResourceLoaderTest
+    extends TestCase
+{
+    @Mock
+    private Logger logger;
+
+    @InjectMocks
+    private ResourceLoader resourceLoader = new URLResourceLoader();
+
+    @Override
+    protected void setUp()
+        throws Exception
+    {
+        MockitoAnnotations.initMocks( this );
+    }
+
+    public void testMalformedURL()
+        throws Exception
+    {
+        when( logger.isDebugEnabled() ).thenReturn( true );
+
+        try
+        {
+            resourceLoader.getResource( "LICENSE.txt" );
+            fail();
+        }
+        catch ( ResourceNotFoundException e )
+        {
+            verify( logger ).isDebugEnabled();
+            verify( logger ).debug( "URLResourceLoader: No valid URL 'LICENSE.txt'" );
+            verifyNoMoreInteractions( logger );
+            assertEquals( "Could not find resource 'LICENSE.txt'.", e.getMessage() );
+        }
+
+    }
+}