diff --git a/docs/rest-api.md b/docs/rest-api.md index d4be85855..e16523d31 100644 --- a/docs/rest-api.md +++ b/docs/rest-api.md @@ -295,7 +295,7 @@ Returns a specified statement in a session. The statement object. -### POST /sessions/{sessionId}/statements/{statementId}/cancel +### DELETE /sessions/{sessionId}/statements/{statementId} Cancel the specified statement in this session. diff --git a/server/src/main/scala/org/apache/livy/server/interactive/InteractiveSessionServlet.scala b/server/src/main/scala/org/apache/livy/server/interactive/InteractiveSessionServlet.scala index 3b7008751..c6cd01188 100644 --- a/server/src/main/scala/org/apache/livy/server/interactive/InteractiveSessionServlet.scala +++ b/server/src/main/scala/org/apache/livy/server/interactive/InteractiveSessionServlet.scala @@ -142,7 +142,7 @@ class InteractiveSessionServlet( } } - post("/:id/statements/:statementId/cancel") { + delete("/:id/statements/:statementId") { withModifyAccessSession { session => val statementId = params("statementId") session.cancelStatement(statementId.toInt) diff --git a/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionServletSpec.scala b/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionServletSpec.scala index c97aa19e3..2d93c86ad 100644 --- a/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionServletSpec.scala +++ b/server/src/test/scala/org/apache/livy/server/interactive/InteractiveSessionServletSpec.scala @@ -136,7 +136,7 @@ class InteractiveSessionServletSpec extends BaseInteractiveServletSpec { data("statements").asInstanceOf[Seq[Map[String, Any]]](0)("id") should be (0) } - jpost[Map[String, Any]]("/0/statements/0/cancel", null, HttpServletResponse.SC_OK) { data => + jdelete[Map[String, Any]]("/0/statements/0") { data => data should equal(Map("msg" -> "canceled")) }