Remove serialization support code in mappers. This was a failed attempt...

Remove serialization support code in mappers. This was a failed attempt deserialization is now just done after merging in Kafka.

src/main/kotlin/mapping/mappers/AbstractFieldMapper.kt

 package ch.memobase.mapping.mappers
 
-import com.beust.klaxon.TypeFor
 
-@TypeFor(field = "type", adapter = MapperAdapter::class)
-abstract class AbstractFieldMapper(val type: String) : IFieldMapper
+abstract class AbstractFieldMapper() : IFieldMapper

src/main/kotlin/mapping/mappers/AgentFieldMapper.kt

@@ -21,7 +21,7 @@ package ch.memobase.mapping.mappers
 import ch.memobase.builder.IResource
 import ch.memobase.mapping.KEYS
 
-class AgentFieldMapper : TypeFieldMapper(MapperTypes.agent) {
+class AgentFieldMapper : TypeFieldMapper() {
     var sourceKey: String = ""
     override fun apply(source: Map<String, Any>, subject: IResource) {
         translateProperties(source)
@@ -38,16 +38,4 @@ class AgentFieldMapper : TypeFieldMapper(MapperTypes.agent) {
             }
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return when (other) {
-            null -> false
-            !is AgentFieldMapper -> false
-            else ->
-                this.sourceKey == other.sourceKey && super.equals(other)
-            // this.agentClassType == other.agentClassType
-            // && this.fields == other.fields && this.properties == this.properties
-        }
-    }
 }

src/main/kotlin/mapping/mappers/CarrierTypeMapper.kt

@@ -26,7 +26,7 @@ import ch.memobase.mapping.fields.LanguageField
 import ch.memobase.mapping.fields.ListField
 import ch.memobase.mapping.fields.MappedAnnotationField
 
-class CarrierTypeMapper(val field: AnnotationField) : AbstractFieldMapper(MapperTypes.carrierType) {
+class CarrierTypeMapper(val field: AnnotationField) : AbstractFieldMapper() {
     override fun apply(source: Map<String, Any>, subject: IResource) {
         when (field) {
             is MappedAnnotationField ->
@@ -51,17 +51,4 @@ class CarrierTypeMapper(val field: AnnotationField) : AbstractFieldMapper(Mapper
             }
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return when (other) {
-            null -> false
-            !is CarrierTypeMapper -> false
-            else -> field == other.field
-        }
-    }
-
-    override fun hashCode(): Int {
-        return field.hashCode()
-    }
 }

src/main/kotlin/mapping/mappers/ConstantFieldMapper.kt

@@ -21,21 +21,8 @@ package ch.memobase.mapping.mappers
 import ch.memobase.builder.IResource
 import ch.memobase.mapping.fields.ConstantField
 
-class ConstantFieldMapper(val constantField: ConstantField) : AbstractFieldMapper(MapperTypes.constant) {
+class ConstantFieldMapper(val constantField: ConstantField) : AbstractFieldMapper() {
     override fun apply(source: Map<String, Any>, subject: IResource) {
         subject.addLiteral(constantField.key, constantField.toLiteral())
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return when (other) {
-            null -> false
-            !is ConstantFieldMapper -> false
-            else -> constantField == other.constantField
-        }
-    }
-
-    override fun hashCode(): Int {
-        return constantField.hashCode()
-    }
 }

src/main/kotlin/mapping/mappers/DateFieldMapper.kt

@@ -22,7 +22,7 @@ import ch.memobase.builder.IResource
 import ch.memobase.mapping.fields.DirectMapField
 import ch.memobase.mapping.fields.FieldParsers
 
-class DateFieldMapper(val directMapField: DirectMapField) : AbstractFieldMapper(MapperTypes.date) {
+class DateFieldMapper(val directMapField: DirectMapField) : AbstractFieldMapper() {
     override fun apply(source: Map<String, Any>, subject: IResource) {
         FieldParsers.unpackSource(directMapField.field, source).let {
             if (it != null) {
@@ -30,17 +30,4 @@ class DateFieldMapper(val directMapField: DirectMapField) : AbstractFieldMapper(
             }
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return when (other) {
-            null -> false
-            !is DateFieldMapper -> false
-            else -> directMapField == other.directMapField
-        }
-    }
-
-    override fun hashCode(): Int {
-        return directMapField.hashCode()
-    }
 }

src/main/kotlin/mapping/mappers/DirectFieldMapper.kt

@@ -22,7 +22,7 @@ import ch.memobase.builder.IResource
 import ch.memobase.mapping.fields.DirectMapField
 import ch.memobase.mapping.fields.FieldParsers
 
-class DirectFieldMapper(val directMapField: DirectMapField) : AbstractFieldMapper(MapperTypes.direct) {
+class DirectFieldMapper(val directMapField: DirectMapField) : AbstractFieldMapper() {
     override fun apply(source: Map<String, Any>, subject: IResource) {
         FieldParsers.unpackSource(directMapField.field, source).let {
             if (it != null) {
@@ -30,17 +30,4 @@ class DirectFieldMapper(val directMapField: DirectMapField) : AbstractFieldMappe
             }
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return when (other) {
-            null -> false
-            !is DirectFieldMapper -> false
-            else -> directMapField == other.directMapField
-        }
-    }
-
-    override fun hashCode(): Int {
-        return directMapField.hashCode()
-    }
 }

src/main/kotlin/mapping/mappers/ExpandedRuleFieldMapper.kt

@@ -29,9 +29,7 @@ import ch.memobase.mapping.fields.MappedAnnotationField
 class ExpandedRuleFieldMapper(
     val ricoType: String,
     val configField: List<ConfigField>
-) : AbstractFieldMapper(
-    MapperTypes.expandedRule
-) {
+) : AbstractFieldMapper() {
 
     override fun apply(source: Map<String, Any>, subject: IResource) {
         val properties = configField.mapNotNull { field ->
@@ -68,19 +66,4 @@ class ExpandedRuleFieldMapper(
             subject.addRule(ricoType, properties)
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return when (other) {
-            null -> false
-            !is ExpandedRuleFieldMapper -> false
-            else -> hashCode() == other.hashCode()
-        }
-    }
-
-    override fun hashCode(): Int {
-        var result = ricoType.hashCode()
-        result = 31 * result + configField.hashCode()
-        return result
-    }
 }

src/main/kotlin/mapping/mappers/LanguageFieldMapper.kt

@@ -21,19 +21,10 @@ package ch.memobase.mapping.mappers
 import ch.memobase.builder.IResource
 import ch.memobase.mapping.fields.LanguageField
 
-class LanguageFieldMapper(val languageField: LanguageField) : AbstractFieldMapper(MapperTypes.language) {
+class LanguageFieldMapper(val languageField: LanguageField) : AbstractFieldMapper() {
     override fun apply(source: Map<String, Any>, subject: IResource) {
         languageField.toLangLiterals(source).forEach {
             subject.addLiteral(languageField.key, it)
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return when (other) {
-            null -> false
-            !is LanguageFieldMapper -> false
-            else -> languageField == other.languageField
-        }
-    }
 }

src/main/kotlin/mapping/mappers/ListFieldMapper.kt

@@ -22,23 +22,10 @@ import ch.memobase.builder.IResource
 import ch.memobase.mapping.fields.ListField
 
 class ListFieldMapper(val listField: ListField) :
-    AbstractFieldMapper(MapperTypes.list) {
+    AbstractFieldMapper() {
     override fun apply(source: Map<String, Any>, subject: IResource) {
         listField.toLiterals(source).forEach {
             subject.addLiteral(listField.key, it)
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return when (other) {
-            null -> false
-            !is ListFieldMapper -> false
-            else -> hashCode() == other.hashCode()
-        }
-    }
-
-    override fun hashCode(): Int {
-        return listField.hashCode()
-    }
 }

src/main/kotlin/mapping/mappers/MapperAdapter.kt

-package ch.memobase.mapping.mappers
-
-import com.beust.klaxon.TypeAdapter
-import kotlin.reflect.KClass
-
-class MapperAdapter : TypeAdapter<AbstractFieldMapper> {
-    override fun classFor(type: Any): KClass<out AbstractFieldMapper> {
-        return when (type) {
-            MapperTypes.agent -> AgentFieldMapper::class
-            MapperTypes.carrierType -> CarrierTypeMapper::class
-            MapperTypes.constant -> ConstantFieldMapper::class
-            MapperTypes.date -> DateFieldMapper::class
-            MapperTypes.direct -> DirectFieldMapper::class
-            MapperTypes.expandedRule -> ExpandedRuleFieldMapper::class
-            MapperTypes.language -> LanguageFieldMapper::class
-            MapperTypes.list -> ListFieldMapper::class
-            MapperTypes.place -> PlaceFieldMapper::class
-            MapperTypes.prefix -> PrefixFieldMapper::class
-            MapperTypes.ricoConcept -> RicoConceptMapper::class
-            MapperTypes.rule -> RuleFieldMapper::class
-            MapperTypes.skosConcept -> SkosConceptFieldMapper::class
-            else -> throw Exception("Could not parse mapper instance with type $type.")
-        }
-    }
-}

src/main/kotlin/mapping/mappers/MapperTypes.kt

-package ch.memobase.mapping.mappers
-
-object MapperTypes {
-    const val agent = "agent"
-    const val carrierType = "carrier-type"
-    const val constant = "constant"
-    const val date = "date"
-    const val direct = "direct"
-    const val expandedRule = "expanded-rule"
-    const val language = "language"
-    const val list = "list"
-    const val place = "place"
-    const val prefix = "prefix"
-    const val ricoConcept = "rico-concept"
-    const val rule = "rule"
-    const val skosConcept = "skos-concept"
-}

src/main/kotlin/mapping/mappers/PlaceFieldMapper.kt

@@ -20,20 +20,11 @@ package ch.memobase.mapping.mappers
 
 import ch.memobase.builder.IResource
 
-@Suppress("EqualsOrHashCode")
-class PlaceFieldMapper : TypeFieldMapper(MapperTypes.place) {
+class PlaceFieldMapper : TypeFieldMapper() {
     override fun apply(source: Map<String, Any>, subject: IResource) {
         translateProperties(source)
         if (properties.size > 0) {
             subject.addPlace(agentClassType, properties)
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        return when (other) {
-            null -> false
-            !is PlaceFieldMapper -> false
-            else -> this.hashCode() == other.hashCode()
-        }
-    }
 }

src/main/kotlin/mapping/mappers/PrefixFieldMapper.kt

@@ -22,7 +22,7 @@ import ch.memobase.builder.IResource
 import ch.memobase.mapping.fields.FieldParsers
 import ch.memobase.mapping.fields.PrefixField
 
-class PrefixFieldMapper(val prefixField: PrefixField) : AbstractFieldMapper(MapperTypes.prefix) {
+class PrefixFieldMapper(val prefixField: PrefixField) : AbstractFieldMapper() {
     override fun apply(source: Map<String, Any>, subject: IResource) {
         FieldParsers.unpackSource(prefixField.field, source).let {
             if (it != null) {
@@ -30,17 +30,4 @@ class PrefixFieldMapper(val prefixField: PrefixField) : AbstractFieldMapper(Mapp
             }
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return when (other) {
-            null -> false
-            !is PrefixFieldMapper -> false
-            else -> hashCode() == other.hashCode()
-        }
-    }
-
-    override fun hashCode(): Int {
-        return prefixField.hashCode()
-    }
 }

src/main/kotlin/mapping/mappers/RicoConceptMapper.kt

@@ -26,9 +26,8 @@ import ch.memobase.mapping.fields.LanguageField
 import ch.memobase.mapping.fields.ListField
 import ch.memobase.mapping.fields.MappedAnnotationField
 
-class RicoConceptMapper(val rdfType: String, val field: AnnotationField) : AbstractFieldMapper(
-    MapperTypes.ricoConcept
-) {
+class RicoConceptMapper(val rdfType: String, val field: AnnotationField) :
+    AbstractFieldMapper() {
     override fun apply(source: Map<String, Any>, subject: IResource) {
         when (field) {
             is MappedAnnotationField ->
@@ -53,19 +52,4 @@ class RicoConceptMapper(val rdfType: String, val field: AnnotationField) : Abstr
             }
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return when (other) {
-            null -> false
-            !is RicoConceptMapper -> false
-            else -> hashCode() == other.hashCode()
-        }
-    }
-
-    override fun hashCode(): Int {
-        var result = rdfType.hashCode()
-        result = 31 * result + field.hashCode()
-        return result
-    }
 }

src/main/kotlin/mapping/mappers/RuleFieldMapper.kt

@@ -27,7 +27,7 @@ import ch.memobase.mapping.fields.LanguageField
 import ch.memobase.mapping.fields.ListField
 import ch.memobase.mapping.fields.MappedAnnotationField
 
-class RuleFieldMapper(val configField: ConfigField) : AbstractFieldMapper(MapperTypes.rule) {
+class RuleFieldMapper(val configField: ConfigField) : AbstractFieldMapper() {
 
     override fun apply(source: Map<String, Any>, subject: IResource) {
         when (configField) {
@@ -53,17 +53,4 @@ class RuleFieldMapper(val configField: ConfigField) : AbstractFieldMapper(Mapper
             }
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        return when (other) {
-            null -> false
-            !is RuleFieldMapper -> false
-            else -> hashCode() == other.hashCode()
-        }
-    }
-
-    override fun hashCode(): Int {
-        return configField.hashCode()
-    }
 }

src/main/kotlin/mapping/mappers/SkosConceptFieldMapper.kt

@@ -21,20 +21,11 @@ package ch.memobase.mapping.mappers
 import ch.memobase.builder.IResource
 import ch.memobase.rdf.SKOS
 
-@Suppress("EqualsOrHashCode")
-class SkosConceptFieldMapper : TypeFieldMapper(MapperTypes.skosConcept) {
+class SkosConceptFieldMapper : TypeFieldMapper() {
     override fun apply(source: Map<String, Any>, subject: IResource) {
         translateProperties(source)
         if (properties.any { value -> SKOS.labelProperties.contains(value.first) }) {
             subject.addSkosConcept(agentClassType, properties)
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        return when (other) {
-            null -> false
-            !is SkosConceptFieldMapper -> false
-            else -> this.hashCode() == other.hashCode()
-        }
-    }
 }

src/main/kotlin/mapping/mappers/TypeFieldMapper.kt

@@ -26,7 +26,7 @@ import ch.memobase.mapping.fields.ListField
 import ch.memobase.mapping.fields.MappedAnnotationField
 import org.apache.jena.rdf.model.Literal
 
-abstract class TypeFieldMapper(type: String) : AbstractFieldMapper(type) {
+abstract class TypeFieldMapper : AbstractFieldMapper() {
     var agentClassType = ""
     val fields = mutableListOf<ConfigField>()
 
@@ -66,24 +66,4 @@ abstract class TypeFieldMapper(type: String) : AbstractFieldMapper(type) {
             }
         }
     }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as TypeFieldMapper
-
-        if (agentClassType != other.agentClassType) return false
-        if (fields != other.fields) return false
-        if (properties != other.properties) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = agentClassType.hashCode()
-        result = 31 * result + fields.hashCode()
-        result = 31 * result + properties.hashCode()
-        return result
-    }
 }

src/test/kotlin/ch/memobase/test/TestMapperParseHelpers.kt

@@ -29,7 +29,6 @@ class TestMapperParseHelpers {
         val mapperReqs: Consumer<AgentFieldMapper> = Consumer { agentFieldMapper: AgentFieldMapper ->
             assertThat(agentFieldMapper.sourceKey).isEqualTo("creators")
             assertThat(agentFieldMapper.agentClassType).isEqualTo("person")
-            assertThat(agentFieldMapper.type).isEqualTo("agent")
         }
         val mapper = mappers[0] as AgentFieldMapper
         assertThat(mapper)
@@ -54,7 +53,6 @@ class TestMapperParseHelpers {
         val mapperReqs: Consumer<AgentFieldMapper> = Consumer { agentFieldMapper: AgentFieldMapper ->
             assertThat(agentFieldMapper.sourceKey).isEqualTo("creators")
             assertThat(agentFieldMapper.agentClassType).isEqualTo("person")
-            assertThat(agentFieldMapper.type).isEqualTo("agent")
         }
         val mapper = mappers[0] as AgentFieldMapper
         assertThat(mapper)
@@ -77,7 +75,6 @@ class TestMapperParseHelpers {
         val mapperReqs: Consumer<AgentFieldMapper> = Consumer { agentFieldMapper: AgentFieldMapper ->
             assertThat(agentFieldMapper.sourceKey).isEqualTo("creators")
             assertThat(agentFieldMapper.agentClassType).isEqualTo("person")
-            assertThat(agentFieldMapper.type).isEqualTo("agent")
         }
         val mapper = mappers[0] as AgentFieldMapper
         assertThat(mapper)
@@ -103,7 +100,6 @@ class TestMapperParseHelpers {
         val mapperReqs: Consumer<AgentFieldMapper> = Consumer { agentFieldMapper: AgentFieldMapper ->
             assertThat(agentFieldMapper.sourceKey).isEqualTo("creators")
             assertThat(agentFieldMapper.agentClassType).isEqualTo("person")
-            assertThat(agentFieldMapper.type).isEqualTo("agent")
         }
         val mapper = mappers[0] as AgentFieldMapper
         assertThat(mapper)

src/test/resources/turtleOutput/agent-mapper-with-name-and-relation.ttl

@@ -5,6 +5,16 @@
 @prefix ebucore: <http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#> .
 @prefix skos:  <http://www.w3.org/2004/02/skos/core#> .
 
+_:b0    a                               rico:CreationRelation ;
+        rico:creationRelationHasSource  <https://memobase.ch/record/rs1-1> ;
+        rico:creationRelationHasTarget  [ a          rico:Person ;
+                                          rico:agentIsTargetOfCreationRelation
+                                                  _:b0 ;
+                                          rico:name  "Hans Zimmer"
+                                        ] ;
+        rico:name                       "Author" ;
+        rico:type                       "creator" .
+
 <https://memobase.ch/record/rs1-1>
         a                  rico:Record ;
         rdau:P60451        <https://memobase.ch/institution/mrv> ;
@@ -19,13 +29,3 @@
         rico:recordResourceOrInstantiationIsSourceOfCreationRelation
                 _:b0 ;
         rico:type          "Foto" .
-
-_:b0    a                               rico:CreationRelation ;
-        rico:creationRelationHasSource  <https://memobase.ch/record/rs1-1> ;
-        rico:creationRelationHasTarget  [ a          rico:Person ;
-                                          rico:agentIsTargetOfCreationRelation
-                                                  _:b0 ;
-                                          rico:name  "Hans Zimmer"
-                                        ] ;
-        rico:name                       "Author" ;
-        rico:type                       "creator" .

src/test/resources/turtleOutput/agent-mapper-with-name-only.ttl

@@ -5,15 +5,6 @@
 @prefix ebucore: <http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#> .
 @prefix skos:  <http://www.w3.org/2004/02/skos/core#> .
 
-_:b0    a                               rico:CreationRelation ;
-        rico:creationRelationHasSource  <https://memobase.ch/record/rs1-1> ;
-        rico:creationRelationHasTarget  [ a          rico:Person ;
-                                          rico:agentIsTargetOfCreationRelation
-                                                  _:b0 ;
-                                          rico:name  "Hans Zimmer"
-                                        ] ;
-        rico:type                       "creator" .
-
 <https://memobase.ch/record/rs1-1>
         a                  rico:Record ;
         rdau:P60451        <https://memobase.ch/institution/mrv> ;
@@ -28,3 +19,12 @@ _:b0    a                               rico:CreationRelation ;
         rico:recordResourceOrInstantiationIsSourceOfCreationRelation
                 _:b0 ;
         rico:type          "Foto" .
+
+_:b0    a                               rico:CreationRelation ;
+        rico:creationRelationHasSource  <https://memobase.ch/record/rs1-1> ;
+        rico:creationRelationHasTarget  [ a          rico:Person ;
+                                          rico:agentIsTargetOfCreationRelation
+                                                  _:b0 ;
+                                          rico:name  "Hans Zimmer"
+                                        ] ;
+        rico:type                       "creator" .