This is an automated email from the ASF dual-hosted git repository. markusthoemmes 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 bd7d847 Replace JsBoolean with JsTrue and JsFalse. (#4427) bd7d847 is described below commit bd7d847ae26475dff4561717141765479cbc33ec Author: Song Kun <songkun...@gmail.com> AuthorDate: Wed Apr 3 16:28:26 2019 +0800 Replace JsBoolean with JsTrue and JsFalse. (#4427) --- .../openwhisk/core/entity/WhiskPackage.scala | 2 +- .../core/controller/actions/PrimitiveActions.scala | 2 +- .../actionContainers/BasicActionRunnerTests.scala | 2 +- .../openwhisk/core/cli/test/TestJsonArgs.scala | 18 +++++++--------- .../core/controller/test/ActionsApiTests.scala | 2 +- .../core/controller/test/WebActionsApiTests.scala | 20 +++++++++--------- .../openwhisk/core/entity/test/SchemaTests.scala | 4 ++-- .../scala/system/basic/WskRestBasicTests.scala | 24 +++++++++++----------- 8 files changed, 35 insertions(+), 39 deletions(-) diff --git a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskPackage.scala b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskPackage.scala index 984f184..d865dd8 100644 --- a/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskPackage.scala +++ b/common/scala/src/main/scala/org/apache/openwhisk/core/entity/WhiskPackage.scala @@ -138,7 +138,7 @@ case class WhiskPackage(namespace: EntityPath, override def summaryAsJson = { JsObject( super.summaryAsJson.fields + - (WhiskPackage.bindingFieldName -> binding.map(Binding.serdes.write(_)).getOrElse(JsBoolean(false)))) + (WhiskPackage.bindingFieldName -> binding.map(Binding.serdes.write(_)).getOrElse(JsFalse))) } } diff --git a/core/controller/src/main/scala/org/apache/openwhisk/core/controller/actions/PrimitiveActions.scala b/core/controller/src/main/scala/org/apache/openwhisk/core/controller/actions/PrimitiveActions.scala index 8338256..bf65e61 100644 --- a/core/controller/src/main/scala/org/apache/openwhisk/core/controller/actions/PrimitiveActions.scala +++ b/core/controller/src/main/scala/org/apache/openwhisk/core/controller/actions/PrimitiveActions.scala @@ -557,7 +557,7 @@ protected[actions] trait PrimitiveActions { annotations = Parameters(WhiskActivation.topmostAnnotation, JsBoolean(session.cause.isEmpty)) ++ Parameters(WhiskActivation.pathAnnotation, JsString(session.action.fullyQualifiedName(false).asString)) ++ Parameters(WhiskActivation.kindAnnotation, JsString(Exec.SEQUENCE)) ++ - Parameters(WhiskActivation.conductorAnnotation, JsBoolean(true)) ++ + Parameters(WhiskActivation.conductorAnnotation, JsTrue) ++ causedBy ++ sequenceLimits, duration = Some(session.duration)) diff --git a/tests/src/test/scala/actionContainers/BasicActionRunnerTests.scala b/tests/src/test/scala/actionContainers/BasicActionRunnerTests.scala index 4b3d893..bad70d6 100644 --- a/tests/src/test/scala/actionContainers/BasicActionRunnerTests.scala +++ b/tests/src/test/scala/actionContainers/BasicActionRunnerTests.scala @@ -221,7 +221,7 @@ trait BasicActionRunnerTests extends ActionProxyContainerTestUtils { JsObject("string" -> JsString("hello")), JsObject("string" -> JsString("❄ ☃ ❄")), JsObject("numbers" -> JsArray(JsNumber(42), JsNumber(1))), - // JsObject("boolean" -> JsBoolean(true)), // fails with swift3 returning boolean: 1 + // JsObject("boolean" -> JsTrue), // fails with swift3 returning boolean: 1 JsObject("object" -> JsObject("a" -> JsString("A")))) val (out, err) = withActionContainer() { c => diff --git a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/TestJsonArgs.scala b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/TestJsonArgs.scala index 7bf50c7..6e50881 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/cli/test/TestJsonArgs.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/cli/test/TestJsonArgs.scala @@ -17,11 +17,7 @@ package org.apache.openwhisk.core.cli.test -import spray.json.JsObject -import spray.json.JsArray -import spray.json.JsString -import spray.json.JsNumber -import spray.json.JsBoolean +import spray.json._ object TestJsonArgs { @@ -36,7 +32,7 @@ object TestJsonArgs { def getJSONFileOutput() = JsArray( JsObject("key" -> JsString("a key"), "value" -> JsString("a value")), - JsObject("key" -> JsString("a bool"), "value" -> JsBoolean(true)), + JsObject("key" -> JsString("a bool"), "value" -> JsTrue), JsObject("key" -> JsString("objKey"), "value" -> JsObject("b" -> JsString("c"))), JsObject( "key" -> JsString("objKey2"), @@ -46,7 +42,7 @@ object TestJsonArgs { "value" -> JsObject("json object" -> JsObject("some int" -> JsNumber(1111)))), JsObject("key" -> JsString("a number arr"), "value" -> JsArray(JsNumber(1), JsNumber(2), JsNumber(3))), JsObject("key" -> JsString("a string arr"), "value" -> JsArray(JsString("1"), JsString("2"), JsString("3"))), - JsObject("key" -> JsString("a bool arr"), "value" -> JsArray(JsBoolean(true), JsBoolean(false), JsBoolean(true))), + JsObject("key" -> JsString("a bool arr"), "value" -> JsArray(JsTrue, JsFalse, JsTrue)), JsObject("key" -> JsString("strThatLooksLikeJSON"), "value" -> JsString("{\"someKey\": \"someValue\"}"))) def getEscapedJSONTestArgInput() = @@ -70,7 +66,7 @@ object TestJsonArgs { JsObject( "key" -> JsString("objArr"), "value" -> JsArray( - JsObject("name" -> JsString("someName"), "required" -> JsBoolean(true)), + JsObject("name" -> JsString("someName"), "required" -> JsTrue), JsObject("name" -> JsString("events"), "count" -> JsNumber(10)))), JsObject("key" -> JsString("strArr"), "value" -> JsArray(JsString("44"), JsString("55"))), JsObject("key" -> JsString("string"), "value" -> JsString("This is a string")), @@ -81,7 +77,7 @@ object TestJsonArgs { "objString" -> JsString("aString"), "objStrNum" -> JsString("123"), "objNum" -> JsNumber(300), - "objBool" -> JsBoolean(false), + "objBool" -> JsFalse, "objNumArr" -> JsArray(JsNumber(1), JsNumber(2)), "objStrArr" -> JsArray(JsString("1"), JsString("2")))), JsObject("key" -> JsString("strNum"), "value" -> JsString("9"))) @@ -95,13 +91,13 @@ object TestJsonArgs { "numArr" -> JsArray(JsNumber(44), JsNumber(55)), "strArr" -> JsArray(JsString("44"), JsString("55")), "objArr" -> JsArray( - JsObject("name" -> JsString("someName"), "required" -> JsBoolean(true)), + JsObject("name" -> JsString("someName"), "required" -> JsTrue), JsObject("name" -> JsString("events"), "count" -> JsNumber(10))), "object" -> JsObject( "objString" -> JsString("aString"), "objStrNum" -> JsString("123"), "objNum" -> JsNumber(300), - "objBool" -> JsBoolean(false), + "objBool" -> JsFalse, "objNumArr" -> JsArray(JsNumber(1), JsNumber(2)), "objStrArr" -> JsArray(JsString("1"), JsString("2")))) } diff --git a/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ActionsApiTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ActionsApiTests.scala index 7851181..69f617f 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ActionsApiTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/controller/test/ActionsApiTests.scala @@ -1381,7 +1381,7 @@ class ActionsApiTests extends ControllerTestCommon with WhiskActionsApi { it should "not invoke an action when final parameters are redefined" in { implicit val tid = transid() - val annotations = Parameters(WhiskAction.finalParamsAnnotationName, JsBoolean(true)) + val annotations = Parameters(WhiskAction.finalParamsAnnotationName, JsTrue) val parameters = Parameters("a", "A") ++ Parameters("empty", JsNull) val action = WhiskAction(namespace, aname(), jsDefault("??"), parameters = parameters, annotations = annotations) put(entityStore, action) diff --git a/tests/src/test/scala/org/apache/openwhisk/core/controller/test/WebActionsApiTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/controller/test/WebActionsApiTests.scala index 594e9a2..56f2006 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/controller/test/WebActionsApiTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/controller/test/WebActionsApiTests.scala @@ -210,7 +210,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac requireAuthentication: Boolean = false, requireAuthenticationAsBoolean: Boolean = true) = { - val annotations = Parameters(WhiskAction.finalParamsAnnotationName, JsBoolean(true)) + val annotations = Parameters(WhiskAction.finalParamsAnnotationName, JsTrue) WhiskAction( namespace, name, @@ -219,29 +219,29 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac annotations = { if (name.asString.startsWith("export_")) { annotations ++ - Parameters("web-export", JsBoolean(true)) ++ { + Parameters("web-export", JsTrue) ++ { if (requireAuthentication) { Parameters( "require-whisk-auth", - (if (requireAuthenticationAsBoolean) JsBoolean(true) else JsString(requireAuthenticationKey))) + (if (requireAuthenticationAsBoolean) JsTrue else JsString(requireAuthenticationKey))) } else Parameters() } ++ { if (customOptions) { - Parameters("web-custom-options", JsBoolean(true)) + Parameters("web-custom-options", JsTrue) } else Parameters() } } else if (name.asString.startsWith("raw_export_")) { annotations ++ - Parameters("web-export", JsBoolean(true)) ++ - Parameters("raw-http", JsBoolean(true)) ++ { + Parameters("web-export", JsTrue) ++ + Parameters("raw-http", JsTrue) ++ { if (requireAuthentication) { Parameters( "require-whisk-auth", - (if (requireAuthenticationAsBoolean) JsBoolean(true) else JsString(requireAuthenticationKey))) + (if (requireAuthenticationAsBoolean) JsTrue else JsString(requireAuthenticationKey))) } else Parameters() } ++ { if (customOptions) { - Parameters("web-custom-options", JsBoolean(true)) + Parameters("web-custom-options", JsTrue) } else Parameters() } } else annotations @@ -710,7 +710,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac EntityPath(systemId.asString), aname(), provider.bind, - annotations = Parameters("web-export", JsBoolean(false))) + annotations = Parameters("web-export", JsFalse)) val action = stubAction(provider.fullPath, EntityName("export_c")) put(entityStore, provider) @@ -1035,7 +1035,7 @@ trait WebActionsApiBaseTests extends ControllerTestCommon with BeforeAndAfterEac it should s"handle all JSON values with .text extension (auth? ${creds.isDefined})" in { implicit val tid = transid() - Seq(JsObject("a" -> "A".toJson), JsArray("a".toJson), JsString("a"), JsBoolean(true), JsNumber(1), JsNull) + Seq(JsObject("a" -> "A".toJson), JsArray("a".toJson), JsString("a"), JsTrue, JsNumber(1), JsNull) .foreach { jsval => val path = s"$systemId/proxy/export_c.text/res" allowedMethods.foreach { m => diff --git a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala index c2fbea5..468a409 100644 --- a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala +++ b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala @@ -416,7 +416,7 @@ class SchemaTests extends FlatSpec with BeforeAndAfter with ExecHelpers with Mat "binding" -> JsObject.empty, "parameters" -> Parameters().toJson, "version" -> SemVer().toJson, - "publish" -> JsBoolean(false), + "publish" -> JsFalse, "annotations" -> Parameters().toJson) } @@ -428,7 +428,7 @@ class SchemaTests extends FlatSpec with BeforeAndAfter with ExecHelpers with Mat "binding" -> JsObject("namespace" -> "x".toJson, "name" -> "y".toJson), "parameters" -> Parameters().toJson, "version" -> SemVer().toJson, - "publish" -> JsBoolean(false), + "publish" -> JsFalse, "annotations" -> Parameters().toJson) //val legacyPkgAsJson = JsObject(pkgAsJson.fields + ("binding" -> JsObject("namespace" -> "x".toJson, "name" -> "y".toJson))) WhiskPackage.serdes.write(pkg) shouldBe pkgAsJson diff --git a/tests/src/test/scala/system/basic/WskRestBasicTests.scala b/tests/src/test/scala/system/basic/WskRestBasicTests.scala index 86c35c6..9d3d4d5 100644 --- a/tests/src/test/scala/system/basic/WskRestBasicTests.scala +++ b/tests/src/test/scala/system/basic/WskRestBasicTests.scala @@ -93,7 +93,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys p.getField("version") shouldBe "0.0.2" p }) - pack.getFieldJsValue("publish") shouldBe JsBoolean(true) + pack.getFieldJsValue("publish") shouldBe JsTrue pack.getFieldJsValue("parameters") shouldBe JsArray(JsObject("key" -> JsString("a"), "value" -> JsString("A"))) val packageList = wsk.pkg.list() val packages = packageList.getBodyListJsObject @@ -200,7 +200,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys result.getField("namespace") shouldBe ns result.getField("name") shouldBe name result.getField("version") shouldBe "0.0.1" - result.getFieldJsValue("publish") shouldBe JsBoolean(false) + result.getFieldJsValue("publish") shouldBe JsFalse result.getFieldJsValue("binding") shouldBe JsObject.empty result.getField("invalid") shouldBe "" } @@ -257,7 +257,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys a }) action.getFieldJsValue("parameters") shouldBe JsArray(JsObject("key" -> JsString("b"), "value" -> JsString("B"))) - action.getFieldJsValue("publish") shouldBe JsBoolean(false) + action.getFieldJsValue("publish") shouldBe JsFalse val actionList = wsk.action.list() val actions = actionList.getBodyListJsObject actions.exists(action => RestResult.getField(action, "name") == name) shouldBe true @@ -361,7 +361,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys val result = wsk.action.get(name) result.getField("name") shouldBe name result.getField("namespace") shouldBe ns - result.getFieldJsValue("publish") shouldBe JsBoolean(false) + result.getFieldJsValue("publish") shouldBe JsFalse result.getField("version") shouldBe "0.0.1" val exec = result.getFieldJsObject("exec") RestResult.getField(exec, "kind") shouldBe "nodejs:6" @@ -588,7 +588,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys t }) trigger.getFieldJsValue("parameters") shouldBe JsArray(JsObject("key" -> JsString("a"), "value" -> JsString("A"))) - trigger.getFieldJsValue("publish") shouldBe JsBoolean(false) + trigger.getFieldJsValue("publish") shouldBe JsFalse val expectedRules = JsObject( ns + "/" + ruleName -> JsObject( @@ -612,7 +612,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys JsObject( "statusCode" -> JsNumber(0), "activationId" -> JsString(ruleActivationId), - "success" -> JsBoolean(true), + "success" -> JsTrue, "rule" -> JsString(ns + "/" + ruleName), "action" -> JsString(ns + "/" + actionName))) logs shouldBe expectedLogs @@ -711,7 +711,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys result.getField("namespace") shouldBe ns result.getField("name") shouldBe name result.getField("version") shouldBe "0.0.1" - result.getFieldJsValue("publish") shouldBe JsBoolean(false) + result.getFieldJsValue("publish") shouldBe JsFalse result.getFieldJsValue("annotations").toString shouldBe "[]" result.getFieldJsValue("parameters") shouldBe JsArray( JsObject("key" -> JsString("payload"), "value" -> JsString("test"))) @@ -818,12 +818,12 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys JsObject( "statusCode" -> JsNumber(0), "activationId" -> JsString(ruleActivationId), - "success" -> JsBoolean(true), + "success" -> JsTrue, "rule" -> JsString(ns + "/" + ruleName1), "action" -> JsString(ns + "/" + actionName1)), JsObject( "statusCode" -> JsNumber(1), - "success" -> JsBoolean(false), + "success" -> JsFalse, "error" -> JsString("The requested resource does not exist."), "rule" -> JsString(ns + "/" + ruleName2), "action" -> JsString(ns + "/" + actionName2))) @@ -879,12 +879,12 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys JsObject( "statusCode" -> JsNumber(0), "activationId" -> JsString(ruleActivationId), - "success" -> JsBoolean(true), + "success" -> JsTrue, "rule" -> JsString(ns + "/" + ruleName1), "action" -> JsString(ns + "/" + actionName1)), JsObject( "statusCode" -> JsNumber(1), - "success" -> JsBoolean(false), + "success" -> JsFalse, "error" -> JsString(Messages.triggerWithInactiveRule(s"$ns/$ruleName2", s"$ns/$actionName2")), "rule" -> JsString(ns + "/" + ruleName2), "action" -> JsString(ns + "/" + actionName2))) @@ -1090,7 +1090,7 @@ class WskRestBasicTests extends TestHelpers with WskTestHelpers with WskActorSys result.getField("namespace") shouldBe ns result.getField("name") shouldBe triggerName result.getField("version") shouldBe "0.0.1" - result.getFieldJsValue("publish") shouldBe JsBoolean(false) + result.getFieldJsValue("publish") shouldBe JsFalse result.getField("subject") shouldBe ns result.getField("activationId") shouldBe activation.activationId result.getFieldJsValue("start").toString should not be JsObject.empty.toString