You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cb...@apache.org on 2018/03/05 07:15:34 UTC
[incubator-openwhisk] branch master updated: Change all empty
collection creations to an explicit call to `empty`. (#3359)
This is an automated email from the ASF dual-hosted git repository.
cbickel pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 59abfcc Change all empty collection creations to an explicit call to `empty`. (#3359)
59abfcc is described below
commit 59abfccf91b58ee39f184030374203f1bf372f2d
Author: Markus Thömmes <ma...@me.com>
AuthorDate: Mon Mar 5 08:15:31 2018 +0100
Change all empty collection creations to an explicit call to `empty`. (#3359)
Collection.empty is optimized for less allocations, less work in general and more clear to read.
---
common/scala/src/main/scala/whisk/common/Config.scala | 2 +-
common/scala/src/main/scala/whisk/core/WhiskConfig.scala | 2 +-
.../src/main/scala/whisk/core/containerpool/ContainerFactory.scala | 4 ++--
.../scala/whisk/core/containerpool/logging/LogDriverLogStore.scala | 2 +-
common/scala/src/main/scala/whisk/core/entity/Parameter.scala | 2 +-
common/scala/src/main/scala/whisk/core/entity/WhiskPackage.scala | 4 ++--
core/controller/src/main/scala/whisk/core/controller/WebActions.scala | 4 ++--
.../src/main/scala/whisk/core/containerpool/docker/DockerClient.scala | 4 ++--
.../main/scala/whisk/core/containerpool/docker/DockerContainer.scala | 4 ++--
9 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/common/scala/src/main/scala/whisk/common/Config.scala b/common/scala/src/main/scala/whisk/common/Config.scala
index 128c224..8289f4a 100644
--- a/common/scala/src/main/scala/whisk/common/Config.scala
+++ b/common/scala/src/main/scala/whisk/common/Config.scala
@@ -42,7 +42,7 @@ import scala.util.Try
* @param optionalProperties a Set of optional properties which may or not be defined.
* @param env an optional environment to read from (defaults to sys.env).
*/
-class Config(requiredProperties: Map[String, String], optionalProperties: Set[String] = Set())(
+class Config(requiredProperties: Map[String, String], optionalProperties: Set[String] = Set.empty)(
env: Map[String, String] = sys.env)(implicit logging: Logging) {
private val settings = getProperties().toMap.filter {
diff --git a/common/scala/src/main/scala/whisk/core/WhiskConfig.scala b/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
index b3e6826..1ff53fb 100644
--- a/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
+++ b/common/scala/src/main/scala/whisk/core/WhiskConfig.scala
@@ -34,7 +34,7 @@ import whisk.common.{Config, Logging}
* @param env an optional environment to initialize from.
*/
class WhiskConfig(requiredProperties: Map[String, String],
- optionalProperties: Set[String] = Set(),
+ optionalProperties: Set[String] = Set.empty,
propertiesFile: File = null,
env: Map[String, String] = sys.env)(implicit logging: Logging)
extends Config(requiredProperties, optionalProperties)(env) {
diff --git a/common/scala/src/main/scala/whisk/core/containerpool/ContainerFactory.scala b/common/scala/src/main/scala/whisk/core/containerpool/ContainerFactory.scala
index fd19495..17860c0 100644
--- a/common/scala/src/main/scala/whisk/core/containerpool/ContainerFactory.scala
+++ b/common/scala/src/main/scala/whisk/core/containerpool/ContainerFactory.scala
@@ -28,8 +28,8 @@ import whisk.core.entity.InstanceId
import whisk.spi.Spi
case class ContainerArgsConfig(network: String,
- dnsServers: Seq[String] = Seq(),
- extraArgs: Map[String, Set[String]] = Map())
+ dnsServers: Seq[String] = Seq.empty,
+ extraArgs: Map[String, Set[String]] = Map.empty)
/**
* An abstraction for Container creation
diff --git a/common/scala/src/main/scala/whisk/core/containerpool/logging/LogDriverLogStore.scala b/common/scala/src/main/scala/whisk/core/containerpool/logging/LogDriverLogStore.scala
index ea1576c..5320d4d 100644
--- a/common/scala/src/main/scala/whisk/core/containerpool/logging/LogDriverLogStore.scala
+++ b/common/scala/src/main/scala/whisk/core/containerpool/logging/LogDriverLogStore.scala
@@ -38,7 +38,7 @@ import scala.concurrent.Future
class LogDriverLogStore(actorSystem: ActorSystem) extends LogStore {
/** Indicate --log-driver and --log-opt flags via ContainerArgsConfig.extraArgs */
- override def containerParameters = Map()
+ override def containerParameters = Map.empty
def collectLogs(transid: TransactionId,
user: Identity,
diff --git a/common/scala/src/main/scala/whisk/core/entity/Parameter.scala b/common/scala/src/main/scala/whisk/core/entity/Parameter.scala
index 18ddb6e..c27744e 100644
--- a/common/scala/src/main/scala/whisk/core/entity/Parameter.scala
+++ b/common/scala/src/main/scala/whisk/core/entity/Parameter.scala
@@ -161,7 +161,7 @@ protected[core] object Parameters extends ArgNormalizer[Parameters] {
protected[core] val Feed = "feed"
protected[core] val sizeLimit = 1 MB
- protected[core] def apply(): Parameters = new Parameters(Map())
+ protected[core] def apply(): Parameters = new Parameters(Map.empty)
/**
* Creates a parameter tuple from a pair of strings.
diff --git a/common/scala/src/main/scala/whisk/core/entity/WhiskPackage.scala b/common/scala/src/main/scala/whisk/core/entity/WhiskPackage.scala
index 57390ae..7c93737 100644
--- a/common/scala/src/main/scala/whisk/core/entity/WhiskPackage.scala
+++ b/common/scala/src/main/scala/whisk/core/entity/WhiskPackage.scala
@@ -275,14 +275,14 @@ object WhiskPackageWithActions {
as map { a =>
WhiskPackageAction.serdes.read(a)
} toList
- case _ => List()
+ case _ => List.empty
}
val feeds = value.asJsObject.getFields("feeds") match {
case Seq(JsArray(as)) =>
as map { a =>
WhiskPackageAction.serdes.read(a)
} toList
- case _ => List()
+ case _ => List.empty
}
WhiskPackageWithActions(pkg, actions, feeds)
} getOrElse deserializationError("whisk package with actions malformed")
diff --git a/core/controller/src/main/scala/whisk/core/controller/WebActions.scala b/core/controller/src/main/scala/whisk/core/controller/WebActions.scala
index d81884f..9987a21 100644
--- a/core/controller/src/main/scala/whisk/core/controller/WebActions.scala
+++ b/core/controller/src/main/scala/whisk/core/controller/WebActions.scala
@@ -227,7 +227,7 @@ protected[core] object WhiskWebActionsApi extends Directives {
}.toList
case _ => throw new Throwable("Invalid header")
- } getOrElse List()
+ } getOrElse List.empty
val body = fields.get("body")
@@ -749,6 +749,6 @@ trait WhiskWebActionsApi extends Directives with ValidateRequestSize with PostAc
.orElse(responseType.defaultProjection)
} else responseType.defaultProjection
- projection.getOrElse(List())
+ projection.getOrElse(List.empty)
}
}
diff --git a/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala b/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala
index a663cf8..44102b8 100644
--- a/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala
+++ b/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerClient.scala
@@ -153,7 +153,7 @@ class DockerClient(dockerHost: Option[String] = None,
def rm(id: ContainerId)(implicit transid: TransactionId): Future[Unit] =
runCmd(Seq("rm", "-f", id.asString), timeouts.rm).map(_ => ())
- def ps(filters: Seq[(String, String)] = Seq(), all: Boolean = false)(
+ def ps(filters: Seq[(String, String)] = Seq.empty, all: Boolean = false)(
implicit transid: TransactionId): Future[Seq[ContainerId]] = {
val filterArgs = filters.flatMap { case (attr, value) => Seq("--filter", s"$attr=$value") }
val allArg = if (all) Seq("--all") else Seq.empty[String]
@@ -244,7 +244,7 @@ trait DockerApi {
* @param all Whether or not to return stopped containers as well
* @return A list of ContainerIds
*/
- def ps(filters: Seq[(String, String)] = Seq(), all: Boolean = false)(
+ def ps(filters: Seq[(String, String)] = Seq.empty, all: Boolean = false)(
implicit transid: TransactionId): Future[Seq[ContainerId]]
/**
diff --git a/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerContainer.scala b/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerContainer.scala
index 5d3083c..5c959de 100644
--- a/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerContainer.scala
+++ b/core/invoker/src/main/scala/whisk/core/containerpool/docker/DockerContainer.scala
@@ -71,9 +71,9 @@ object DockerContainer {
userProvidedImage: Boolean = false,
memory: ByteSize = 256.MB,
cpuShares: Int = 0,
- environment: Map[String, String] = Map(),
+ environment: Map[String, String] = Map.empty,
network: String = "bridge",
- dnsServers: Seq[String] = Seq(),
+ dnsServers: Seq[String] = Seq.empty,
name: Option[String] = None,
useRunc: Boolean = true,
dockerRunParameters: Map[String, Set[String]])(implicit docker: DockerApiWithFileAccess,
--
To stop receiving notification emails like this one, please contact
cbickel@apache.org.