Add many more test feeds and manifests.

Author: io7m

org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/WPMBelongsTo.kt

@@ -12,10 +12,10 @@ data class WPMBelongsTo(
   @JsonProperty(
     value = "collection"
   )
-  val collection : WPMContributor?,
+  val collection : WPMContributorOrString?,
 
   @JsonProperty(
     value = "series"
   )
-  val series : WPMContributor?,
+  val series : WPMContributorOrString?,
 )

org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/WPMContributor.kt

@@ -11,10 +11,9 @@ import java.net.URI
 @JsonIgnoreProperties(ignoreUnknown = true)
 data class WPMContributor(
   @JsonProperty(
-    value = "name",
-    required = true
+    value = "name"
   )
-  val name : String,
+  val name : String?,
 
   @JsonProperty(
     value = "identifier"
@@ -45,4 +44,4 @@ data class WPMContributor(
     value = "links"
   )
   val links: List<WPMLink> = listOf()
-) : WPMElement()
+) : WPMContributorOrString()

org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/WPMContributorOrString.kt

@@ -0,0 +1,16 @@
+package org.thepalaceproject.webpub.core
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
+import com.fasterxml.jackson.annotation.JsonProperty
+import java.net.URI
+
+/**
+ * @see "https://github.com/readium/webpub-manifest/blob/master/schema/contributor-object.schema.json"
+ */
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+sealed class WPMContributorOrString() : WPMElement() {
+  data class WPMContributorString(
+    val value: String
+  ): WPMContributorOrString()
+}

org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/WPMContributorOrStringDeserializer.kt

@@ -0,0 +1,36 @@
+package org.thepalaceproject.webpub.core
+
+import com.fasterxml.jackson.core.JsonParser
+import com.fasterxml.jackson.core.JsonToken
+import com.fasterxml.jackson.databind.DeserializationContext
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer
+import java.time.OffsetDateTime
+
+class WPMContributorOrStringDeserializer :
+  StdDeserializer<WPMContributorOrString>(WPMContributorOrString::class.java) {
+
+  override fun deserialize(
+    parser : JsonParser,
+    context : DeserializationContext
+  ) : WPMContributorOrString {
+    return when (val currentToken = parser.currentToken()) {
+      JsonToken.VALUE_STRING -> {
+        WPMContributorOrString.WPMContributorString(parser.text)
+      }
+
+      JsonToken.START_OBJECT -> {
+        context.readValue(parser, WPMContributor::class.java)
+      }
+
+      else                   -> {
+        context.handleUnexpectedToken(
+          OffsetDateTime::class.java,
+          currentToken,
+          parser,
+          "Expected an object or a string (Received ${currentToken})."
+        )
+        TODO("Unreachable code.")
+      }
+    }
+  }
+}

org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/WPMContributorOrStringSerializer.kt

@@ -0,0 +1,58 @@
+package org.thepalaceproject.webpub.core
+
+import com.fasterxml.jackson.core.JsonGenerator
+import com.fasterxml.jackson.core.JsonParser
+import com.fasterxml.jackson.core.JsonToken
+import com.fasterxml.jackson.databind.DeserializationContext
+import com.fasterxml.jackson.databind.SerializerProvider
+import com.fasterxml.jackson.databind.deser.std.StdDeserializer
+import com.fasterxml.jackson.databind.ser.std.StdSerializer
+import java.time.OffsetDateTime
+
+class WPMContributorOrStringSerializer :
+  StdSerializer<WPMContributorOrString>(WPMContributorOrString::class.java) {
+  override fun serialize(
+    value : WPMContributorOrString,
+    gen : JsonGenerator,
+    provider : SerializerProvider
+  ) {
+    when (value) {
+      is WPMContributor                              -> {
+        gen.writeStartObject()
+
+        value.name?.let { text ->
+          gen.writeFieldName("name")
+          gen.writeString(text)
+        }
+        value.identifier?.let { text ->
+          gen.writeFieldName("identifier")
+          gen.writeString(text.toString())
+        }
+        value.altIdentifier?.let { text ->
+          gen.writeFieldName("altIdentifier")
+          gen.writeString(text.toString())
+        }
+        value.sortAs?.let { text ->
+          gen.writeFieldName("sortAs")
+          gen.writeString(text)
+        }
+        value.position?.let { text ->
+          gen.writeFieldName("position")
+          gen.writeNumber(text.toDouble())
+        }
+        if (value.links.isNotEmpty()) {
+          gen.writeFieldName("links")
+          value.links.forEach { link -> gen.writeObject(link) }
+        }
+        if (!value.role.isEmpty()) {
+          gen.writeFieldName("role")
+          gen.writeArray(value.role.toTypedArray(), 0, value.role.size)
+        }
+
+        gen.writeEndObject()
+      }
+      is WPMContributorOrString.WPMContributorString ->
+        gen.writeString(value.value)
+    }
+  }
+}

