You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2018/08/02 19:17:43 UTC
[GitHub] rabbah closed pull request #3936: Use empty method for collections
rabbah closed pull request #3936: Use empty method for collections
URL: https://github.com/apache/incubator-openwhisk/pull/3936
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/common/scala/src/main/scala/whisk/core/database/DocumentHandler.scala b/common/scala/src/main/scala/whisk/core/database/DocumentHandler.scala
index 393cf63d8b..e5a9709131 100644
--- a/common/scala/src/main/scala/whisk/core/database/DocumentHandler.scala
+++ b/common/scala/src/main/scala/whisk/core/database/DocumentHandler.scala
@@ -449,7 +449,7 @@ object SubjectHandler extends DocumentHandler {
case _ => None
})
- case _ => Seq()
+ case _ => Seq.empty
}
namespaces.flatMap(_.filter(matches)).headOption
}
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 0eb6d41285..e83e8e5d1e 100644
--- a/common/scala/src/main/scala/whisk/core/entity/WhiskPackage.scala
+++ b/common/scala/src/main/scala/whisk/core/entity/WhiskPackage.scala
@@ -102,7 +102,7 @@ case class WhiskPackage(namespace: EntityPath,
* Adds actions to package. The actions list is filtered so that only actions that
* match the package are included (must match package namespace/name).
*/
- def withActions(actions: List[WhiskAction] = List()): WhiskPackageWithActions = {
+ def withActions(actions: List[WhiskAction] = List.empty): WhiskPackageWithActions = {
withPackageActions(actions filter { a =>
val pkgns = binding map { b =>
b.namespace.addPath(b.name)
@@ -118,7 +118,7 @@ case class WhiskPackage(namespace: EntityPath,
* is it defined the property "feed" in the annotation. The value of the property is ignored
* for this check.
*/
- def withPackageActions(actions: List[WhiskPackageAction] = List()): WhiskPackageWithActions = {
+ def withPackageActions(actions: List[WhiskPackageAction] = List.empty): WhiskPackageWithActions = {
val actionGroups = actions map { a =>
// group into "actions" and "feeds"
val feed = a.annotations.get(Parameters.Feed) map { _ =>
@@ -126,7 +126,7 @@ case class WhiskPackage(namespace: EntityPath,
} getOrElse false
(feed, a)
} groupBy { _._1 } mapValues { _.map(_._2) }
- WhiskPackageWithActions(this, actionGroups.getOrElse(false, List()), actionGroups.getOrElse(true, List()))
+ WhiskPackageWithActions(this, actionGroups.getOrElse(false, List.empty), actionGroups.getOrElse(true, List.empty))
}
def toJson = WhiskPackage.serdes.write(this).asJsObject
diff --git a/common/scala/src/main/scala/whisk/core/mesos/MesosTask.scala b/common/scala/src/main/scala/whisk/core/mesos/MesosTask.scala
index db3f87c6ae..1c0dc1cc07 100644
--- a/common/scala/src/main/scala/whisk/core/mesos/MesosTask.scala
+++ b/common/scala/src/main/scala/whisk/core/mesos/MesosTask.scala
@@ -72,11 +72,11 @@ object MesosTask {
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,
- parameters: Map[String, Set[String]] = Map(),
+ parameters: Map[String, Set[String]] = Map.empty,
constraints: Seq[Constraint] = Seq.empty)(implicit ec: ExecutionContext,
log: Logging,
as: ActorSystem): Future[Container] = {
@@ -94,7 +94,7 @@ object MesosTask {
case "host" => Host
case _ => User(network)
}
- val dnsOrEmpty = if (dnsServers.nonEmpty) Map("dns" -> dnsServers.toSet) else Map()
+ val dnsOrEmpty = if (dnsServers.nonEmpty) Map("dns" -> dnsServers.toSet) else Map.empty
val task = new TaskDef(
taskId,
diff --git a/core/controller/src/main/scala/whisk/core/entitlement/Entitlement.scala b/core/controller/src/main/scala/whisk/core/entitlement/Entitlement.scala
index a553357674..db09d873cf 100644
--- a/core/controller/src/main/scala/whisk/core/entitlement/Entitlement.scala
+++ b/core/controller/src/main/scala/whisk/core/entitlement/Entitlement.scala
@@ -425,7 +425,7 @@ trait ReferencedEntities {
e.components.map { c =>
Resource(c.path, Collection(Collection.ACTIONS), Some(c.name.asString))
}.toSet
- case _ => Set()
+ case _ => Set.empty
}
}
}
diff --git a/tests/src/test/scala/actionContainers/ActionContainer.scala b/tests/src/test/scala/actionContainers/ActionContainer.scala
index 617c216af8..213c74e1f8 100644
--- a/tests/src/test/scala/actionContainers/ActionContainer.scala
+++ b/tests/src/test/scala/actionContainers/ActionContainer.scala
@@ -64,7 +64,7 @@ trait ActionProxyContainerTestUtils extends FlatSpec with Matchers with StreamLo
"binary" -> JsBoolean(Exec.isBinaryCode(code))))
def runPayload(args: JsValue, other: Option[JsObject] = None): JsObject =
- JsObject(Map("value" -> args) ++ (other map { _.fields } getOrElse Map()))
+ JsObject(Map("value" -> args) ++ (other map { _.fields } getOrElse Map.empty))
def checkStreams(out: String,
err: String,
diff --git a/tests/src/test/scala/common/RunCliCmd.scala b/tests/src/test/scala/common/RunCliCmd.scala
index 682e7c6558..aee4439711 100644
--- a/tests/src/test/scala/common/RunCliCmd.scala
+++ b/tests/src/test/scala/common/RunCliCmd.scala
@@ -63,7 +63,7 @@ trait RunCliCmd extends Matchers {
workingDir: File = new File("."),
stdinFile: Option[File] = None,
showCmd: Boolean = false,
- hideFromOutput: Seq[String] = Seq(),
+ hideFromOutput: Seq[String] = Seq.empty,
retriesOnNetworkError: Int = 3): RunResult = {
require(retriesOnNetworkError >= 0, "retry count on network error must not be negative")
diff --git a/tests/src/test/scala/common/WskCliOperations.scala b/tests/src/test/scala/common/WskCliOperations.scala
index d0a0c5f51e..459dc59272 100644
--- a/tests/src/test/scala/common/WskCliOperations.scala
+++ b/tests/src/test/scala/common/WskCliOperations.scala
@@ -100,11 +100,11 @@ trait CliListOrGetFromCollectionOperations extends ListOrGetFromCollectionOperat
val params = Seq(noun, "list", resolve(namespace), "--auth", wp.authKey) ++ {
limit map { l =>
Seq("--limit", l.toString)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
nameSort map { n =>
Seq("--name-sort")
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ params, expectedExitCode)
}
@@ -125,22 +125,22 @@ trait CliListOrGetFromCollectionOperations extends ListOrGetFromCollectionOperat
saveAs: Option[String] = None)(implicit wp: WskProps): RunResult = {
val params = Seq(noun, "get", "--auth", wp.authKey) ++
- Seq(fqn(name)) ++ { if (summary) Seq("--summary") else Seq() } ++ {
+ Seq(fqn(name)) ++ { if (summary) Seq("--summary") else Seq.empty } ++ {
fieldFilter map { f =>
Seq(f)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
url map { u =>
Seq("--url")
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
save map { s =>
Seq("--save")
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
saveAs map { s =>
Seq("--save-as", s)
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ params, expectedExitCode)
@@ -193,8 +193,8 @@ class CliActionOperations(override val wsk: RunCliCmd)
kind: Option[String] = None, // one of docker, copy, sequence or none for autoselect else an explicit type
main: Option[String] = None,
docker: Option[String] = None,
- parameters: Map[String, JsValue] = Map(),
- annotations: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
+ annotations: Map[String, JsValue] = Map.empty,
parameterFile: Option[String] = None,
annotationFile: Option[String] = None,
timeout: Option[Duration] = None,
@@ -206,12 +206,12 @@ class CliActionOperations(override val wsk: RunCliCmd)
websecure: Option[String] = None,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult = {
val params = Seq(noun, if (!update) "create" else "update", "--auth", wp.authKey, fqn(name)) ++ {
- artifact map { Seq(_) } getOrElse Seq()
+ artifact map { Seq(_) } getOrElse Seq.empty
} ++ {
kind map { k =>
if (k == "sequence" || k == "copy" || k == "native") Seq(s"--$k")
else Seq("--kind", k)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
main.toSeq flatMap { p =>
Seq("--main", p)
@@ -231,35 +231,35 @@ class CliActionOperations(override val wsk: RunCliCmd)
} ++ {
parameterFile map { pf =>
Seq("-P", pf)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
annotationFile map { af =>
Seq("-A", af)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
timeout map { t =>
Seq("-t", t.toMillis.toString)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
memory map { m =>
Seq("-m", m.toMB.toString)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
logsize map { l =>
Seq("-l", l.toMB.toString)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
shared map { s =>
Seq("--shared", if (s) "yes" else "no")
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
web map { w =>
Seq("--web", w)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
websecure map { ws =>
Seq("--web-secure", ws)
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ params, expectedExitCode)
}
@@ -272,7 +272,7 @@ class CliActionOperations(override val wsk: RunCliCmd)
* if the code is anything but DONTCARE_EXIT, assert the code is as expected
*/
override def invoke(name: String,
- parameters: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
parameterFile: Option[String] = None,
blocking: Boolean = false,
result: Boolean = false,
@@ -284,8 +284,8 @@ class CliActionOperations(override val wsk: RunCliCmd)
} ++ {
parameterFile map { pf =>
Seq("-P", pf)
- } getOrElse Seq()
- } ++ { if (blocking) Seq("--blocking") else Seq() } ++ { if (result) Seq("--result") else Seq() }
+ } getOrElse Seq.empty
+ } ++ { if (blocking) Seq("--blocking") else Seq.empty } ++ { if (result) Seq("--result") else Seq.empty }
wsk.cli(wp.overrides ++ params, expectedExitCode)
}
}
@@ -306,8 +306,8 @@ class CliTriggerOperations(override val wsk: RunCliCmd)
* if the code is anything but DONTCARE_EXIT, assert the code is as expected
*/
override def create(name: String,
- parameters: Map[String, JsValue] = Map(),
- annotations: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
+ annotations: Map[String, JsValue] = Map.empty,
parameterFile: Option[String] = None,
annotationFile: Option[String] = None,
feed: Option[String] = None,
@@ -317,7 +317,7 @@ class CliTriggerOperations(override val wsk: RunCliCmd)
val params = Seq(noun, if (!update) "create" else "update", "--auth", wp.authKey, fqn(name)) ++ {
feed map { f =>
Seq("--feed", fqn(f))
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
parameters flatMap { p =>
Seq("-p", p._1, p._2.compactPrint)
@@ -329,15 +329,15 @@ class CliTriggerOperations(override val wsk: RunCliCmd)
} ++ {
parameterFile map { pf =>
Seq("-P", pf)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
annotationFile map { af =>
Seq("-A", af)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
shared map { s =>
Seq("--shared", if (s) "yes" else "no")
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ params, expectedExitCode)
}
@@ -350,7 +350,7 @@ class CliTriggerOperations(override val wsk: RunCliCmd)
* if the code is anything but DONTCARE_EXIT, assert the code is as expected
*/
override def fire(name: String,
- parameters: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
parameterFile: Option[String] = None,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult = {
val params = Seq(noun, "fire", "--auth", wp.authKey, fqn(name)) ++ {
@@ -360,7 +360,7 @@ class CliTriggerOperations(override val wsk: RunCliCmd)
} ++ {
parameterFile map { pf =>
Seq("-P", pf)
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ params, expectedExitCode)
}
@@ -386,7 +386,7 @@ class CliRuleOperations(override val wsk: RunCliCmd)
override def create(name: String,
trigger: String,
action: String,
- annotations: Map[String, JsValue] = Map(),
+ annotations: Map[String, JsValue] = Map.empty,
shared: Option[Boolean] = None,
update: Boolean = false,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult = {
@@ -397,7 +397,7 @@ class CliRuleOperations(override val wsk: RunCliCmd)
} ++ {
shared map { s =>
Seq("--shared", if (s) "yes" else "no")
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ params, expectedExitCode)
}
@@ -465,11 +465,11 @@ class CliActivationOperations(val wsk: RunCliCmd) extends ActivationOperations w
val params = Seq(noun, "poll") ++ {
actionName map { name =>
Seq(name)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ Seq("--auth", wp.authKey, "--exit", duration.toSeconds.toString) ++ {
since map { s =>
Seq("--since-seconds", s.toSeconds.toString)
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ params, expectedExitCode)
}
@@ -487,14 +487,14 @@ class CliActivationOperations(val wsk: RunCliCmd) extends ActivationOperations w
limit: Option[Int] = None,
since: Option[Instant] = None,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult = {
- val params = Seq(noun, "list", "--auth", wp.authKey) ++ { filter map { Seq(_) } getOrElse Seq() } ++ {
+ val params = Seq(noun, "list", "--auth", wp.authKey) ++ { filter map { Seq(_) } getOrElse Seq.empty } ++ {
limit map { l =>
Seq("--limit", l.toString)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
since map { i =>
Seq("--since", i.toEpochMilli.toString)
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ params, expectedExitCode)
}
@@ -532,19 +532,19 @@ class CliActivationOperations(val wsk: RunCliCmd) extends ActivationOperations w
val params = {
activationId map { a =>
Seq(a)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
fieldFilter map { f =>
Seq(f)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
last map { l =>
Seq("--last")
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
summary map { s =>
Seq("--summary")
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ Seq(noun, "get", "--auth", wp.authKey) ++ params, expectedExitCode)
}
@@ -563,11 +563,11 @@ class CliActivationOperations(val wsk: RunCliCmd) extends ActivationOperations w
val params = {
activationId map { a =>
Seq(a)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
last map { l =>
Seq("--last")
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ Seq(noun, "logs", "--auth", wp.authKey) ++ params, expectedExitCode)
}
@@ -586,11 +586,11 @@ class CliActivationOperations(val wsk: RunCliCmd) extends ActivationOperations w
val params = {
activationId map { a =>
Seq(a)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
last map { l =>
Seq("--last")
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ Seq(noun, "result", "--auth", wp.authKey) ++ params, expectedExitCode)
}
@@ -623,7 +623,7 @@ class CliActivationOperations(val wsk: RunCliCmd) extends ActivationOperations w
} match {
case Success(ids) => ids
case Failure(PartialResult(ids)) => ids
- case _ => Seq()
+ case _ => Seq.empty
}
}
@@ -686,7 +686,7 @@ class CliNamespaceOperations(override val wsk: RunCliCmd)
val params = Seq(noun, "list", "--auth", wp.authKey) ++ {
nameSort map { n =>
Seq("--name-sort")
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ params, expectedExitCode)
}
@@ -716,7 +716,7 @@ class CliNamespaceOperations(override val wsk: RunCliCmd)
val params = {
nameSort map { n =>
Seq("--name-sort")
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ Seq(noun, "get", resolve(namespace), "--auth", wp.authKey) ++ params, expectedExitCode)
}
@@ -736,8 +736,8 @@ class CliPackageOperations(override val wsk: RunCliCmd)
* if the code is anything but DONTCARE_EXIT, assert the code is as expected
*/
override def create(name: String,
- parameters: Map[String, JsValue] = Map(),
- annotations: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
+ annotations: Map[String, JsValue] = Map.empty,
parameterFile: Option[String] = None,
annotationFile: Option[String] = None,
shared: Option[Boolean] = None,
@@ -754,15 +754,15 @@ class CliPackageOperations(override val wsk: RunCliCmd)
} ++ {
parameterFile map { pf =>
Seq("-P", pf)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
annotationFile map { af =>
Seq("-A", af)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
shared map { s =>
Seq("--shared", if (s) "yes" else "no")
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(wp.overrides ++ params, expectedExitCode)
}
@@ -776,8 +776,8 @@ class CliPackageOperations(override val wsk: RunCliCmd)
*/
override def bind(provider: String,
name: String,
- parameters: Map[String, JsValue] = Map(),
- annotations: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
+ annotations: Map[String, JsValue] = Map.empty,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult = {
val params = Seq(noun, "bind", "--auth", wp.authKey, fqn(provider), fqn(name)) ++ {
parameters flatMap { p =>
@@ -813,31 +813,31 @@ class CliGatewayOperations(val wsk: RunCliCmd) extends GatewayOperations {
val params = Seq(noun, "create", "--auth", wp.authKey) ++ {
basepath map { b =>
Seq(b)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
relpath map { r =>
Seq(r)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
operation map { o =>
Seq(o)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
action map { aa =>
Seq(aa)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
apiname map { a =>
Seq("--apiname", a)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
swagger map { s =>
Seq("--config-file", s)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
responsetype map { t =>
Seq("--response-type", t)
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(
wp.overrides ++ params,
@@ -864,31 +864,31 @@ class CliGatewayOperations(val wsk: RunCliCmd) extends GatewayOperations {
val params = Seq(noun, "list", "--auth", wp.authKey) ++ {
basepathOrApiName map { b =>
Seq(b)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
relpath map { r =>
Seq(r)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
operation map { o =>
Seq(o)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
limit map { l =>
Seq("--limit", l.toString)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
since map { i =>
Seq("--since", i.toEpochMilli.toString)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
full map { r =>
Seq("--full")
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
nameSort map { n =>
Seq("--name-sort")
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(
wp.overrides ++ params,
@@ -912,15 +912,15 @@ class CliGatewayOperations(val wsk: RunCliCmd) extends GatewayOperations {
val params = Seq(noun, "get", "--auth", wp.authKey) ++ {
basepathOrApiName map { b =>
Seq(b)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
full map { f =>
- if (f) Seq("--full") else Seq()
- } getOrElse Seq()
+ if (f) Seq("--full") else Seq.empty
+ } getOrElse Seq.empty
} ++ {
format map { ft =>
Seq("--format", ft)
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(
wp.overrides ++ params,
@@ -943,11 +943,11 @@ class CliGatewayOperations(val wsk: RunCliCmd) extends GatewayOperations {
val params = Seq(noun, "delete", "--auth", wp.authKey, basepathOrApiName) ++ {
relpath map { r =>
Seq(r)
- } getOrElse Seq()
+ } getOrElse Seq.empty
} ++ {
operation map { o =>
Seq(o)
- } getOrElse Seq()
+ } getOrElse Seq.empty
}
wsk.cli(
wp.overrides ++ params,
diff --git a/tests/src/test/scala/common/WskOperations.scala b/tests/src/test/scala/common/WskOperations.scala
index 2597c598f0..a36745c5be 100644
--- a/tests/src/test/scala/common/WskOperations.scala
+++ b/tests/src/test/scala/common/WskOperations.scala
@@ -231,8 +231,8 @@ trait ActionOperations extends DeleteFromCollectionOperations with ListOrGetFrom
kind: Option[String] = None,
main: Option[String] = None,
docker: Option[String] = None,
- parameters: Map[String, JsValue] = Map(),
- annotations: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
+ annotations: Map[String, JsValue] = Map.empty,
parameterFile: Option[String] = None,
annotationFile: Option[String] = None,
timeout: Option[Duration] = None,
@@ -245,7 +245,7 @@ trait ActionOperations extends DeleteFromCollectionOperations with ListOrGetFrom
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult
def invoke(name: String,
- parameters: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
parameterFile: Option[String] = None,
blocking: Boolean = false,
result: Boolean = false,
@@ -255,8 +255,8 @@ trait ActionOperations extends DeleteFromCollectionOperations with ListOrGetFrom
trait PackageOperations extends DeleteFromCollectionOperations with ListOrGetFromCollectionOperations {
def create(name: String,
- parameters: Map[String, JsValue] = Map(),
- annotations: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
+ annotations: Map[String, JsValue] = Map.empty,
parameterFile: Option[String] = None,
annotationFile: Option[String] = None,
shared: Option[Boolean] = None,
@@ -265,16 +265,16 @@ trait PackageOperations extends DeleteFromCollectionOperations with ListOrGetFro
def bind(provider: String,
name: String,
- parameters: Map[String, JsValue] = Map(),
- annotations: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
+ annotations: Map[String, JsValue] = Map.empty,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult
}
trait TriggerOperations extends DeleteFromCollectionOperations with ListOrGetFromCollectionOperations {
def create(name: String,
- parameters: Map[String, JsValue] = Map(),
- annotations: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
+ annotations: Map[String, JsValue] = Map.empty,
parameterFile: Option[String] = None,
annotationFile: Option[String] = None,
feed: Option[String] = None,
@@ -283,7 +283,7 @@ trait TriggerOperations extends DeleteFromCollectionOperations with ListOrGetFro
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult
def fire(name: String,
- parameters: Map[String, JsValue] = Map(),
+ parameters: Map[String, JsValue] = Map.empty,
parameterFile: Option[String] = None,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult
}
@@ -293,7 +293,7 @@ trait RuleOperations extends DeleteFromCollectionOperations with ListOrGetFromCo
def create(name: String,
trigger: String,
action: String,
- annotations: Map[String, JsValue] = Map(),
+ annotations: Map[String, JsValue] = Map.empty,
shared: Option[Boolean] = None,
update: Boolean = false,
expectedExitCode: Int = SUCCESS_EXIT)(implicit wp: WskProps): RunResult
diff --git a/tests/src/test/scala/common/WskTracingTests.scala b/tests/src/test/scala/common/WskTracingTests.scala
index 516f890188..5a4f9eb330 100644
--- a/tests/src/test/scala/common/WskTracingTests.scala
+++ b/tests/src/test/scala/common/WskTracingTests.scala
@@ -43,7 +43,7 @@ class WskTracingTests extends FlatSpec with TestHelpers with Matchers {
tracer.reset
val transactionId: TransactionId = TransactionId.testing
- var list: List[WeakReference[Span]] = List()
+ var list: List[WeakReference[Span]] = List.empty
openTracer.startSpan(LoggingMarkers.CONTROLLER_ACTIVATION, transactionId)
var ctx = openTracer.getTraceContext(transactionId)
diff --git a/tests/src/test/scala/system/basic/WskActionTests.scala b/tests/src/test/scala/system/basic/WskActionTests.scala
index 5108c0f583..47b7d39c8d 100644
--- a/tests/src/test/scala/system/basic/WskActionTests.scala
+++ b/tests/src/test/scala/system/basic/WskActionTests.scala
@@ -182,8 +182,8 @@ class WskActionTests extends TestHelpers with WskTestHelpers with JsHelpers with
val copiedAction = wsk.parseJsonString(wsk.action.get(copiedName).stdout)
// CLI does not guarantee order of annotations and parameters so do a diff to compare the values
- copiedAction.fields("parameters").convertTo[Seq[JsObject]] diff resParams shouldBe List()
- copiedAction.fields("annotations").convertTo[Seq[JsObject]] diff resAnnots shouldBe List()
+ copiedAction.fields("parameters").convertTo[Seq[JsObject]] diff resParams shouldBe List.empty
+ copiedAction.fields("annotations").convertTo[Seq[JsObject]] diff resAnnots shouldBe List.empty
}
it should "recreate and invoke a new action with different code" in withAssetCleaner(wskprops) { (wp, assetHelper) =>
@@ -254,7 +254,7 @@ class WskActionTests extends TestHelpers with WskTestHelpers with JsHelpers with
withClue(s"check failed for activation: $activation") {
activation.response.status shouldBe "success"
activation.response.result shouldBe Some(testResult)
- activation.logs shouldBe Some(List())
+ activation.logs shouldBe Some(List.empty)
}
}
diff --git a/tests/src/test/scala/system/basic/WskPackageTests.scala b/tests/src/test/scala/system/basic/WskPackageTests.scala
index bcfd83662f..eb49a9d55d 100644
--- a/tests/src/test/scala/system/basic/WskPackageTests.scala
+++ b/tests/src/test/scala/system/basic/WskPackageTests.scala
@@ -43,7 +43,7 @@ class WskPackageTests extends TestHelpers with WskTestHelpers with WskActorSyste
it should "allow creation and deletion of a package" in withAssetCleaner(wskprops) { (wp, assetHelper) =>
val name = "simplepackage"
assetHelper.withCleaner(wsk.pkg, name) { (pkg, _) =>
- pkg.create(name, Map())
+ pkg.create(name, Map.empty)
}
}
diff --git a/tests/src/test/scala/system/basic/WskRestBasicTests.scala b/tests/src/test/scala/system/basic/WskRestBasicTests.scala
index 58ddd13063..01fed1a44e 100644
--- a/tests/src/test/scala/system/basic/WskRestBasicTests.scala
+++ b/tests/src/test/scala/system/basic/WskRestBasicTests.scala
@@ -293,7 +293,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys
action.create(name, Some(TestUtils.getTestActionFilename("blackbox.zip")), kind = Some("native"))
}
- val run = wsk.action.invoke(name, Map())
+ val run = wsk.action.invoke(name, Map.empty)
withActivation(wsk.activation, run) { activation =>
activation.response.result shouldBe Some(JsObject("msg" -> "hello zip".toJson))
activation.logs shouldBe defined
@@ -558,7 +558,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys
logs shouldBe expectedLogs
}
- val runWithNoParams = wsk.trigger.fire(triggerName, Map())
+ val runWithNoParams = wsk.trigger.fire(triggerName, Map.empty)
withActivation(wsk.activation, runWithNoParams) { activation =>
activation.response.result shouldBe Some(JsObject.empty)
activation.duration shouldBe 0L // shouldn't exist but CLI generates it
diff --git a/tests/src/test/scala/whisk/common/ConfigTests.scala b/tests/src/test/scala/whisk/common/ConfigTests.scala
index f00b6a68d9..afd50e222b 100644
--- a/tests/src/test/scala/whisk/common/ConfigTests.scala
+++ b/tests/src/test/scala/whisk/common/ConfigTests.scala
@@ -28,7 +28,7 @@ import common.StreamLogging
class ConfigTests extends FlatSpec with Matchers with StreamLogging {
"Config" should "gets default value" in {
- val config = new Config(Map("a" -> "A"))(Map())
+ val config = new Config(Map("a" -> "A"))(Map.empty)
assert(config.isValid && config("a") == "A")
}
@@ -38,12 +38,12 @@ class ConfigTests extends FlatSpec with Matchers with StreamLogging {
}
it should "not be valid when environment does not provide value" in {
- val config = new Config(Map("a" -> null))(Map())
+ val config = new Config(Map("a" -> null))(Map.empty)
assert(!config.isValid && config("a") == null)
}
it should "be invalid if same property is required and optional and still not defined" in {
- val config = new Config(Map("a" -> null), optionalProperties = Set("a"))(Map())
+ val config = new Config(Map("a" -> null), optionalProperties = Set("a"))(Map.empty)
assert(!config.isValid)
}
diff --git a/tests/src/test/scala/whisk/core/WhiskConfigTests.scala b/tests/src/test/scala/whisk/core/WhiskConfigTests.scala
index f75f658501..bf02990fb5 100644
--- a/tests/src/test/scala/whisk/core/WhiskConfigTests.scala
+++ b/tests/src/test/scala/whisk/core/WhiskConfigTests.scala
@@ -47,7 +47,7 @@ class WhiskConfigTests extends FlatSpec with Matchers with StreamLogging {
bw.write("a=A\n")
bw.close()
- val config = new WhiskConfig(Map("a" -> null), Set(), file)
+ val config = new WhiskConfig(Map("a" -> null), Set.empty, file)
assert(config.isValid && config("a") == "A")
}
@@ -59,7 +59,7 @@ class WhiskConfigTests extends FlatSpec with Matchers with StreamLogging {
bw.write("a=A\n")
bw.close()
- val config = new WhiskConfig(Map("a" -> null, "b" -> null), Set(), file)
+ val config = new WhiskConfig(Map("a" -> null, "b" -> null), Set.empty, file)
assert(!config.isValid && config("b") == null)
}
@@ -73,7 +73,7 @@ class WhiskConfigTests extends FlatSpec with Matchers with StreamLogging {
bw.write("c=C\n")
bw.close()
- val config = new WhiskConfig(Map("a" -> null, "b" -> "???"), Set("c", "d"), file, env = Map())
+ val config = new WhiskConfig(Map("a" -> null, "b" -> "???"), Set("c", "d"), file, env = Map.empty)
assert(config.isValid && config("a") == "A" && config("b") == "B")
assert(config("c") == "C")
assert(config("d") == "")
diff --git a/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala b/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala
index 23209087c6..a92bcdfcd7 100644
--- a/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala
+++ b/tests/src/test/scala/whisk/core/cli/test/WskRestBasicUsageTests.scala
@@ -232,7 +232,7 @@ class WskRestBasicUsageTests extends TestHelpers with WskTestHelpers with WskAct
activation.response.status shouldBe ActivationResponse.messageForCode(ActivationResponse.Success)
activation.response.success shouldBe true
activation.response.result shouldBe Some(JsObject.empty)
- activation.logs shouldBe Some(List())
+ activation.logs shouldBe Some(List.empty)
activation.annotations shouldBe defined
}
}
diff --git a/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerClientTests.scala b/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerClientTests.scala
index 909387932d..200bc993b5 100644
--- a/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerClientTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerClientTests.scala
@@ -346,7 +346,7 @@ class DockerClientTests
stderr =
"""/usr/bin/docker: Error response from daemon: mkdir /var/run/docker.1.1/libcontainerd.1.1/55db56ee082239428b27d3728b4dd324c09068458aad9825727d5bfc1bba6d52: no space left on device."""))
}
- val bdc = the[BrokenDockerContainer] thrownBy await(dc.run("image", Seq()))
+ val bdc = the[BrokenDockerContainer] thrownBy await(dc.run("image", Seq.empty))
bdc.id shouldBe id
}
@@ -354,7 +354,7 @@ class DockerClientTests
def runAndVerify(pre: ProcessRunningException, clue: String) = {
val dc = dockerClient { Future.failed(pre) }
withClue(s"${clue} - exitCode = ${pre.exitCode}, stdout = '${pre.stdout}', stderr = '${pre.stderr}': ") {
- the[ProcessRunningException] thrownBy await(dc.run("image", Seq())) shouldBe pre
+ the[ProcessRunningException] thrownBy await(dc.run("image", Seq.empty)) shouldBe pre
}
}
diff --git a/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerContainerFactoryTests.scala b/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerContainerFactoryTests.scala
index e6aa3edb33..306b94605c 100644
--- a/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerContainerFactoryTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerContainerFactoryTests.scala
@@ -105,7 +105,7 @@ class DockerContainerFactoryTests
val factory =
new DockerContainerFactory(
InvokerInstanceId(0),
- Map(),
+ Map.empty,
ContainerArgsConfig("net1", Seq("dns1", "dns2"), Map("env" -> Set("e1", "e2"))),
DockerContainerFactoryConfig(true))(actorSystem, executionContext, logging, dockerApiStub, mock[RuncApi])
diff --git a/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerContainerTests.scala b/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerContainerTests.scala
index a7080af784..1f2ab3245c 100644
--- a/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerContainerTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/docker/test/DockerContainerTests.scala
@@ -806,7 +806,7 @@ class DockerContainerTests
Future.successful(())
}
- 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]] = ???
def pull(image: String)(implicit transid: TransactionId): Future[Unit] = {
diff --git a/tests/src/test/scala/whisk/core/containerpool/logging/ElasticSearchLogStoreTests.scala b/tests/src/test/scala/whisk/core/containerpool/logging/ElasticSearchLogStoreTests.scala
index 91db374f43..8930a43177 100644
--- a/tests/src/test/scala/whisk/core/containerpool/logging/ElasticSearchLogStoreTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/logging/ElasticSearchLogStoreTests.scala
@@ -54,7 +54,7 @@ class ElasticSearchLogStoreTests
private val uuid = UUID()
private val user =
- Identity(Subject(), Namespace(EntityName("testSpace"), uuid), BasicAuthenticationAuthKey(uuid, Secret()), Set())
+ Identity(Subject(), Namespace(EntityName("testSpace"), uuid), BasicAuthenticationAuthKey(uuid, Secret()), Set.empty)
private val activationId = ActivationId.generate()
private val defaultLogSchema =
diff --git a/tests/src/test/scala/whisk/core/containerpool/logging/LogDriverLogStoreTests.scala b/tests/src/test/scala/whisk/core/containerpool/logging/LogDriverLogStoreTests.scala
index 5fa2266a16..1bd784b0c1 100644
--- a/tests/src/test/scala/whisk/core/containerpool/logging/LogDriverLogStoreTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/logging/LogDriverLogStoreTests.scala
@@ -36,6 +36,6 @@ class LogDriverLogStoreTests extends TestKit(ActorSystem("LogDriverLogStore")) w
it should "set the container parameters from the config" in {
val logDriverLogStore = new LogDriverLogStore(system)
- logDriverLogStore.containerParameters shouldBe Map()
+ logDriverLogStore.containerParameters shouldBe Map.empty
}
}
diff --git a/tests/src/test/scala/whisk/core/containerpool/logging/SplunkLogStoreTests.scala b/tests/src/test/scala/whisk/core/containerpool/logging/SplunkLogStoreTests.scala
index b149417563..e2bd8db792 100644
--- a/tests/src/test/scala/whisk/core/containerpool/logging/SplunkLogStoreTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/logging/SplunkLogStoreTests.scala
@@ -70,7 +70,7 @@ class SplunkLogStoreTests
val endTimePlus5 = "2007-12-03T10:15:50Z" //queried end time range is endTime+5
val uuid = UUID()
val user =
- Identity(Subject(), Namespace(EntityName("testSpace"), uuid), BasicAuthenticationAuthKey(uuid, Secret()), Set())
+ Identity(Subject(), Namespace(EntityName("testSpace"), uuid), BasicAuthenticationAuthKey(uuid, Secret()), Set.empty)
val request = HttpRequest(
method = POST,
uri = "https://some.url",
diff --git a/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationLogStoreTests.scala b/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationLogStoreTests.scala
index 2de354363f..542d1b1053 100644
--- a/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationLogStoreTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/logging/test/DockerToActivationLogStoreTests.scala
@@ -41,7 +41,7 @@ class DockerToActivationLogStoreTests extends FlatSpec with Matchers with WskAct
val uuid = UUID()
val user =
- Identity(Subject(), Namespace(EntityName("testSpace"), uuid), BasicAuthenticationAuthKey(uuid, Secret()), Set())
+ Identity(Subject(), Namespace(EntityName("testSpace"), uuid), BasicAuthenticationAuthKey(uuid, Secret()), Set.empty)
val exec = CodeExecAsString(RuntimeManifest("actionKind", ImageName("testImage")), "testCode", None)
val action = ExecutableWhiskAction(user.namespace.name.toPath, EntityName("actionName"), exec)
val activation =
diff --git a/tests/src/test/scala/whisk/core/containerpool/mesos/test/MesosContainerFactoryTest.scala b/tests/src/test/scala/whisk/core/containerpool/mesos/test/MesosContainerFactoryTest.scala
index b686d568df..73ca88e5b3 100644
--- a/tests/src/test/scala/whisk/core/containerpool/mesos/test/MesosContainerFactoryTest.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/mesos/test/MesosContainerFactoryTest.scala
@@ -91,7 +91,7 @@ class MesosContainerFactoryTest
behavior of "MesosContainerFactory"
it should "send Subscribe on init" in {
- val wskConfig = new WhiskConfig(Map())
+ val wskConfig = new WhiskConfig(Map.empty)
val mesosConfig = MesosConfig("http://master:5050", None, "*", 0.seconds, true, Seq.empty, " ", Seq.empty, true)
new MesosContainerFactory(
wskConfig,
@@ -240,7 +240,7 @@ class MesosContainerFactoryTest
system,
logging,
Map("--arg1" -> Set("v1", "v2"), "--arg2" -> Set("v3", "v4"), "other" -> Set("v5", "v6")),
- new ContainerArgsConfig("bridge", Seq(), Map("extra1" -> Set("e1", "e2"), "extra2" -> Set("e3", "e4"))),
+ new ContainerArgsConfig("bridge", Seq.empty, Map("extra1" -> Set("e1", "e2"), "extra2" -> Set("e3", "e4"))),
mesosConfig,
(system, mesosConfig) => probe.testActor,
testTaskId)
diff --git a/tests/src/test/scala/whisk/core/containerpool/test/ContainerPoolTests.scala b/tests/src/test/scala/whisk/core/containerpool/test/ContainerPoolTests.scala
index 3de575d057..20bd353517 100644
--- a/tests/src/test/scala/whisk/core/containerpool/test/ContainerPoolTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/test/ContainerPoolTests.scala
@@ -76,7 +76,7 @@ class ContainerPoolTests
TransactionId.testing,
action.fullyQualifiedName(true),
action.rev,
- Identity(Subject(), Namespace(invocationNamespace, uuid), BasicAuthenticationAuthKey(uuid, Secret()), Set()),
+ Identity(Subject(), Namespace(invocationNamespace, uuid), BasicAuthenticationAuthKey(uuid, Secret()), Set.empty),
ActivationId.generate(),
ControllerInstanceId("0"),
blocking = false,
@@ -353,7 +353,7 @@ class ContainerPoolObjectTests extends FlatSpec with Matchers with MockFactory {
behavior of "ContainerPool schedule()"
it should "not provide a container if idle pool is empty" in {
- ContainerPool.schedule(createAction(), standardNamespace, Map()) shouldBe None
+ ContainerPool.schedule(createAction(), standardNamespace, Map.empty) shouldBe None
}
it should "reuse an applicable warm container from idle pool with one container" in {
@@ -419,7 +419,7 @@ class ContainerPoolObjectTests extends FlatSpec with Matchers with MockFactory {
behavior of "ContainerPool remove()"
it should "not provide a container if pool is empty" in {
- ContainerPool.remove(Map()) shouldBe None
+ ContainerPool.remove(Map.empty) shouldBe None
}
it should "not provide a container from busy pool with non-warm containers" in {
diff --git a/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala b/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala
index 25b0303271..e635b5fcf5 100644
--- a/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala
+++ b/tests/src/test/scala/whisk/core/containerpool/test/ContainerProxyTests.scala
@@ -85,7 +85,7 @@ class ContainerProxyTests
messageTransId,
action.fullyQualifiedName(true),
action.rev,
- Identity(Subject(), Namespace(invocationNamespace, uuid), BasicAuthenticationAuthKey(uuid, Secret()), Set()),
+ Identity(Subject(), Namespace(invocationNamespace, uuid), BasicAuthenticationAuthKey(uuid, Secret()), Set.empty),
ActivationId.generate(),
ControllerInstanceId("0"),
blocking = false,
diff --git a/tests/src/test/scala/whisk/core/controller/test/ConductorsApiTests.scala b/tests/src/test/scala/whisk/core/controller/test/ConductorsApiTests.scala
index a93436b4f6..d8ac1ee8bd 100644
--- a/tests/src/test/scala/whisk/core/controller/test/ConductorsApiTests.scala
+++ b/tests/src/test/scala/whisk/core/controller/test/ConductorsApiTests.scala
@@ -348,10 +348,10 @@ class ConductorsApiTests extends ControllerTestCommon with WhiskActionsApi {
else {
val action = args.fields.get("action") map { action =>
Map("action" -> action)
- } getOrElse Map()
+ } getOrElse Map.empty
val state = args.fields.get("state") map { state =>
Map("state" -> state)
- } getOrElse Map()
+ } getOrElse Map.empty
val wrappedParams = args.fields.getOrElse("params", JsObject.empty).asJsObject.fields
val escapedParams = args.fields - "action" - "state" - "params"
val params = Map("params" -> JsObject(wrappedParams ++ escapedParams))
diff --git a/tests/src/test/scala/whisk/core/controller/test/PackagesApiTests.scala b/tests/src/test/scala/whisk/core/controller/test/PackagesApiTests.scala
index 890cee7656..88ad062738 100644
--- a/tests/src/test/scala/whisk/core/controller/test/PackagesApiTests.scala
+++ b/tests/src/test/scala/whisk/core/controller/test/PackagesApiTests.scala
@@ -101,7 +101,7 @@ class PackagesApiTests extends ControllerTestCommon with WhiskPackagesApi {
checkCount(path, 0, auser)
Get(path) ~> Route.seal(routes(auser)) ~> check {
val response = responseAs[List[JsObject]]
- response should be(List()) // cannot list packages that are private in another namespace
+ response should be(List.empty) // cannot list packages that are private in another namespace
}
}
}
diff --git a/tests/src/test/scala/whisk/core/controller/test/SequenceApiTests.scala b/tests/src/test/scala/whisk/core/controller/test/SequenceApiTests.scala
index 5bc1996300..0e42d45e6e 100644
--- a/tests/src/test/scala/whisk/core/controller/test/SequenceApiTests.scala
+++ b/tests/src/test/scala/whisk/core/controller/test/SequenceApiTests.scala
@@ -101,7 +101,7 @@ class SequenceApiTests extends ControllerTestCommon with WhiskActionsApi {
implicit val tid = transid()
val seqName = s"${aname()}_no_component"
// create exec sequence with no component
- val content = WhiskActionPut(Some(sequence(Vector())))
+ val content = WhiskActionPut(Some(sequence(Vector.empty)))
// create an action sequence
Put(s"$collectionPath/$seqName", content) ~> Route.seal(routes(creds)) ~> check {
@@ -117,7 +117,7 @@ class SequenceApiTests extends ControllerTestCommon with WhiskActionsApi {
val components = Vector("a", "b")
putSimpleSequenceInDB(seqName, namespace, components)
// update sequence with no component
- val updateContent = WhiskActionPut(Some(sequence(Vector())))
+ val updateContent = WhiskActionPut(Some(sequence(Vector.empty)))
// create an action sequence
Put(s"$collectionPath/$seqName?overwrite=true", updateContent) ~> Route.seal(routes(creds)) ~> check {
diff --git a/tests/src/test/scala/whisk/core/controller/test/WebActionsApiTests.scala b/tests/src/test/scala/whisk/core/controller/test/WebActionsApiTests.scala
index b500fce265..e74fbc2772 100644
--- a/tests/src/test/scala/whisk/core/controller/test/WebActionsApiTests.scala
+++ b/tests/src/test/scala/whisk/core/controller/test/WebActionsApiTests.scala
@@ -312,7 +312,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac
path: String = "",
body: Option[JsObject] = None,
pkgName: String = null,
- headers: List[HttpHeader] = List()) = {
+ headers: List[HttpHeader] = List.empty) = {
val packageActionParams = Option(pkgName)
.filter(_ != null)
.flatMap(n => packages.find(_.name == EntityName(n)))
@@ -323,7 +323,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac
Some {
JsObject(
params.fields ++
- body.map(_.fields).getOrElse(Map()) ++
+ body.map(_.fields).getOrElse(Map.empty) ++
Context(webApiDirectives, HttpMethods.getForKey(method.toUpperCase).get, headers, path, Query.Empty)
.metadata(identity))
}
@@ -539,7 +539,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac
it should s"invoke action which receives an empty entity (auth? ${creds.isDefined})" in {
implicit val tid = transid()
- Seq("", JsArray().compactPrint, JsObject.empty.compactPrint, JsNull.compactPrint).foreach { arg =>
+ Seq("", JsArray.empty.compactPrint, JsObject.empty.compactPrint, JsNull.compactPrint).foreach { arg =>
Seq(s"$systemId/proxy/export_c.json").foreach { path =>
allowedMethodsWithEntity.foreach { m =>
invocationsAllowed += 1
diff --git a/tests/src/test/scala/whisk/core/database/test/DocumentHandlerTests.scala b/tests/src/test/scala/whisk/core/database/test/DocumentHandlerTests.scala
index f4f7e273fa..e5765f7e7b 100644
--- a/tests/src/test/scala/whisk/core/database/test/DocumentHandlerTests.scala
+++ b/tests/src/test/scala/whisk/core/database/test/DocumentHandlerTests.scala
@@ -189,7 +189,7 @@ class DocumentHandlerTests extends FlatSpec with Matchers with ScalaFutures with
Set("namespace", "name", "version", "publish", "annotations", "updated")
intercept[UnsupportedView] {
- WhisksHandler.fieldsRequiredForView("foo", "unknown") shouldBe Set()
+ WhisksHandler.fieldsRequiredForView("foo", "unknown") shouldBe Set.empty
}
}
diff --git a/tests/src/test/scala/whisk/core/database/test/ReplicatorTests.scala b/tests/src/test/scala/whisk/core/database/test/ReplicatorTests.scala
index 6713e09ef4..c585f4a6df 100644
--- a/tests/src/test/scala/whisk/core/database/test/ReplicatorTests.scala
+++ b/tests/src/test/scala/whisk/core/database/test/ReplicatorTests.scala
@@ -75,8 +75,8 @@ class ReplicatorTests
dbPrefix: String,
expires: FiniteDuration,
continuous: Boolean = false,
- exclude: List[String] = List(),
- excludeBaseName: List[String] = List()) = {
+ exclude: List[String] = List.empty,
+ excludeBaseName: List[String] = List.empty) = {
println(
s"Running replicator: $sourceDbUrl, $targetDbUrl, $dbPrefix, $expires, $continuous, $exclude, $excludeBaseName")
diff --git a/tests/src/test/scala/whisk/core/invoker/test/NamespaceBlacklistTests.scala b/tests/src/test/scala/whisk/core/invoker/test/NamespaceBlacklistTests.scala
index 89afd07fda..033678cf2e 100644
--- a/tests/src/test/scala/whisk/core/invoker/test/NamespaceBlacklistTests.scala
+++ b/tests/src/test/scala/whisk/core/invoker/test/NamespaceBlacklistTests.scala
@@ -99,7 +99,7 @@ class NamespaceBlacklistTests
def authToIdentities(auth: WhiskAuth): Set[Identity] = {
auth.namespaces.map { ns =>
- Identity(auth.subject, ns.namespace, ns.authkey, Set(), UserLimits())
+ Identity(auth.subject, ns.namespace, ns.authkey, Set.empty, UserLimits())
}
}
diff --git a/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala b/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala
index 9580d2da94..bd78db3c1c 100644
--- a/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala
+++ b/tests/src/test/scala/whisk/core/limits/ActionLimitsTests.scala
@@ -375,7 +375,7 @@ class ActionLimitsTests extends TestHelpers with WskTestHelpers with WskActorSys
n.toInt should be >= minExpectedOpenFiles
activation.logs
- .getOrElse(List())
+ .getOrElse(List.empty)
.count(_.contains("ERROR: opened files = ")) shouldBe 1
}
}
diff --git a/tests/src/test/scala/whisk/core/loadBalancer/test/ShardingContainerPoolBalancerTests.scala b/tests/src/test/scala/whisk/core/loadBalancer/test/ShardingContainerPoolBalancerTests.scala
index 2ba4dd60a9..4e906d0144 100644
--- a/tests/src/test/scala/whisk/core/loadBalancer/test/ShardingContainerPoolBalancerTests.scala
+++ b/tests/src/test/scala/whisk/core/loadBalancer/test/ShardingContainerPoolBalancerTests.scala
@@ -54,8 +54,8 @@ class ShardingContainerPoolBalancerTests extends FlatSpec with Matchers with Str
state.blackboxInvokers shouldBe 'empty
state.managedInvokers shouldBe 'empty
state.invokerSlots shouldBe 'empty
- state.managedStepSizes shouldBe Seq()
- state.blackboxStepSizes shouldBe Seq()
+ state.managedStepSizes shouldBe Seq.empty
+ state.blackboxStepSizes shouldBe Seq.empty
// apply one update, verify everything is updated accordingly
val update1 = IndexedSeq(healthy(0))
@@ -213,8 +213,8 @@ class ShardingContainerPoolBalancerTests extends FlatSpec with Matchers with Str
behavior of "pairwiseCoprimeNumbersUntil"
it should "return an empty set for malformed inputs" in {
- ShardingContainerPoolBalancer.pairwiseCoprimeNumbersUntil(0) shouldBe Seq()
- ShardingContainerPoolBalancer.pairwiseCoprimeNumbersUntil(-1) shouldBe Seq()
+ ShardingContainerPoolBalancer.pairwiseCoprimeNumbersUntil(0) shouldBe Seq.empty
+ ShardingContainerPoolBalancer.pairwiseCoprimeNumbersUntil(-1) shouldBe Seq.empty
}
it should "return all coprime numbers until the number given" in {
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services