Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 15:05:44 +01:00
Code Issues Packages Projects Releases Activity

remove unused dependency to ServletContext

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-10-10 20:19:10 +02:00
parent ab79c4622a
commit 7f38d40cfb
6 changed files with 35 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scm-webapp/src/main/java/sonia/scm/resources/AbstractResource.java
View File

@@ -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<String> resources,
public AbstractResource(PluginLoader pluginLoader, List<String> resources,
List<ResourceHandler> 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<ResourceHandler> resourceHandlers;
/** Field description */
protected final List<String> resources;
/** Field description */
private final PluginLoader pluginLoader;
/** Field description */
protected List<ResourceHandler> resourceHandlers;
/** Field description */
protected List<String> resources;
/** Field description */
private ServletContext servletContext;
}

7
scm-webapp/src/main/java/sonia/scm/resources/AbstractResourceManager.java
View File

@@ -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<ResourceHandler> resourceHandlers)
{
this.servletContext = servletContext;
this.pluginLoader = pluginLoader;
this.resourceHandlers = resourceHandlers;
collectResources(resourceMap);

24
scm-webapp/src/main/java/sonia/scm/resources/DefaultResource.java
View File

@@ -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<String> resources,
List<ResourceHandler> resourceHandlers,
ResourceType type)
throws IOException
public DefaultResource(PluginLoader pluginLoader, List<String> resources,
List<ResourceHandler> 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;
}

15
scm-webapp/src/main/java/sonia/scm/resources/DefaultResourceManager.java
View File

@@ -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<ResourceHandler> resourceHandlers)
public DefaultResourceManager(PluginLoader pluginLoader,
Set<ResourceHandler> 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),

15
scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResource.java
View File

@@ -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<String> resources,
public DevelopmentResource(PluginLoader pluginLoader, List<String> resources,
List<ResourceHandler> 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;
}

17
scm-webapp/src/main/java/sonia/scm/resources/DevelopmentResourceManager.java
View File

@@ -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<ResourceHandler> resourceHandlers)
public DevelopmentResourceManager(PluginLoader pluginLoader,
Set<ResourceHandler> 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));
}
}
}