avoid lazy attribute for Gson compatibility, also avoid function beginning with "is" for swagger Schema generation

Author: HighKo

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

@@ -38,6 +38,7 @@ import com.linkedplanet.kotlininsightclient.api.model.InsightAttribute
 import com.linkedplanet.kotlininsightclient.api.model.ObjectTypeSchema
 import com.linkedplanet.kotlininsightclient.api.model.ObjectTypeSchemaAttribute
 import com.linkedplanet.kotlininsightclient.api.model.getAttribute
+import com.linkedplanet.kotlininsightclient.api.model.isValueAttribute
 import jdk.jfr.Experimental
 import kotlinx.coroutines.runBlocking
 import java.time.ZonedDateTime
@@ -86,7 +87,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)

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

@@ -44,7 +44,7 @@ fun InsightObject.isReferenceAttribute(id: InsightAttributeId): Boolean =
 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

@@ -125,32 +125,6 @@ sealed class InsightAttribute(
     val schema: ObjectTypeSchemaAttribute?,
     @field:NotNull val type: AttributeTypeEnum
 ) {
-    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
-        }
-    }
-
     class Text(attributeId: InsightAttributeId, val value: String?, schema: ObjectTypeSchemaAttribute?) : InsightAttribute(attributeId, schema, AttributeTypeEnum.Text)
     class Integer(attributeId: InsightAttributeId,val value: Int?, schema: ObjectTypeSchemaAttribute?) : InsightAttribute(attributeId, schema, AttributeTypeEnum.Integer)
     class Bool(attributeId: InsightAttributeId,val value: Boolean?, schema: ObjectTypeSchemaAttribute?) : InsightAttribute(attributeId, schema, AttributeTypeEnum.Bool)
@@ -262,6 +236,34 @@ sealed class InsightAttribute(
 
 }
 
+fun InsightAttribute.isValueAttribute() = this.type.isValueAttribute()
+fun ObjectTypeSchemaAttribute.isValueAttribute() = this.type.isValueAttribute()
+
+fun AttributeTypeEnum.isValueAttribute(): Boolean =
+    when (this) {
+        AttributeTypeEnum.Text -> true
+        AttributeTypeEnum.Integer -> true
+        AttributeTypeEnum.Bool -> true
+        AttributeTypeEnum.DoubleNumber -> true
+        AttributeTypeEnum.Select -> true
+        AttributeTypeEnum.Date -> true
+        AttributeTypeEnum.Time -> true
+        AttributeTypeEnum.DateTime -> true
+        AttributeTypeEnum.Url -> true
+        AttributeTypeEnum.Email -> true
+        AttributeTypeEnum.Textarea -> true
+        AttributeTypeEnum.Ipaddress -> true
+
+        AttributeTypeEnum.Unknown -> false
+        AttributeTypeEnum.Reference -> false
+        AttributeTypeEnum.User -> false
+        AttributeTypeEnum.Confluence -> false
+        AttributeTypeEnum.Group -> false
+        AttributeTypeEnum.Version -> false
+        AttributeTypeEnum.Project -> false
+        AttributeTypeEnum.Status -> false
+    }
+
 enum class AttributeTypeEnum {
     Text,
     Integer,
@@ -330,32 +332,6 @@ sealed class ObjectTypeSchemaAttribute(
     @field:NotNull val type: AttributeTypeEnum
 ) {
 
-    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
-        }
-    }
-
     class SelectSchema(
         id: InsightAttributeId,
         name: String,