Using JsValue logic and redesigning ServerTests for instances/{id}/label

Author: 24santoshr

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/connection/Server.scala

@@ -109,7 +109,7 @@ class Server(handler: RequestHandler) extends HttpApp
               entity(as[String]) { jsonString => assignInstance(Id, jsonString) }
             } ~
             path("label") {
-              entity(as[String]) { jsonString => addLabel(Id, jsonString) }
+              entity(as[JsValue]) { json => addLabel(Id, json.asJsObject.fields("Label").toString()) }
             }
         }
     } ~
@@ -854,11 +854,10 @@ class Server(handler: RequestHandler) extends HttpApp
     *
     * @return Server route that either maps to 200 OK or the respective error codes.
     */
-  def addLabel(id: Long, addLabelStr: String): server.Route = {
+  def addLabel(id: Long, label: String): server.Route = {
     authenticateOAuth2[AccessToken]("Secure Site", AuthProvider.authenticateOAuthRequire(_, userType = UserType.Admin)) { token =>
 
-      try {
-        val label: String = addLabelStr.parseJson.convertTo[String]
+
         post {
           log.debug(s"POST /instances/$id/label with parameter label=$label has been called.")
           handler.handleAddLabel(id, label) match {
@@ -878,18 +877,6 @@ class Server(handler: RequestHandler) extends HttpApp
               complete("Successfully added label")
           }
         }
-      }
-      catch {
-        case dx: DeserializationException =>
-          log.error(dx, "Deserialization exception")
-          complete(HttpResponse(StatusCodes.BadRequest, entity = s"Could not deserialize parameter instance with message ${dx.getMessage}."))
-        case px: ParsingException =>
-          log.error(px, "Failed to parse JSON while adding label")
-          complete(HttpResponse(StatusCodes.BadRequest, entity = s"Failed to parse JSON entity with message ${px.getMessage}"))
-        case x: Exception =>
-          log.error(x, "Uncaught exception while deserializing.")
-          complete(HttpResponse(StatusCodes.InternalServerError, entity = "An internal server error occurred."))
-      }
     }
   }
 

src/test/scala/de/upb/cs/swt/delphi/instanceregistry/connection/ServerTest.scala

@@ -602,47 +602,45 @@ class ServerTest
       }
     }
 
-    //Valid POST /addLabel
-   /* "add a generic label to an instance is label and id are valid" in {
-      Post("/addLabel?Id=0&Label=ElasticSearchDefaultLabel") ~> addAuthorization("Admin") ~> server.routes ~> check {
+    //Valid POST /instances/{id}/label
+    "add a generic label to an instance is label and id are valid" in {
+      Post("/instances/0/label", HttpEntity(ContentTypes.`application/json`, """{ "Label": "Private"}""")) ~> addAuthorization("Admin") ~> server.routes ~> check {
         assert(status === StatusCodes.OK)
         responseAs[String] shouldEqual "Successfully added label"
       }
     }
-
-    //Invalid POST /addLabel
-    "fail to add label if id is invalid or label too long" in{
+    //Invalid POST /instances/{id}/label
+    "fail to add label if id is invalid or label too long" in {
       //Unknown id - expect 404
-      Post("/addLabel?Id=45&Label=Private") ~> addAuthorization("Admin") ~> server.routes ~> check {
+      Post("/instances/45/label",HttpEntity(ContentTypes.`application/json`, """{ "Label": "Private"}""")) ~> addAuthorization("Admin") ~> server.routes ~> check {
         assert(status === StatusCodes.NOT_FOUND)
         responseAs[String] shouldEqual "Cannot add label, id 45 not found."
       }
-
-      val tooLongLabel = "VeryVeryExtraLongLabelThatDoesNotWorkWhileAddingLabel"
       //Label out of bounds - expect 400
-      Post(s"/addLabel?Id=0&Label=$tooLongLabel") ~> addAuthorization("Admin") ~> server.routes ~> check {
+      val tooLongLabel = "VeryVeryExtraLongLabelThatDoesNotWorkWhileAddingLabel"
+      val jsonStr = tooLongLabel.toJson
+      Post("/instances/0/label",HttpEntity(ContentTypes.`application/json`, s"""{ "Label": $jsonStr}""")) ~> addAuthorization("Admin") ~> server.routes ~> check {
         assert(status === StatusCodes.BAD_REQUEST)
         responseAs[String].toLowerCase should include ("exceeds character limit")
       }
-
       //Wrong user type
-      Post("/addLabel?Id=0&Label=Private") ~> addAuthorization("Component") ~> Route.seal(server.routes) ~> check {
+      Post("/instances/0/label",HttpEntity(ContentTypes.`application/json`, """{ "Label": "Private"}"""))  ~> addAuthorization("Component") ~> Route.seal(server.routes) ~> check {
         assert(status === StatusCodes.UNAUTHORIZED)
         responseAs[String] shouldEqual "The supplied authentication is invalid"
       }
 
       //Wrong user type
-      Post("/addLabel?Id=0&Label=Private") ~> addAuthorization("User") ~> Route.seal(server.routes) ~> check {
+      Post("/instances/0/label",HttpEntity(ContentTypes.`application/json`, """{ "Label": "Private"}""")) ~> addAuthorization("User") ~> Route.seal(server.routes) ~> check {
         assert(status === StatusCodes.UNAUTHORIZED)
         responseAs[String] shouldEqual "The supplied authentication is invalid"
       }
-
       //No authorization
-      Post("/addLabel?Id=0&Label=Private") ~> Route.seal(server.routes) ~> check {
+      Post("/instances/0/label",HttpEntity(ContentTypes.`application/json`, """{ "Label": "Private"}"""))~> Route.seal(server.routes) ~> check {
         assert(status === StatusCodes.UNAUTHORIZED)
         responseAs[String].toLowerCase should include ("not supplied with the request")
       }
-    } */
+
+    }
 
     /**Minimal tests for docker operations**/