dubee closed pull request #168: Fix spray-json import to comply with newer 
versions.
URL: https://github.com/apache/incubator-openwhisk-package-cloudant/pull/168
 
 
   

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/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


 

----------------------------------------------------------------
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:
us...@infra.apache.org


With regards,
Apache Git Services

Reply via email to