You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by du...@apache.org on 2018/04/16 15:46:13 UTC
[incubator-openwhisk-package-cloudant] branch master updated: Fix
spray-json import to comply with newer versions. (#168)
This is an automated email from the ASF dual-hosted git repository.
dubeejw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-cloudant.git
The following commit(s) were added to refs/heads/master by this push:
new ecacb93 Fix spray-json import to comply with newer versions. (#168)
ecacb93 is described below
commit ecacb93ff4284ce64984e8ee84db897b8a3edbb5
Author: Markus Thömmes <ma...@me.com>
AuthorDate: Mon Apr 16 17:46:10 2018 +0200
Fix spray-json import to comply with newer versions. (#168)
---
tests/src/test/scala/system/health/CloudantHealthFeedTests.scala | 6 ++----
.../test/scala/system/packages/CloudantAccountActionsTests.scala | 4 ++--
tests/src/test/scala/system/packages/CloudantBindingTests.scala | 4 ++--
.../test/scala/system/packages/CloudantDatabaseActionsTests.scala | 4 ++--
tests/src/test/scala/system/packages/CloudantFeedTests.scala | 4 ++--
.../src/test/scala/system/packages/CloudantMultiWorkersTests.scala | 4 ++--
6 files changed, 12 insertions(+), 14 deletions(-)
diff --git a/tests/src/test/scala/system/health/CloudantHealthFeedTests.scala b/tests/src/test/scala/system/health/CloudantHealthFeedTests.scala
index 4c9e0b7..a0302bf 100644
--- a/tests/src/test/scala/system/health/CloudantHealthFeedTests.scala
+++ b/tests/src/test/scala/system/health/CloudantHealthFeedTests.scala
@@ -22,10 +22,8 @@ import org.junit.runner.RunWith
import org.scalatest.{BeforeAndAfterEach, FlatSpec, Inside}
import org.scalatest.junit.JUnitRunner
import common._
-import spray.json.DefaultJsonProtocol.IntJsonFormat
-import spray.json.DefaultJsonProtocol.StringJsonFormat
-import spray.json.DefaultJsonProtocol.BooleanJsonFormat
-import spray.json.{JsObject, JsString, pimpAny}
+import spray.json.DefaultJsonProtocol._
+import spray.json._
import system.CloudantUtil
/**
diff --git a/tests/src/test/scala/system/packages/CloudantAccountActionsTests.scala b/tests/src/test/scala/system/packages/CloudantAccountActionsTests.scala
index 343de72..1abea57 100644
--- a/tests/src/test/scala/system/packages/CloudantAccountActionsTests.scala
+++ b/tests/src/test/scala/system/packages/CloudantAccountActionsTests.scala
@@ -20,8 +20,8 @@ import common._
import org.junit.runner.RunWith
import org.scalatest.FlatSpec
import org.scalatest.junit.JUnitRunner
-import spray.json.DefaultJsonProtocol.StringJsonFormat
-import spray.json.{JsArray, JsNumber, JsString, JsValue, pimpAny}
+import spray.json.DefaultJsonProtocol._
+import spray.json._
import system.CloudantUtil
import whisk.utils.JsHelpers
diff --git a/tests/src/test/scala/system/packages/CloudantBindingTests.scala b/tests/src/test/scala/system/packages/CloudantBindingTests.scala
index c619a09..52bff54 100644
--- a/tests/src/test/scala/system/packages/CloudantBindingTests.scala
+++ b/tests/src/test/scala/system/packages/CloudantBindingTests.scala
@@ -20,8 +20,8 @@ import common.{TestHelpers, Wsk, WskProps, WskTestHelpers}
import org.junit.runner.RunWith
import org.scalatest.FlatSpec
import org.scalatest.junit.JUnitRunner
-import spray.json.DefaultJsonProtocol.StringJsonFormat
-import spray.json.{JsObject, pimpAny}
+import spray.json.DefaultJsonProtocol._
+import spray.json._
import system.CloudantUtil
@RunWith(classOf[JUnitRunner])
diff --git a/tests/src/test/scala/system/packages/CloudantDatabaseActionsTests.scala b/tests/src/test/scala/system/packages/CloudantDatabaseActionsTests.scala
index 3bcbd4e..823860b 100644
--- a/tests/src/test/scala/system/packages/CloudantDatabaseActionsTests.scala
+++ b/tests/src/test/scala/system/packages/CloudantDatabaseActionsTests.scala
@@ -22,8 +22,8 @@ import common._
import org.junit.runner.RunWith
import org.scalatest.FlatSpec
import org.scalatest.junit.JUnitRunner
-import spray.json.DefaultJsonProtocol.{ByteJsonFormat, StringJsonFormat}
-import spray.json.{JsArray, JsBoolean, JsNumber, JsObject, JsString, pimpAny, pimpString}
+import spray.json.DefaultJsonProtocol._
+import spray.json._
import system.CloudantUtil
import whisk.utils.JsHelpers
diff --git a/tests/src/test/scala/system/packages/CloudantFeedTests.scala b/tests/src/test/scala/system/packages/CloudantFeedTests.scala
index 987291b..00c370a 100644
--- a/tests/src/test/scala/system/packages/CloudantFeedTests.scala
+++ b/tests/src/test/scala/system/packages/CloudantFeedTests.scala
@@ -21,8 +21,8 @@ import common._
import org.junit.runner.RunWith
import org.scalatest.{FlatSpec, Inside}
import org.scalatest.junit.JUnitRunner
-import spray.json.DefaultJsonProtocol.{IntJsonFormat, StringJsonFormat}
-import spray.json.{JsObject, JsString, pimpAny}
+import spray.json.DefaultJsonProtocol._
+import spray.json._
import system.CloudantUtil
/**
diff --git a/tests/src/test/scala/system/packages/CloudantMultiWorkersTests.scala b/tests/src/test/scala/system/packages/CloudantMultiWorkersTests.scala
index 42f3ed2..e2070ca 100644
--- a/tests/src/test/scala/system/packages/CloudantMultiWorkersTests.scala
+++ b/tests/src/test/scala/system/packages/CloudantMultiWorkersTests.scala
@@ -24,8 +24,8 @@ import common._
import org.junit.runner.RunWith
import org.scalatest.junit.JUnitRunner
import org.scalatest.{FlatSpec, Matchers}
-import spray.json.DefaultJsonProtocol.{StringJsonFormat, _}
-import spray.json.{pimpAny, _}
+import spray.json.DefaultJsonProtocol._
+import spray.json._
import system.CloudantUtil
import whisk.core.WhiskConfig
import whisk.core.database.test.ExtendedCouchDbRestClient
--
To stop receiving notification emails like this one, please contact
dubeejw@apache.org.