From f93f09d07f40fdd989379c38a00cc7984cbdea01 Mon Sep 17 00:00:00 2001 From: Oskari Porkka Date: Wed, 1 Feb 2017 13:33:02 +0100 Subject: [PATCH] #64: Fixed some of test compile errors - Ensured that absolute imports are used for `spray.json` instead of relative imports possibly refering to org.zalando.jsonapi packages. - Updated missing dependency --- .../zalando/jsonapi/akka/http/AkkaHttpJsonapiSupport.scala | 2 +- .../jsonapi/akka/http/AkkaHttpJsonapiSupportSpec.scala | 3 +-- project/Dependencies.scala | 2 +- .../scala/org/zalando/jsonapi/sprayjson/ExampleSpec.scala | 6 +++--- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/akka-http/src/main/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupport.scala b/akka-http/src/main/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupport.scala index 0609729..f63c2a2 100644 --- a/akka-http/src/main/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupport.scala +++ b/akka-http/src/main/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupport.scala @@ -6,7 +6,7 @@ import akka.http.scaladsl.unmarshalling._ import org.zalando.jsonapi.model._ import org.zalando.jsonapi.sprayjson.SprayJsonJsonapiProtocol import org.zalando.jsonapi.{JsonapiRootObjectReader, JsonapiRootObjectWriter, _} -import spray.json._ +import _root_.spray.json._ trait AkkaHttpJsonapiSupport extends SprayJsonJsonapiProtocol { def akkaHttpJsonapiMarshaller[T: JsonapiRootObjectWriter]: ToEntityMarshaller[T] = diff --git a/akka-http/src/test/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupportSpec.scala b/akka-http/src/test/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupportSpec.scala index aa5d349..2f7e0cc 100644 --- a/akka-http/src/test/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupportSpec.scala +++ b/akka-http/src/test/scala/org/zalando/jsonapi/akka/http/AkkaHttpJsonapiSupportSpec.scala @@ -5,8 +5,7 @@ import org.scalatest.{EitherValues, WordSpec} import org.zalando.jsonapi.JsonapiRootObjectWriter import org.zalando.jsonapi.model._ import org.zalando.jsonapi._ -import org.zalando.jsonapi.akka.http.AkkaHttpJsonapiSupport -import spray.json._ +import _root_.spray.json._ class AkkaHttpJsonapiSupportSpec extends WordSpec with TypeCheckedTripleEquals with EitherValues with AkkaHttpJsonapiSupport { s"AkkaHttpJsonapiSupport" must { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 1893a74..d7fbc44 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -31,5 +31,5 @@ object Dependencies { lazy val sprayJsonDeps = Seq(sprayJson) - lazy val akkaHttpDeps = Seq(akkaHttpCore, akkaHttpExperimental, sprayJson) + lazy val akkaHttpDeps = Seq(akkaHttpCore, akkaHttpExperimental, akkaHttpTestkit, sprayJson) } \ No newline at end of file diff --git a/spray-json/src/test/scala/org/zalando/jsonapi/sprayjson/ExampleSpec.scala b/spray-json/src/test/scala/org/zalando/jsonapi/sprayjson/ExampleSpec.scala index 5f2ea13..685cb90 100644 --- a/spray-json/src/test/scala/org/zalando/jsonapi/sprayjson/ExampleSpec.scala +++ b/spray-json/src/test/scala/org/zalando/jsonapi/sprayjson/ExampleSpec.scala @@ -1,12 +1,12 @@ -package org.zalando.jsonapi.json +package org.zalando.jsonapi.sprayjson import org.scalatest.{MustMatchers, WordSpec} import org.zalando.jsonapi.model.JsonApiObject.StringValue import org.zalando.jsonapi.model.RootObject.ResourceObject import org.zalando.jsonapi.model.{Attribute, Links, RootObject} -import org.zalando.jsonapi.sprayjson.SprayJsonJsonapiProtocol import org.zalando.jsonapi.{JsonapiRootObjectWriter, _} -import spray.json._ +import _root_.spray.json._ +import org.zalando.jsonapi.json.Person class ExampleSpec extends WordSpec with MustMatchers with SprayJsonJsonapiProtocol { "JsonapiRootObject" when {