Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 19 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,19 @@
</parent>

<groupId>eu.fakod</groupId>
<artifactId>sjersey_2.10</artifactId>
<artifactId>sjersey_2.11</artifactId>
<version>0.4.2-SNAPSHOT</version>
<packaging>jar</packaging>
<url>https://github.com/FaKod/sjersey</url>

<name>Jersey Support for Scala ${scala.version}</name>

<properties>
<scala.version>2.10.3</scala.version>
<scala.version.short>2.10</scala.version.short>
<jackson-module-scala.version>2.3.1</jackson-module-scala.version>
<jersey-server.version>2.5.1</jersey-server.version>
<scala.version>2.11.6</scala.version>
<scala.version.short>2.11</scala.version.short>
<jackson-module-scala.version>2.5.2</jackson-module-scala.version>
<jersey-server.version>2.17</jersey-server.version>
<specs2.version>2.4.17</specs2.version>
</properties>

<licenses>
Expand Down Expand Up @@ -76,34 +77,40 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.6.2</version>
<version>1.7.12</version>
</dependency>

<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-nop</artifactId>
<version>1.6.2</version>
<version>1.7.12</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
<version>1.9.0</version>
<version>1.10.19</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.specs2</groupId>
<artifactId>specs2_${scala.version.short}</artifactId>
<version>1.14</version>
<artifactId>specs2-core_${scala.version.short}</artifactId>
<version>${specs2.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.specs2</groupId>
<artifactId>specs2-junit_${scala.version.short}</artifactId>
<version>${specs2.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
<version>4.12</version>
<scope>test</scope>
</dependency>

Expand Down Expand Up @@ -173,7 +180,7 @@
<plugin>
<groupId>net.alchim31.maven</groupId>
<artifactId>scala-maven-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.0</version>
<configuration>
<recompileMode>incremental</recompileMode>
<args>
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
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
import org.slf4j.LoggerFactory
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

Expand All @@ -30,7 +30,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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,12 @@ class SJerseyIntegrationSpec extends SJerseyTestBase {
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
}
}

Expand All @@ -37,7 +38,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])
Expand Down