dubee closed pull request #263: Fix spray-json import to comply with newer versions. URL: https://github.com/apache/incubator-openwhisk-package-kafka/pull/263
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/packages/KafkaProduceTests.scala b/tests/src/test/scala/system/packages/KafkaProduceTests.scala index 223bd56..85d5007 100644 --- a/tests/src/test/scala/system/packages/KafkaProduceTests.scala +++ b/tests/src/test/scala/system/packages/KafkaProduceTests.scala @@ -35,7 +35,7 @@ import common.WskActorSystem import common.WskProps import common.WskTestHelpers import spray.json.DefaultJsonProtocol._ -import spray.json.pimpAny +import spray.json._ @RunWith(classOf[JUnitRunner]) class KafkaProduceTests diff --git a/tests/src/test/scala/system/packages/MessageHubMultiWorkersTest.scala b/tests/src/test/scala/system/packages/MessageHubMultiWorkersTest.scala index 7ea14ec..20caa7a 100644 --- a/tests/src/test/scala/system/packages/MessageHubMultiWorkersTest.scala +++ b/tests/src/test/scala/system/packages/MessageHubMultiWorkersTest.scala @@ -34,7 +34,7 @@ import common.WskActorSystem import common.WskProps import common.WskTestHelpers import spray.json.DefaultJsonProtocol._ -import spray.json.{pimpAny, _} +import spray.json._ import whisk.core.WhiskConfig import whisk.core.database.test.ExtendedCouchDbRestClient import whisk.utils.{JsHelpers, retry} diff --git a/tests/src/test/scala/system/packages/MessageHubProduceTests.scala b/tests/src/test/scala/system/packages/MessageHubProduceTests.scala index 37a5bd9..214fc55 100644 --- a/tests/src/test/scala/system/packages/MessageHubProduceTests.scala +++ b/tests/src/test/scala/system/packages/MessageHubProduceTests.scala @@ -37,7 +37,7 @@ import common.WskProps import common.WskTestHelpers import spray.json.DefaultJsonProtocol._ -import spray.json.pimpAny +import spray.json._ import java.util.Base64 import java.nio.charset.StandardCharsets diff --git a/tests/src/test/scala/system/stress/StressTest.scala b/tests/src/test/scala/system/stress/StressTest.scala index d554d85..b174323 100644 --- a/tests/src/test/scala/system/stress/StressTest.scala +++ b/tests/src/test/scala/system/stress/StressTest.scala @@ -33,7 +33,7 @@ import common.WskActorSystem import common.WskProps import common.WskTestHelpers import spray.json.DefaultJsonProtocol._ -import spray.json.pimpAny +import spray.json._ @RunWith(classOf[JUnitRunner]) diff --git a/tests/src/test/scala/system/utils/KafkaUtils.scala b/tests/src/test/scala/system/utils/KafkaUtils.scala index ba8a6e9..be17d6c 100644 --- a/tests/src/test/scala/system/utils/KafkaUtils.scala +++ b/tests/src/test/scala/system/utils/KafkaUtils.scala @@ -29,9 +29,7 @@ import org.apache.kafka.clients.producer.KafkaProducer; import scala.collection.mutable.ListBuffer import spray.json.DefaultJsonProtocol._ -import spray.json.JsObject -import spray.json.JsArray -import spray.json.pimpAny +import spray.json._ import whisk.utils.JsHelpers ---------------------------------------------------------------- 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