diff --git a/generativeai/src/main/java/com/google/ai/client/generativeai/type/Type.kt b/generativeai/src/main/java/com/google/ai/client/generativeai/type/Type.kt index 3a693143..763667bb 100644 --- a/generativeai/src/main/java/com/google/ai/client/generativeai/type/Type.kt +++ b/generativeai/src/main/java/com/google/ai/client/generativeai/type/Type.kt @@ -29,22 +29,16 @@ import org.json.JSONObject */ class FunctionType(val name: String, val parse: (String?) -> T?) { companion object { - @JvmField - val STRING = FunctionType("STRING") { it } - @JvmField - val INTEGER = FunctionType("INTEGER") { it?.toIntOrNull() } - @JvmField - val LONG = FunctionType("INTEGER") { it?.toLongOrNull() } - @JvmField - val NUMBER = FunctionType("NUMBER") { it?.toDoubleOrNull() } - @JvmField - val BOOLEAN = FunctionType("BOOLEAN") { it?.toBoolean() } + @JvmField val STRING = FunctionType("STRING") { it } + @JvmField val INTEGER = FunctionType("INTEGER") { it?.toIntOrNull() } + @JvmField val LONG = FunctionType("INTEGER") { it?.toLongOrNull() } + @JvmField val NUMBER = FunctionType("NUMBER") { it?.toDoubleOrNull() } + @JvmField val BOOLEAN = FunctionType("BOOLEAN") { it?.toBoolean() } @JvmField val ARRAY = FunctionType>("ARRAY") { it -> it?.let { Json.parseToJsonElement(it).jsonArray.map { element -> element.toString() } } } - @JvmField - val OBJECT = FunctionType("OBJECT") { it?.let { JSONObject(it) } } + @JvmField val OBJECT = FunctionType("OBJECT") { it?.let { JSONObject(it) } } } }