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 b3b7facb34..0b1f38a521 100644 --- a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java +++ b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java @@ -51,8 +51,6 @@ import java.io.OutputStream; import java.util.Collections; import java.util.List; -import javax.servlet.ServletContext; - /** * * @author Sebastian Sdorra @@ -71,17 +69,13 @@ public abstract class AbstractResource implements Resource /** * Constructs ... * - * - * @param servletContext * @param pluginLoader * @param resources * @param resourceHandlers */ - public AbstractResource(ServletContext servletContext, - PluginLoader pluginLoader, List resources, + public AbstractResource(PluginLoader pluginLoader, List resources, List resourceHandlers) { - this.servletContext = servletContext; this.pluginLoader = pluginLoader; this.resources = resources; this.resourceHandlers = resourceHandlers; @@ -207,15 +201,12 @@ public abstract class AbstractResource implements Resource //~--- fields --------------------------------------------------------------- + /** Field description */ + protected final List resourceHandlers; + + /** Field description */ + protected final List resources; + /** Field description */ private final PluginLoader pluginLoader; - - /** Field description */ - protected List resourceHandlers; - - /** Field description */ - protected List resources; - - /** Field description */ - private ServletContext servletContext; } diff --git a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java index 62bd145d37..1316d46dd1 100644 --- a/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java +++ b/scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java @@ -63,17 +63,12 @@ public abstract class AbstractResourceManager implements ResourceManager /** * Constructs ... * - * - * - * @param servletContext * @param pluginLoader * @param resourceHandlers */ - protected AbstractResourceManager(ServletContext servletContext, - PluginLoader pluginLoader, + protected AbstractResourceManager(PluginLoader pluginLoader, Set resourceHandlers) { - this.servletContext = servletContext; this.pluginLoader = pluginLoader; this.resourceHandlers = resourceHandlers; collectResources(resourceMap); diff --git a/scm-webapp/src/main/java/sonia/scm/resources/DefaultResource.java b/scm-webapp/src/main/java/sonia/scm/resources/DefaultResource.java index f88f6a407c..02b3a4db50 100644 --- a/scm-webapp/src/main/java/sonia/scm/resources/DefaultResource.java +++ b/scm-webapp/src/main/java/sonia/scm/resources/DefaultResource.java @@ -30,10 +30,12 @@ */ + package sonia.scm.resources; //~--- non-JDK imports -------------------------------------------------------- +import sonia.scm.plugin.PluginLoader; import sonia.scm.util.ChecksumUtil; import sonia.scm.util.IOUtil; @@ -45,33 +47,29 @@ import java.io.OutputStream; import java.util.List; -import javax.servlet.ServletContext; -import sonia.scm.plugin.PluginLoader; - /** * * @author Sebastian Sdorra */ -public class DefaultResource extends AbstractResource +public final class DefaultResource extends AbstractResource { /** * Constructs ... * * - * @param servletContext + * @param pluginLoader * @param resources * @param resourceHandlers * @param type * * @throws IOException */ - public DefaultResource(ServletContext servletContext, PluginLoader pluginLoader, List resources, - List resourceHandlers, - ResourceType type) - throws IOException + public DefaultResource(PluginLoader pluginLoader, List resources, + List resourceHandlers, ResourceType type) + throws IOException { - super(servletContext, pluginLoader, resources, resourceHandlers); + super(pluginLoader, resources, resourceHandlers); this.type = type; ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -134,11 +132,11 @@ public class DefaultResource extends AbstractResource //~--- fields --------------------------------------------------------------- /** Field description */ - private byte[] content; + private final byte[] content; /** Field description */ - private String name; + private final String name; /** Field description */ - private ResourceType type; + private final ResourceType type; } diff --git a/scm-webapp/src/main/java/sonia/scm/resources/DefaultResourceManager.java b/scm-webapp/src/main/java/sonia/scm/resources/DefaultResourceManager.java index 0570addf07..269e260190 100644 --- a/scm-webapp/src/main/java/sonia/scm/resources/DefaultResourceManager.java +++ b/scm-webapp/src/main/java/sonia/scm/resources/DefaultResourceManager.java @@ -52,9 +52,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.servlet.ServletContext; -import sonia.scm.Default; - /** * * @author Sebastian Sdorra @@ -74,16 +71,14 @@ public class DefaultResourceManager extends AbstractResourceManager /** * Constructs ... * - * - * @param servletContext * @param pluginLoader * @param resourceHandlers */ @Inject - public DefaultResourceManager(@Default ServletContext servletContext, - PluginLoader pluginLoader, Set resourceHandlers) + public DefaultResourceManager(PluginLoader pluginLoader, + Set resourceHandlers) { - super(servletContext, pluginLoader, resourceHandlers); + super(pluginLoader, resourceHandlers); } //~--- methods -------------------------------------------------------------- @@ -101,8 +96,8 @@ public class DefaultResourceManager extends AbstractResourceManager try { - Resource resource = new DefaultResource(servletContext, pluginLoader, - resources, Lists.newArrayList(resourceHandlers), + Resource resource = new DefaultResource(pluginLoader, resources, + Lists.newArrayList(resourceHandlers), ResourceType.SCRIPT); resourceMap.put(new ResourceKey(resource.getName(), ResourceType.SCRIPT), diff --git a/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResource.java b/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResource.java index 13184d9d17..a699c4fc23 100644 --- a/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResource.java +++ b/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResource.java @@ -45,32 +45,27 @@ import java.io.OutputStream; import java.util.List; -import javax.servlet.ServletContext; - /** * * @author Sebastian Sdorra */ -public class DevelopmentResource extends AbstractResource +public final class DevelopmentResource extends AbstractResource { /** * Constructs ... * * - * - * @param servletContext * @param pluginLoader * @param resources * @param resourceHandlers * @param name * @param type */ - public DevelopmentResource(ServletContext servletContext, - PluginLoader pluginLoader, List resources, + public DevelopmentResource(PluginLoader pluginLoader, List resources, List resourceHandlers, String name, ResourceType type) { - super(servletContext, pluginLoader, resources, resourceHandlers); + super(pluginLoader, resources, resourceHandlers); this.type = type; if (name.startsWith(HttpUtil.SEPARATOR_PATH)) @@ -133,8 +128,8 @@ public class DevelopmentResource extends AbstractResource //~--- fields --------------------------------------------------------------- /** Field description */ - private String name; + private final String name; /** Field description */ - private ResourceType type; + private final ResourceType type; } diff --git a/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java b/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java index c4382204d5..c378bb6dae 100644 --- a/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java +++ b/scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java @@ -38,7 +38,6 @@ package sonia.scm.resources; import com.google.inject.Inject; import com.google.inject.Singleton; -import sonia.scm.Default; import sonia.scm.plugin.PluginLoader; //~--- JDK imports ------------------------------------------------------------ @@ -49,8 +48,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import javax.servlet.ServletContext; - /** * * @author Sebastian Sdorra @@ -68,15 +65,14 @@ public class DevelopmentResourceManager extends AbstractResourceManager * Constructs ... * * - * @param servletContext * @param pluginLoader * @param resourceHandlers */ @Inject - public DevelopmentResourceManager(@Default ServletContext servletContext, - PluginLoader pluginLoader, Set resourceHandlers) + public DevelopmentResourceManager(PluginLoader pluginLoader, + Set resourceHandlers) { - super(servletContext, pluginLoader, resourceHandlers); + super(pluginLoader, resourceHandlers); } //~--- methods -------------------------------------------------------------- @@ -95,7 +91,7 @@ public class DevelopmentResourceManager extends AbstractResourceManager for (String script : scripts) { - Resource resource = new DevelopmentResource(servletContext, pluginLoader, + Resource resource = new DevelopmentResource(pluginLoader, Arrays.asList(script), Collections.EMPTY_LIST, script, ResourceType.SCRIPT); @@ -114,9 +110,8 @@ public class DevelopmentResourceManager extends AbstractResourceManager name = PREFIX_HANDLER.concat(name); resourceMap.put(new ResourceKey(name, ResourceType.SCRIPT), - new DevelopmentResource(servletContext, pluginLoader, - Collections.EMPTY_LIST, Arrays.asList(handler), name, - ResourceType.SCRIPT)); + new DevelopmentResource(pluginLoader, Collections.EMPTY_LIST, + Arrays.asList(handler), name, ResourceType.SCRIPT)); } } }