Mixin serialization test fixed.

Class can't be nested, since Jackson will fail in that case. Removed custom jackson handler, since it seems new Jackson copes with it. Doesn't jet work with Option[Mixin]. Use Revenj default credentials for DB access.
ngs-doo · Nov 30, 2014 · 90962cf · 90962cf
1 parent aa507bf
commit 90962cf
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 249 deletions.
diff --git a/http/src/main/scala/com/dslplatform/api/client/JsonSerialization.scala b/http/src/main/scala/com/dslplatform/api/client/JsonSerialization.scala
@@ -1,6 +1,6 @@
 package com.dslplatform.api.client
 
-import com.fasterxml.jackson.module.scala.ser.CustomDefaultScalaModule
+import com.fasterxml.jackson.module.scala.DefaultScalaModule
 import scala.io.Source
 import scala.reflect.ClassTag
 import scala.xml.Elem
@@ -92,8 +92,7 @@ class JsonSerialization(locator: ServiceLocator) {
 
   private val serializationMapper =
     new ObjectMapper()
-      .registerModule(com.fasterxml.jackson.module.scala.DefaultScalaModule)
-      //.registerModule(DefaultScalaModule)
+      .registerModule(DefaultScalaModule)
       .setSerializationInclusion(com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL)
       .registerModule(serializationModule)
       //.configure(MapperFeature.AUTO_DETECT_GETTERS, false)
@@ -112,7 +111,8 @@ class JsonSerialization(locator: ServiceLocator) {
 
   private val deserializationMapper = {
     val mapper = new ObjectMapper()
-    mapper.registerModule(CustomDefaultScalaModule)
+    mapper
+      .registerModule(DefaultScalaModule)
       .registerModule(deserializationModule)
       .setInjectableValues(new InjectableValues.Std addValue ("__locator", locator))
       .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)

diff --git a/http/src/main/scala/com/fasterxml/jackson/module/scala/ser/JacksonOptionSerializer.scala b/http/src/main/scala/com/fasterxml/jackson/module/scala/ser/JacksonOptionSerializer.scala
diff --git a/http/src/test/scala/com/dslplatform/test/SerializationTest.scala b/http/src/test/scala/com/dslplatform/test/SerializationTest.scala
@@ -5,7 +5,7 @@ import com.dslplatform.api.patterns.{PersistableRepository, ServiceLocator}
 import com.dslplatform.test.complex.{BaseRoot, EmptyRoot}
 import com.dslplatform.test.concept.{emptyConcept, fieldedConcept, rootWithConcept}
 import com.dslplatform.test.simple._
-import com.fasterxml.jackson.annotation.{JsonProperty, JsonSubTypes, JsonTypeInfo, JsonTypeName}
+import com.fasterxml.jackson.annotation._
 import org.joda.time.{DateTime, LocalDate}
 import org.specs2.mutable._
 import org.specs2.specification.Step
@@ -185,28 +185,6 @@ class SerializationTest extends Specification with Common {
     t1.signature === Some(KnownImplementation())
   }
 
-
-  @JsonSubTypes(Array(new JsonSubTypes.Type(classOf[KnownImplementation])))
-  trait BaseSignature
-
-  @JsonTypeName("my.Implementation")
-  case class KnownImplementation() extends BaseSignature
-
-  class TestMe(
-    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$type")
-    @JsonProperty("signature")
-    __signature: BaseSignature) {
-    private var _signature: Option[BaseSignature] = Option(__signature)
-
-    @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$type")
-    @JsonProperty("signature")
-    def signature = _signature
-
-    def signature_=(value: Option[BaseSignature]) {
-      _signature = value
-    }
-  }
-
   def historyDeserialization = { jsonSerialization: JsonSerialization =>
     val historyPayload = """[
       {"Snapshots":[
@@ -229,3 +207,24 @@ class SerializationTest extends Specification with Common {
     history(1).snapshots(0).value.s === "qwe"
   }
 }
+
+@JsonSubTypes(Array(new JsonSubTypes.Type(classOf[KnownImplementation])))
+trait BaseSignature
+
+@JsonTypeName("my.Implementation")
+case class KnownImplementation() extends BaseSignature
+
+class TestMe (
+               @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$type")
+               @JsonProperty("signature")
+               __signature: BaseSignature) {
+  private var _signature: Option[BaseSignature] = Option(__signature)
+
+  @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "$type")
+  @JsonProperty("signature")
+  def signature = _signature
+
+  def signature_=(value: Option[BaseSignature]) {
+    _signature = value
+  }
+}
diff --git a/http/test-lib/Revenj.Http.exe.config b/http/test-lib/Revenj.Http.exe.config
@@ -7,7 +7,7 @@
   <appSettings>
     <add key="PluginsPath" value="." />
     <add key="ServerAssembly" value="test.dll"/>
-    <add key="ConnectionString" value="server=localhost;port=5432;database=scalaclienttest;user=scalaclienttest;password=scalaclienttest;encoding=unicode" />
+    <add key="ConnectionString" value="server=localhost;port=5432;database=scalaclienttest;user=revenj;password=revenj;encoding=unicode" />
     <add key="HttpAddress_local8999" value="http://localhost:8999/" />
     <add key="DefaultAuthorization" value="Basic cmV2ZW5qOnJldmVuag==" />
     <add key="CustomAuth" value="Revenj.Http.NoAuth"/>