Initial round-trip tests.

Author: io7m

org.thepalaceproject.opds2.core/src/main/kotlin/org/thepalaceproject/opds2/core/O2LinkSerializer.kt

@@ -10,6 +10,82 @@ class O2LinkSerializer : StdSerializer<O2Link>(O2Link::class.java) {
     generator : JsonGenerator,
     serializers : SerializerProvider
   ) {
-    TODO("Not yet implemented")
+    when (value) {
+      is O2LinkBasic     -> {
+        generator.writeStartObject()
+
+        generator.writeFieldName("href")
+        generator.writeString(value.href.toString())
+
+        value.title?.let { text ->
+          generator.writeFieldName("title")
+          generator.writeString(text)
+        }
+        value.type?.let { type ->
+          val text = StringBuilder()
+          text.append(type.toString())
+          if (type.parameters.isNotEmpty()) {
+            text.append(';')
+            for ((k, v) in type.parameters) {
+              text.append(k)
+              text.append('=')
+              text.append(v)
+              text.append(';')
+            }
+          }
+          generator.writeFieldName("type")
+          generator.writeString(text.toString())
+        }
+        value.relation?.let { text ->
+          generator.writeFieldName("rel")
+          generator.writeString(text)
+        }
+        value.properties?.let { properties ->
+          generator.writeFieldName("properties")
+          generator.writeObject(properties)
+        }
+
+        generator.writeEndObject()
+      }
+      is O2LinkTemplated -> {
+        generator.writeStartObject()
+
+        generator.writeFieldName("href")
+        generator.writeString(value.href)
+
+        generator.writeFieldName("templated")
+        generator.writeBoolean(true)
+
+        value.title?.let { text ->
+          generator.writeFieldName("title")
+          generator.writeString(text)
+        }
+        value.type?.let { type ->
+          val text = StringBuilder()
+          text.append(type.toString())
+          if (type.parameters.isNotEmpty()) {
+            text.append(';')
+            for ((k, v) in type.parameters) {
+              text.append(k)
+              text.append('=')
+              text.append(v)
+              text.append(';')
+            }
+          }
+          generator.writeFieldName("type")
+          generator.writeString(text.toString())
+        }
+        value.relation?.let { text ->
+          generator.writeFieldName("rel")
+          generator.writeString(text)
+        }
+        value.properties?.let { properties ->
+          generator.writeFieldName("properties")
+          generator.writeObject(properties)
+        }
+
+        generator.writeEndObject()
+      }
+    }
   }
 }

org.thepalaceproject.opds2.core/src/main/kotlin/org/thepalaceproject/opds2/core/O2Mappers.kt

@@ -1,15 +1,19 @@
 package org.thepalaceproject.opds2.core
 
+import com.fasterxml.jackson.annotation.JsonInclude
 import com.fasterxml.jackson.databind.json.JsonMapper
 import com.fasterxml.jackson.module.kotlin.kotlinModule
 
-
 object O2Mappers {
 
   fun createMapper() : JsonMapper {
-    return JsonMapper.builder()
-      .addModule(kotlinModule())
-      .addModule(O2Module.create())
-      .build()
+    val mapper =
+      JsonMapper.builder()
+        .addModule(kotlinModule())
+        .addModule(O2Module.create())
+        .build()
+
+    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL)
+    return mapper
   }
 }

org.thepalaceproject.opds2.core/src/main/kotlin/org/thepalaceproject/opds2/core/O2TitleSerializer.kt

@@ -10,6 +10,6 @@ class O2TitleSerializer : StdSerializer<O2Title>(O2Title::class.java) {
     generator : JsonGenerator,
     serializers : SerializerProvider
   ) {
-    TODO("Not yet implemented")
+    generator.writeString(value.title)
   }
 }

org.thepalaceproject.opds2.tests/src/main/kotlin/org/thepalaceproject/opds2/tests/O2FeedTest.kt

@@ -35,6 +35,8 @@ class O2FeedTest {
     assertEquals(0, feed.catalogs.size)
     assertEquals(14, feed.links.size)
     assertEquals(217, feed.publications.size)
+
+    this.roundTrip(feed)
   }
 
   @Test
@@ -48,11 +50,43 @@ class O2FeedTest {
     assertEquals(708, feed.catalogs.size)
     assertEquals(4, feed.links.size)
     assertEquals(0, feed.publications.size)
+
+    this.roundTrip(feed)
+  }
+
+  private fun roundTrip(
+    feed : O2Feed
+  ) {
+    val serializedText =
+      this.mapper.writerWithDefaultPrettyPrinter()
+        .writeValueAsString(feed)
+    val rereadObject =
+      this.mapper.readValue(
+        serializedText,
+        O2Feed::class.java
+      )
+
+    for ((c0, c1) in feed.catalogs.zip(rereadObject.catalogs)) {
+      assertEquals(c0.metadata, c1.metadata)
+      for ((l0, l1) in c0.links.zip(c1.links)) {
+        assertEquals(l0, l1)
+      }
+      assertEquals(c0.links, c1.links)
+      assertEquals(c0.images, c1.images)
+      assertEquals(c0, c1)
+    }
+
+    assertEquals(feed.catalogs, rereadObject.catalogs)
+    assertEquals(feed.publications, rereadObject.publications)
+    assertEquals(feed.links, rereadObject.links)
+    assertEquals(feed.metadata, rereadObject.metadata)
+    assertEquals(feed.navigation, rereadObject.navigation)
+    assertEquals(feed, rereadObject)
   }
 
   private fun resource(
     name : String
-  ): InputStream {
+  ) : InputStream {
     val path =
       "/org/thepalaceproject/opds2/tests/$name"
     val stream =