make isValueAttribute function an attribute, so it gets serialized

Author: HighKo

kotlin-insight-client/kotlin-insight-client-api/src/main/kotlin/com/linkedplanet/kotlininsightclient/api/impl/AbstractNameMappedRepository.kt

@@ -86,7 +86,7 @@ abstract class AbstractNameMappedRepository<DomainType : Any>(
             val attributeType: ObjectTypeSchemaAttribute = attrsMap[prop.name.lowercase()] ?: return@mapNotNull null
             val value: Any? = prop.get(domainObject)
             when {
-                attributeType.isValueAttribute() -> mapValueAttribute(value, attributeType)
+                attributeType.isValueAttribute -> mapValueAttribute(value, attributeType)
 
                 attributeType is ObjectTypeSchemaAttribute.ReferenceSchema -> {
                     val referencedObjectIds = attributeToReferencedObjectId(attributeType, value)
@@ -138,7 +138,7 @@ abstract class AbstractNameMappedRepository<DomainType : Any>(
             val attributeId = attrsMap[param.name?.lowercase()]?.id ?: return@map null
             val attribute = insightObject.getAttribute(attributeId)
             val mappedValue = when {
-                attribute?.isReference() == true -> referenceAttributeToValue(attribute)
+                attribute?.let { it is InsightAttribute.Reference } == true -> referenceAttributeToValue(attribute)
                 attribute == null -> null
                 else -> defaultAttributeToValue(attribute, param.type).bind()
             }

kotlin-insight-client/kotlin-insight-client-api/src/main/kotlin/com/linkedplanet/kotlininsightclient/api/model/InsightObjectExtensions.kt

@@ -39,10 +39,12 @@ fun InsightObject.getAttributeByName(name: String): InsightAttribute? =
     this.attributes.firstOrNull { it.schema?.name == name }
 
 fun InsightObject.isReferenceAttribute(id: InsightAttributeId): Boolean =
-    getAttribute(id)?.isReference() ?: false
+    getAttribute(id)?.isReferenceAttribute() ?: false
+
+fun InsightAttribute.isReferenceAttribute() = this is InsightAttribute.Reference
 
 fun InsightObject.isValueAttribute(id: InsightAttributeId): Boolean =
-    getAttribute(id)?.isValueAttribute() ?: false
+    getAttribute(id)?.isValueAttribute ?: false
 
 fun InsightObject.exists(id: InsightAttributeId): Boolean =
     getAttribute(id) != null

kotlin-insight-client/kotlin-insight-client-api/src/main/kotlin/com/linkedplanet/kotlininsightclient/api/model/Model.kt

@@ -20,11 +20,11 @@
 package com.linkedplanet.kotlininsightclient.api.model
 
 import io.swagger.v3.oas.annotations.media.Schema
-import javax.validation.constraints.NotNull
 import java.time.LocalDate
 import java.time.LocalTime
 import java.time.ZonedDateTime
 import java.util.Collections.emptyList
+import javax.validation.constraints.NotNull
 
 // region ID wrapper
 
@@ -123,31 +123,31 @@ sealed class InsightAttribute(
     @field:NotNull val attributeId: InsightAttributeId,
     val schema: ObjectTypeSchemaAttribute?
 ) {
-    fun isValueAttribute(): Boolean = when(this){
-        is Text -> true
-        is Integer -> true
-        is Bool -> true
-        is DoubleNumber -> true
-        is Select -> true
-        is Date -> true
-        is Time -> true
-        is DateTime -> true
-        is Url -> true
-        is Email -> true
-        is Textarea -> true
-        is Ipaddress -> true
-
-        is Unknown -> false
-        is Reference -> false
-        is User -> false
-        is Confluence -> false
-        is Group -> false
-        is Version -> false
-        is Project -> false
-        is Status -> false
+    val isValueAttribute: Boolean by lazy {
+        when (this) {
+            is Text -> true
+            is Integer -> true
+            is Bool -> true
+            is DoubleNumber -> true
+            is Select -> true
+            is Date -> true
+            is Time -> true
+            is DateTime -> true
+            is Url -> true
+            is Email -> true
+            is Textarea -> true
+            is Ipaddress -> true
+
+            is Unknown -> false
+            is Reference -> false
+            is User -> false
+            is Confluence -> false
+            is Group -> false
+            is Version -> false
+            is Project -> false
+            is Status -> false
+        }
     }
-    fun isReference() : Boolean = this is Reference
-
 
     class Text(attributeId: InsightAttributeId, val value: String?, schema: ObjectTypeSchemaAttribute?) : InsightAttribute(attributeId, schema)
     class Integer(attributeId: InsightAttributeId,val value: Int?, schema: ObjectTypeSchemaAttribute?) : InsightAttribute(attributeId, schema)
@@ -303,32 +303,32 @@ sealed class ObjectTypeSchemaAttribute(
     @field:NotNull val includeChildObjectTypes: Boolean
 ) {
 
-    fun isValueAttribute(): Boolean = when(this){
-        is TextSchema -> true
-        is IntegerSchema -> true
-        is BoolSchema -> true
-        is DoubleNumberSchema -> true
-        is SelectSchema -> true
-        is DateSchema -> true
-        is TimeSchema -> true
-        is DateTimeSchema -> true
-        is UrlSchema -> true
-        is EmailSchema -> true
-        is TextareaSchema -> true
-        is IpaddressSchema -> true
-
-        is UnknownSchema -> false
-        is ReferenceSchema -> false
-        is UserSchema -> false
-        is ConfluenceSchema -> false
-        is GroupSchema -> false
-        is VersionSchema -> false
-        is ProjectSchema -> false
-        is StatusSchema -> false
+    val isValueAttribute: Boolean by lazy {
+        when(this){
+            is TextSchema -> true
+            is IntegerSchema -> true
+            is BoolSchema -> true
+            is DoubleNumberSchema -> true
+            is SelectSchema -> true
+            is DateSchema -> true
+            is TimeSchema -> true
+            is DateTimeSchema -> true
+            is UrlSchema -> true
+            is EmailSchema -> true
+            is TextareaSchema -> true
+            is IpaddressSchema -> true
+
+            is UnknownSchema -> false
+            is ReferenceSchema -> false
+            is UserSchema -> false
+            is ConfluenceSchema -> false
+            is GroupSchema -> false
+            is VersionSchema -> false
+            is ProjectSchema -> false
+            is StatusSchema -> false
+        }
     }
 
-    fun isReference() : Boolean = this is ReferenceSchema
-
     class SelectSchema(
         id: InsightAttributeId,
         name: String,