org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/WPMLinkSerializer.kt

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.core.JsonGenerator
 import com.fasterxml.jackson.databind.SerializerProvider
 import com.fasterxml.jackson.databind.ser.std.StdSerializer
 import one.irradia.mime.api.MIMEType
+import java.math.BigInteger
 
 class WPMLinkSerializer : StdSerializer<WPMLink>(WPMLink::class.java) {
   override fun serialize(
@@ -18,27 +19,7 @@ class WPMLinkSerializer : StdSerializer<WPMLink>(WPMLink::class.java) {
         generator.writeFieldName("href")
         generator.writeString(value.href.toString())
 
-        value.title?.let { text ->
-          generator.writeFieldName("title")
-          generator.writeString(text)
-        }
-        value.type?.let { type ->
-          this.writeType(type, generator)
-        }
-
-        if (value.relation.size == 1) {
-          generator.writeFieldName("rel")
-          generator.writeString(value.relation[0])
-        } else if (value.relation.size > 1) {
-          generator.writeFieldName("rel")
-          generator.writeArray(value.relation.toTypedArray(), 0, value.relation.size)
-        }
-
-        value.properties?.let { properties ->
-          generator.writeFieldName("properties")
-          generator.writeObject(properties)
-        }
-
+        this.writeProperties(value, generator)
         generator.writeEndObject()
       }
       is WPMLinkTemplated -> {
@@ -50,30 +31,57 @@ class WPMLinkSerializer : StdSerializer<WPMLink>(WPMLink::class.java) {
         generator.writeFieldName("templated")
         generator.writeBoolean(true)
 
-        value.title?.let { text ->
-          generator.writeFieldName("title")
-          generator.writeString(text)
-        }
-        value.type?.let { type ->
-          this.writeType(type, generator)
-        }
-
-        if (value.relation.size == 1) {
-          generator.writeFieldName("rel")
-          generator.writeString(value.relation[0])
-        } else if (value.relation.size > 1) {
-          generator.writeFieldName("rel")
-          generator.writeArray(value.relation.toTypedArray(), 0, value.relation.size)
-        }
+        this.writeProperties(value, generator)
+        generator.writeEndObject()
+      }
+    }
+  }
 
-        value.properties?.let { properties ->
-          generator.writeFieldName("properties")
-          generator.writeObject(properties)
-        }
+  private fun writeProperties(
+    value : WPMLink,
+    generator : JsonGenerator
+  ) {
+    value.title?.let { text ->
+      generator.writeFieldName("title")
+      generator.writeString(text)
+    }
+    value.type?.let { type ->
+      this.writeType(type, generator)
+    }
 
-        generator.writeEndObject()
+    value.width?.let { n ->
+      generator.writeFieldName("width")
+      generator.writeNumber(n)
+    }
+    value.height?.let { n ->
+      generator.writeFieldName("height")
+      generator.writeNumber(n)
+    }
+    value.bitrate?.let { n ->
+      generator.writeFieldName("bitrate")
+      if (n is Int || n is Long || n is BigInteger) {
+        generator.writeNumber(n.toLong())
+      } else {
+        generator.writeNumber(n.toDouble())
       }
     }
+
+    if (value.relation.size == 1) {
+      generator.writeFieldName("rel")
+      generator.writeString(value.relation[0])
+    } else if (value.relation.size > 1) {
+      generator.writeFieldName("rel")
+      generator.writeArray(
+        value.relation.toTypedArray(),
+        0,
+        value.relation.size
+      )
+    }
+
+    value.properties?.let { properties ->
+      generator.writeFieldName("properties")
+      generator.writeObject(properties)
+    }
   }
 
   private fun writeType(

org.thepalaceproject.webpub.core/src/main/kotlin/org/thepalaceproject/webpub/core/WPMMetadata.kt

@@ -110,7 +110,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "author"
   )
-  val author : WPMContributor? = null,
+  val author : List<WPMContributorOrString> = listOf(),
 
   /**
    * The translator of the publication.
@@ -119,7 +119,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "translator"
   )
-  val translator : WPMContributor? = null,
+  val translator : List<WPMContributorOrString> = listOf(),
 
   /**
    * The editor of the publication.
@@ -128,7 +128,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "editor"
   )
-  val editor : WPMContributor? = null,
+  val editor : List<WPMContributorOrString> = listOf(),
 
   /**
    * The artist of the publication.
@@ -137,7 +137,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "artist"
   )
-  val artist : WPMContributor? = null,
+  val artist : List<WPMContributorOrString> = listOf(),
 
   /**
    * The illustrator of the publication.
@@ -146,7 +146,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "illustrator"
   )
-  val illustrator : WPMContributor? = null,
+  val illustrator : List<WPMContributorOrString> = listOf(),
 
   /**
    * The letterer of the publication.
@@ -155,7 +155,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "letterer"
   )
-  val letterer : WPMContributor? = null,
+  val letterer : List<WPMContributorOrString> = listOf(),
 
   /**
    * The penciler of the publication.
@@ -164,7 +164,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "penciler"
   )
-  val penciler : WPMContributor? = null,
+  val penciler : List<WPMContributorOrString> = listOf(),
 
   /**
    * The colorist of the publication.
@@ -173,7 +173,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "colorist"
   )
-  val colorist : WPMContributor? = null,
+  val colorist : List<WPMContributorOrString> = listOf(),
 
   /**
    * The inker of the publication.
@@ -182,7 +182,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "inker"
   )
-  val inker : WPMContributor? = null,
+  val inker : List<WPMContributorOrString> = listOf(),
 
   /**
    * The narrator of the publication.
@@ -191,7 +191,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "narrator"
   )
-  val narrator : WPMContributor? = null,
+  val narrator : List<WPMContributorOrString> = listOf(),
 
   /**
    * The contributor of the publication.
@@ -200,7 +200,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "contributor"
   )
-  val contributor : WPMContributor? = null,
+  val contributor : List<WPMContributorOrString> = listOf(),
 
   /**
    * The publisher of the publication.
@@ -209,7 +209,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "publisher"
   )
-  val publisher : WPMContributor? = null,
+  val publisher : List<WPMContributorOrString> = listOf(),
 
   /**
    * The imprint of the publication.
@@ -218,7 +218,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "imprint"
   )
-  val imprint : WPMContributor? = null,
+  val imprint : List<WPMContributorOrString> = listOf(),
 
   /**
    * The subjects that apply to the publication.
@@ -227,7 +227,7 @@ data class WPMMetadata @JsonCreator constructor(
   @JsonProperty(
     value = "subject"
   )
-  val subjects : List<WPMSubject> = listOf(),
+  val subjects : List<WPMSubjectOrString> = listOf(),
 
   /**
    * The layout of the publication.