#5060: Upgrade to Akka 2.6.11

- fixed the scalafmt in tests

Author: vrann

core/controller/src/main/scala/org/apache/openwhisk/core/controller/Controller.scala

@@ -88,6 +88,7 @@ class Controller(val instance: ControllerInstanceId,
    * A Route in Akka is technically a function taking a RequestContext as a parameter.
    *
    * The "~" Akka DSL operator composes two independent Routes, building a routing tree structure.
+   *
    * @see http://doc.akka.io/docs/akka-http/current/scala/http/routing-dsl/routes.html#composing-routes
    */
   override def routes(implicit transid: TransactionId): Route = {
@@ -273,18 +274,12 @@ object Controller {
 
     ExecManifest.initialize(config) match {
       case Success(_) =>
-        val controller = new Controller(
-          instance,
-          ExecManifest.runtimesManifest,
-          config,
-          actorSystem,
-          logger)
+        val controller = new Controller(instance, ExecManifest.runtimesManifest, config, actorSystem, logger)
 
         val httpsConfig =
           if (Controller.protocol == "https") Some(loadConfigOrThrow[HttpsConfig]("whisk.controller.https")) else None
 
-        BasicHttpService.startHttpService(controller.route, port, httpsConfig, interface)(
-          actorSystem)
+        BasicHttpService.startHttpService(controller.route, port, httpsConfig, interface)(actorSystem)
 
       case Failure(t) =>
         abort(s"Invalid runtimes manifest: $t")

core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/CommonLoadBalancer.scala

@@ -41,15 +41,13 @@ import scala.util.{Failure, Success}
 /**
  * Abstract class which provides common logic for all LoadBalancer implementations.
  */
-abstract class CommonLoadBalancer(
-  config:             WhiskConfig,
-  feedFactory:        FeedFactory,
-  controllerInstance: ControllerInstanceId
-)(implicit
-  val actorSystem: ActorSystem,
-  logging:           Logging,
-  messagingProvider: MessagingProvider)
-  extends LoadBalancer {
+abstract class CommonLoadBalancer(config: WhiskConfig,
+                                  feedFactory: FeedFactory,
+                                  controllerInstance: ControllerInstanceId)(implicit
+                                                                            val actorSystem: ActorSystem,
+                                                                            logging: Logging,
+                                                                            messagingProvider: MessagingProvider)
+    extends LoadBalancer {
 
   protected implicit val executionContext: ExecutionContext = actorSystem.dispatcher
 

core/controller/src/main/scala/org/apache/openwhisk/core/loadBalancer/LeanBalancer.scala

@@ -87,9 +87,8 @@ class LeanBalancer(config: WhiskConfig,
 
 object LeanBalancer extends LoadBalancerProvider {
 
-  override def instance(whiskConfig: WhiskConfig, instance: ControllerInstanceId)(
-    implicit actorSystem: ActorSystem,
-    logging: Logging): LoadBalancer = {
+  override def instance(whiskConfig: WhiskConfig, instance: ControllerInstanceId)(implicit actorSystem: ActorSystem,
+                                                                                  logging: Logging): LoadBalancer = {
 
     new LeanBalancer(whiskConfig, createFeedFactory(whiskConfig, instance), instance)
   }