diff --git a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java index 4108a7634f..82b75a15ea 100644 --- a/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java +++ b/scm-webapp/src/main/java/sonia/scm/api/v2/resources/ContentResource.java @@ -27,17 +27,17 @@ public class ContentResource { private static final Logger LOG = LoggerFactory.getLogger(ContentResource.class); - private final RepositoryServiceFactory servicefactory; + private final RepositoryServiceFactory serviceFactory; @Inject - public ContentResource(RepositoryServiceFactory servicefactory) { - this.servicefactory = servicefactory; + public ContentResource(RepositoryServiceFactory serviceFactory) { + this.serviceFactory = serviceFactory; } @GET @Path("{revision}/{path: .*}") public Response get(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision, @PathParam("path") String path) { - try (RepositoryService repositoryService = servicefactory.create(new NamespaceAndName(namespace, name))) { + try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) { try { StreamingOutput stream = os -> { @@ -72,7 +72,7 @@ public class ContentResource { @HEAD @Path("{revision}/{path: .*}") public Response metadata(@PathParam("namespace") String namespace, @PathParam("name") String name, @PathParam("revision") String revision, @PathParam("path") String path) { - try (RepositoryService repositoryService = servicefactory.create(new NamespaceAndName(namespace, name))) { + try (RepositoryService repositoryService = serviceFactory.create(new NamespaceAndName(namespace, name))) { try { Response.ResponseBuilder responseBuilder = Response.ok(); diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java index 23544e8cf6..3c926f7986 100644 --- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java +++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ContentResourceTest.java @@ -115,15 +115,6 @@ public class ContentResourceTest { assertEquals("application/octet-stream", response.getHeaderString("Content-Type")); } - @Test - public void shouldHandleExceptionsInStreamProcessing() throws Exception { - Response response = contentResource.get(NAMESPACE, REPO_NAME, REV, "MissingFile"); - - ByteArrayOutputStream baos = readOutputStream(response); - - assertEquals(404, response.getStatus()); - } - private void mockContentFromResource(String fileName) throws Exception { URL url = Resources.getResource(fileName); mockContent(fileName, Resources.toByteArray(url));