motiejus
/
jgit
1
Fork 0
Code Releases Activity

FileLfsServlet: Return HTTP 422 instead of 400 

According to the specification [1], the error response status code
should be 422 when there is a validation error with one or more of
the objects in the request

[1] https://github.com/github/git-lfs/blob/master/docs/api/v1/http-v1-batch.md#response-errors

Change-Id: Id03fe00a2109b896d9a154228a14a33bce5accc3
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
This commit is contained in:
David Pursehouse 2016-07-22 17:21:20 +09:00
parent c15903ea3e
commit 2e652aebab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.eclipse.jgit.lfs.server.test/tst/org/eclipse/jgit/lfs/server/fs/DownloadTest.java
View File

@ -78,7 +78,7 @@ public void testDownloadInvalidPathInfo()
getContent(id.name().substring(0, 60), f);
fail("expected RuntimeException");
} catch (RuntimeException e) {
assertEquals("Status: 400 Bad Request",
assertEquals("Status: 422 Unprocessable Entity",
e.getMessage());
}
}
@ -93,7 +93,7 @@ public void testDownloadInvalidId()
getContent(id.name().replace('f', 'z'), f);
fail("expected RuntimeException");
} catch (RuntimeException e) {
assertEquals("Status: 400 Bad Request",
assertEquals("Status: 422 Unprocessable Entity",
e.getMessage());
}
}

4
org.eclipse.jgit.lfs.server/src/org/eclipse/jgit/lfs/server/fs/FileLfsServlet.java
View File

@ -121,14 +121,14 @@ private AnyLongObjectId getObjectToTransfer(HttpServletRequest req,
HttpServletResponse rsp) throws IOException {
String info = req.getPathInfo();
if (info.length() != 1 + Constants.LONG_OBJECT_ID_STRING_LENGTH) {
sendError(rsp, HttpStatus.SC_BAD_REQUEST, MessageFormat
sendError(rsp, HttpStatus.SC_UNPROCESSABLE_ENTITY, MessageFormat
.format(LfsServerText.get().invalidPathInfo, info));
return null;
}
try {
return LongObjectId.fromString(info.substring(1, 65));
} catch (InvalidLongObjectIdException e) {
sendError(rsp, HttpStatus.SC_BAD_REQUEST, e.getMessage());
sendError(rsp, HttpStatus.SC_UNPROCESSABLE_ENTITY, e.getMessage());
return null;
}
}