Skip to content

Commit 4d95473

Browse files
committed
Formatting the code
1 parent 76662dd commit 4d95473

File tree

2 files changed

+25
-94
lines changed

2 files changed

+25
-94
lines changed

src/main/scala/de/upb/cs/swt/delphi/instanceregistry/Docker/Image.scala

Lines changed: 0 additions & 81 deletions
This file was deleted.

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

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -58,16 +58,18 @@ class Server(handler: RequestHandler) extends HttpApp
5858
network()
5959
} ~
6060
path("deploy") {
61-
entity(as[JsValue]) { json => deployContainer(json.asJsObject)}
61+
entity(as[JsValue]) { json => deployContainer(json.asJsObject) }
6262
} ~
6363
path("count") {
6464
numberOfInstances()
6565
} ~
66-
path(LongNumber) { Id => retrieveInstance(Id) } ~
6766
pathPrefix(LongNumber) { Id =>
68-
path("deregister") {
69-
deregister(Id)
67+
pathEnd {
68+
retrieveInstance(Id)
7069
} ~
70+
path("deregister") {
71+
deregister(Id)
72+
} ~
7173
path("matchingInstance") {
7274
matchingInstance(Id)
7375
} ~
@@ -128,9 +130,9 @@ class Server(handler: RequestHandler) extends HttpApp
128130
}
129131
}
130132
} ~
131-
path("events") {
132-
streamEvents()
133-
}
133+
path("events") {
134+
streamEvents()
135+
}
134136

135137

136138
/**
@@ -382,7 +384,9 @@ class Server(handler: RequestHandler) extends HttpApp
382384

383385
case Failure(ex) =>
384386
log.warning(s"Failed to unmarshal parameters with message ${ex.getMessage}. Data: $json")
385-
complete{HttpResponse(StatusCodes.BadRequest, entity = "Wrong data format supplied.")}
387+
complete {
388+
HttpResponse(StatusCodes.BadRequest, entity = "Wrong data format supplied.")
389+
}
386390
}
387391

388392
}
@@ -454,7 +458,9 @@ class Server(handler: RequestHandler) extends HttpApp
454458
}
455459
case Failure(ex) =>
456460
log.warning(s"Failed to unmarshal parameters with message ${ex.getMessage}. Data: $json")
457-
complete{HttpResponse(StatusCodes.BadRequest, entity = "Wrong data format supplied.")}
461+
complete {
462+
HttpResponse(StatusCodes.BadRequest, entity = "Wrong data format supplied.")
463+
}
458464
}
459465
}
460466
}
@@ -808,7 +814,9 @@ class Server(handler: RequestHandler) extends HttpApp
808814
}
809815
case Failure(ex) =>
810816
log.warning(s"Failed to unmarshal parameters with message ${ex.getMessage}. Data: $json")
811-
complete{HttpResponse(StatusCodes.BadRequest, entity = "Wrong data format supplied.")}
817+
complete {
818+
HttpResponse(StatusCodes.BadRequest, entity = "Wrong data format supplied.")
819+
}
812820
}
813821
}
814822
}
@@ -916,7 +924,9 @@ class Server(handler: RequestHandler) extends HttpApp
916924
}
917925
case Failure(ex) =>
918926
log.warning(s"Failed to unmarshal parameters with message ${ex.getMessage}. Data: $json")
919-
complete{HttpResponse(StatusCodes.BadRequest, entity = "Wrong data format supplied.")}
927+
complete {
928+
HttpResponse(StatusCodes.BadRequest, entity = "Wrong data format supplied.")
929+
}
920930
}
921931
}
922932
}
@@ -928,7 +938,7 @@ class Server(handler: RequestHandler) extends HttpApp
928938
*
929939
* @return Server route that either maps to 200 Ok or the respective error codes.
930940
*/
931-
def runCommandInContainer(id:Long, json: JsObject): server.Route = {
941+
def runCommandInContainer(id: Long, json: JsObject): server.Route = {
932942
authenticateOAuth2[AccessToken]("Secure Site", AuthProvider.authenticateOAuthRequire(_, userType = UserType.Admin)) { token =>
933943
post {
934944
log.debug(s"POST /command has been called")
@@ -967,7 +977,9 @@ class Server(handler: RequestHandler) extends HttpApp
967977
}
968978
case Failure(ex) =>
969979
log.warning(s"Failed to unmarshal parameters with message ${ex.getMessage}. Data: $json")
970-
complete{HttpResponse(StatusCodes.BadRequest, entity = "Wrong data format supplied.")}
980+
complete {
981+
HttpResponse(StatusCodes.BadRequest, entity = "Wrong data format supplied.")
982+
}
971983
}
972984
}
973985
}

0 commit comments

Comments
 (0)