From 3e21a29705929bdb39aa7697f98ad90d8f5b6980 Mon Sep 17 00:00:00 2001 From: Graham Lea Date: Wed, 22 Apr 2015 11:01:38 +1000 Subject: [PATCH 1/7] Issue #1: Got compilation and tests with Scala 2.11.6 and Jersey 2.17 --- pom.xml | 23 ++++++++++++------- ...CollectionsQueryParamFactoryProvider.scala | 1 + .../sjersey/providers/JacksonProvider.scala | 3 ++- .../spec/SJerseyIntegrationSpec.scala | 7 ++++-- 4 files changed, 23 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index a5c3320..528f187 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ eu.fakod - sjersey_2.10 + sjersey_2.11 0.4.2-SNAPSHOT jar https://github.com/FaKod/sjersey @@ -17,10 +17,11 @@ Jersey Support for Scala ${scala.version} - 2.10.3 - 2.10 - 2.3.1 - 2.5.1 + 2.11.6 + 2.11 + 2.5.1 + 2.17 + 2.4.17 @@ -95,8 +96,14 @@ org.specs2 - specs2_${scala.version.short} - 1.14 + specs2-core_${scala.version.short} + ${specs2.version} + test + + + org.specs2 + specs2-junit_${scala.version.short} + ${specs2.version} test @@ -173,7 +180,7 @@ net.alchim31.maven scala-maven-plugin - 3.1.0 + 3.2.0 incremental diff --git a/src/main/scala/eu/fakod/sjersey/inject/ScalaCollectionsQueryParamFactoryProvider.scala b/src/main/scala/eu/fakod/sjersey/inject/ScalaCollectionsQueryParamFactoryProvider.scala index 5c05913..dd12408 100644 --- a/src/main/scala/eu/fakod/sjersey/inject/ScalaCollectionsQueryParamFactoryProvider.scala +++ b/src/main/scala/eu/fakod/sjersey/inject/ScalaCollectionsQueryParamFactoryProvider.scala @@ -1,6 +1,7 @@ package eu.fakod.sjersey.inject import javax.ws.rs.QueryParam +import org.glassfish.jersey.internal.inject.ExtractorException import org.glassfish.jersey.server.model.Parameter import org.glassfish.jersey.server.internal.inject._ import org.glassfish.jersey.server.ParamException diff --git a/src/main/scala/eu/fakod/sjersey/providers/JacksonProvider.scala b/src/main/scala/eu/fakod/sjersey/providers/JacksonProvider.scala index 6ef5d3b..a0b0526 100644 --- a/src/main/scala/eu/fakod/sjersey/providers/JacksonProvider.scala +++ b/src/main/scala/eu/fakod/sjersey/providers/JacksonProvider.scala @@ -4,6 +4,7 @@ import javax.ws.rs.ext.Provider import java.lang.reflect.{Type} import java.lang.annotation.Annotation import java.io.{IOException, InputStream, OutputStream} +import com.fasterxml.jackson.databind.JsonMappingException import org.slf4j.LoggerFactory import javax.ws.rs.{WebApplicationException, Consumes, Produces} import javax.ws.rs.core.{Response, MultivaluedMap, MediaType} @@ -30,7 +31,7 @@ class JacksonProvider[A] extends AbstractMessageReaderWriterProvider[A] with Jac try { deserialize(entityStream)(Manifest.classType(klass)) } catch { - case e: JsonParseException => { + case e: JsonMappingException => { throw new WebApplicationException(Response.status(Status.BAD_REQUEST) .entity(e.getMessage) .build) diff --git a/src/test/scala/eu/fakod/sjersey/integration/spec/SJerseyIntegrationSpec.scala b/src/test/scala/eu/fakod/sjersey/integration/spec/SJerseyIntegrationSpec.scala index 75d5545..ecea98b 100644 --- a/src/test/scala/eu/fakod/sjersey/integration/spec/SJerseyIntegrationSpec.scala +++ b/src/test/scala/eu/fakod/sjersey/integration/spec/SJerseyIntegrationSpec.scala @@ -18,14 +18,17 @@ class SJerseyIntegrationSpec extends SJerseyTestBase { "extracts the query parameters" in { +// Thread.sleep(100000000L) + List("set", "list", "vector", "seq", "indexedset").foreach { settype => val client = ClientBuilder.newClient - val target = client.target("http://localhost:8080").path("sjersey_2.10/testresource/" + settype). + val target = client.target("http://localhost:8080").path("sjersey_2.11/testresource/" + settype). queryParam("name", "1").queryParam("name", "2") val resp = target.request().get[String](classOf[String]) resp must be_==("1, 2") } + ok } } @@ -37,7 +40,7 @@ class SJerseyIntegrationSpec extends SJerseyTestBase { clientConfig.register(classOf[JacksonProvider[_]]) val client = ClientBuilder.newClient(clientConfig) - val target = client.target("http://localhost:8080").path("sjersey_2.10/testresource/") + val target = client.target("http://localhost:8080").path("sjersey_2.11/testresource/") val cc = SjerseyTest("1", 1, 2, true) val resp = target.request().post[SjerseyTest](Entity.entity(cc, MediaType.APPLICATION_JSON), classOf[SjerseyTest]) From c3ca58936216c35177fbc1495bdca5af4ab36dc7 Mon Sep 17 00:00:00 2001 From: Graham Lea Date: Wed, 22 Apr 2015 11:42:19 +1000 Subject: [PATCH 2/7] Issue #1: Bumped jackson-module-scala up to 2.5.2 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 528f187..0acf7fc 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ 2.11.6 2.11 - 2.5.1 + 2.5.2 2.17 2.4.17 From 10d33704cf636f0038300a20416dcf95181b02e1 Mon Sep 17 00:00:00 2001 From: Graham Lea Date: Wed, 22 Apr 2015 11:51:09 +1000 Subject: [PATCH 3/7] Issue #1: Bumped JUnit to 4.12 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0acf7fc..e786401 100644 --- a/pom.xml +++ b/pom.xml @@ -110,7 +110,7 @@ junit junit - 4.7 + 4.12 test From 272939232bda91b1dd7a6bdea5d60e89fdb5f816 Mon Sep 17 00:00:00 2001 From: Graham Lea Date: Wed, 22 Apr 2015 12:45:49 +1000 Subject: [PATCH 4/7] Issue #1: Bumped SLF4J to 1.7.12 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index e786401..e4f2c8c 100644 --- a/pom.xml +++ b/pom.xml @@ -77,13 +77,13 @@ org.slf4j slf4j-api - 1.6.2 + 1.7.12 org.slf4j slf4j-nop - 1.6.2 + 1.7.12 test From e02fe68b74a24d56f9c41ad49f63c3e5ac90d068 Mon Sep 17 00:00:00 2001 From: Graham Lea Date: Wed, 22 Apr 2015 12:47:53 +1000 Subject: [PATCH 5/7] Issue #1: Bumped Mockito to 1.10.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index e4f2c8c..157f9eb 100644 --- a/pom.xml +++ b/pom.xml @@ -90,7 +90,7 @@ org.mockito mockito-all - 1.9.0 + 1.10.19 test From 4d746813a39089e618b2387a37c5b6a0b9f82291 Mon Sep 17 00:00:00 2001 From: Graham Lea Date: Wed, 22 Apr 2015 12:48:14 +1000 Subject: [PATCH 6/7] Issue #1: Cleaned up some imports --- .../scala/eu/fakod/sjersey/providers/JacksonProvider.scala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/scala/eu/fakod/sjersey/providers/JacksonProvider.scala b/src/main/scala/eu/fakod/sjersey/providers/JacksonProvider.scala index a0b0526..f721113 100644 --- a/src/main/scala/eu/fakod/sjersey/providers/JacksonProvider.scala +++ b/src/main/scala/eu/fakod/sjersey/providers/JacksonProvider.scala @@ -1,7 +1,7 @@ package eu.fakod.sjersey.providers import javax.ws.rs.ext.Provider -import java.lang.reflect.{Type} +import java.lang.reflect.Type import java.lang.annotation.Annotation import java.io.{IOException, InputStream, OutputStream} import com.fasterxml.jackson.databind.JsonMappingException @@ -10,7 +10,6 @@ import javax.ws.rs.{WebApplicationException, Consumes, Produces} import javax.ws.rs.core.{Response, MultivaluedMap, MediaType} import javax.ws.rs.core.Response.Status import scala.reflect.Manifest -import com.fasterxml.jackson.core.JsonParseException import eu.fakod.sjersey.util.JacksonDeAndSerializer import org.glassfish.jersey.message.internal.AbstractMessageReaderWriterProvider From 37b0b26196cca945eb9de823f1f53ece2d8c0429 Mon Sep 17 00:00:00 2001 From: Graham Lea Date: Wed, 22 Apr 2015 12:48:45 +1000 Subject: [PATCH 7/7] Issue #1: Removed some commented out code from a test --- .../fakod/sjersey/integration/spec/SJerseyIntegrationSpec.scala | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/test/scala/eu/fakod/sjersey/integration/spec/SJerseyIntegrationSpec.scala b/src/test/scala/eu/fakod/sjersey/integration/spec/SJerseyIntegrationSpec.scala index ecea98b..a955683 100644 --- a/src/test/scala/eu/fakod/sjersey/integration/spec/SJerseyIntegrationSpec.scala +++ b/src/test/scala/eu/fakod/sjersey/integration/spec/SJerseyIntegrationSpec.scala @@ -18,8 +18,6 @@ class SJerseyIntegrationSpec extends SJerseyTestBase { "extracts the query parameters" in { -// Thread.sleep(100000000L) - List("set", "list", "vector", "seq", "indexedset").foreach { settype => val client = ClientBuilder.newClient