From 63ab9e070111478c2662f3ac56f40dc09be4fe44 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Fri, 10 Oct 2014 20:30:56 +0200
Subject: [PATCH] resource loader should use url instead of inputstream

---
 .../sonia/scm/resources/ResourceHandler.java  |  4 +-
 .../ResourceHandlerComparatorTest.java        |  4 +-
 .../sonia/scm/resources/AbstractResource.java | 63 ++++++++++---------
 3 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/resources/ResourceHandler.java b/scm-core/src/main/java/sonia/scm/resources/ResourceHandler.java
index fcc4bf149f..f48f0d71fd 100644
--- a/scm-core/src/main/java/sonia/scm/resources/ResourceHandler.java
+++ b/scm-core/src/main/java/sonia/scm/resources/ResourceHandler.java
@@ -39,7 +39,7 @@ import sonia.scm.plugin.ExtensionPoint;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import java.io.InputStream;
+import java.net.URL;
 
 /**
  *
@@ -63,7 +63,7 @@ public interface ResourceHandler
    *
    * @return
    */
-  public InputStream getResource();
+  public URL getResource();
 
   /**
    * Method description
diff --git a/scm-core/src/test/java/sonia/scm/resources/ResourceHandlerComparatorTest.java b/scm-core/src/test/java/sonia/scm/resources/ResourceHandlerComparatorTest.java
index 8f3eb8901a..2573a6ec08 100644
--- a/scm-core/src/test/java/sonia/scm/resources/ResourceHandlerComparatorTest.java
+++ b/scm-core/src/test/java/sonia/scm/resources/ResourceHandlerComparatorTest.java
@@ -41,7 +41,7 @@ import static org.junit.Assert.*;
 
 //~--- JDK imports ------------------------------------------------------------
 
-import java.io.InputStream;
+import java.net.URL;
 
 import java.util.Arrays;
 
@@ -116,7 +116,7 @@ public class ResourceHandlerComparatorTest
      * @return
      */
     @Override
-    public InputStream getResource()
+    public URL getResource()
     {
       throw new UnsupportedOperationException("Not supported yet.");
     }
diff --git a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java
index 0b1f38a521..d5b21befe6 100644
--- a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java
+++ b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java
@@ -35,19 +35,21 @@ package sonia.scm.resources;
 
 //~--- non-JDK imports --------------------------------------------------------
 
+import com.google.common.io.Resources;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sonia.scm.plugin.PluginLoader;
-import sonia.scm.util.IOUtil;
 import sonia.scm.util.Util;
 
 //~--- JDK imports ------------------------------------------------------------
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.io.OutputStream;
 
+import java.net.URL;
+
 import java.util.Collections;
 import java.util.List;
 
@@ -107,10 +109,7 @@ public abstract class AbstractResource implements Resource
 
       for (ResourceHandler resourceHandler : resourceHandlers)
       {
-        if (resourceHandler.getType() == ResourceType.SCRIPT)
-        {
-          appendResource(resourceHandler.getResource(), stream);
-        }
+        processResourceHandler(stream, resourceHandler);
       }
     }
   }
@@ -120,22 +119,22 @@ public abstract class AbstractResource implements Resource
    *
    *
    * @param stream
-   * @param resource
+   * @param path
    *
    * @throws IOException
    */
-  private void appendResource(OutputStream stream, String resource)
+  private void appendResource(OutputStream stream, String path)
     throws IOException
   {
-    InputStream input = getResourceAsStream(resource);
+    URL resource = getResourceAsURL(path);
 
-    if (input != null)
+    if (resource != null)
     {
-      appendResource(input, stream);
+      Resources.copy(resource, stream);
     }
     else if (logger.isWarnEnabled())
     {
-      logger.warn("could not find resource {}", resource);
+      logger.warn("could not find resource {}", path);
     }
   }
 
@@ -143,23 +142,32 @@ public abstract class AbstractResource implements Resource
    * Method description
    *
    *
-   * @param input
    * @param stream
+   * @param resourceHandler
    *
    * @throws IOException
    */
-  private void appendResource(InputStream input, OutputStream stream)
+  private void processResourceHandler(OutputStream stream,
+    ResourceHandler resourceHandler)
     throws IOException
   {
-    if (input != null)
+    if (resourceHandler.getType() == getType())
     {
-      try
+      if (logger.isTraceEnabled())
       {
-        IOUtil.copy(input, stream);
+        logger.trace("process resource handler {}", resourceHandler.getClass());
       }
-      finally
+
+      URL resource = resourceHandler.getResource();
+
+      if (resource != null)
       {
-        IOUtil.close(input);
+        Resources.copy(resource, stream);
+      }
+      else if (logger.isDebugEnabled())
+      {
+        logger.debug("resource handler {} does not return a resource",
+          resourceHandler.getClass());
       }
     }
   }
@@ -170,33 +178,28 @@ public abstract class AbstractResource implements Resource
    * Method description
    *
    *
-   * @param resource
+   * @param path
    *
    * @return
    */
-  private InputStream getResourceAsStream(String resource)
+  private URL getResourceAsURL(String path)
   {
-    InputStream input = null;
+    URL resource = null;
     ClassLoader classLoader = pluginLoader.getUberClassLoader();
 
     if (classLoader != null)
     {
-      String classLoaderResource = resource;
+      String classLoaderResource = path;
 
       if (classLoaderResource.startsWith("/"))
       {
         classLoaderResource = classLoaderResource.substring(1);
       }
 
-      input = classLoader.getResourceAsStream(classLoaderResource);
+      resource = classLoader.getResource(classLoaderResource);
     }
 
-    if (input == null)
-    {
-      input = ScriptResourceServlet.class.getResourceAsStream(resource);
-    }
-
-    return input;
+    return resource;
   }
 
   //~--- fields ---------------------------------------------------------------