diff --git a/src/main/java/com/google/genai/interactions/core/Check.kt b/src/main/java/com/google/genai/interactions/core/Check.kt index 2c0ef8fe77a..df7678d59d3 100644 --- a/src/main/java/com/google/genai/interactions/core/Check.kt +++ b/src/main/java/com/google/genai/interactions/core/Check.kt @@ -108,5 +108,4 @@ private val RUNTIME_JACKSON_VERSIONS: List = com.fasterxml.jackson.databind.cfg.PackageVersion.VERSION, com.fasterxml.jackson.datatype.jdk8.PackageVersion.VERSION, com.fasterxml.jackson.datatype.jsr310.PackageVersion.VERSION, - com.fasterxml.jackson.module.kotlin.PackageVersion.VERSION, ) diff --git a/src/main/java/com/google/genai/interactions/core/ObjectMappers.kt b/src/main/java/com/google/genai/interactions/core/ObjectMappers.kt index 3b4c3b54663..a6755966fed 100644 --- a/src/main/java/com/google/genai/interactions/core/ObjectMappers.kt +++ b/src/main/java/com/google/genai/interactions/core/ObjectMappers.kt @@ -35,7 +35,6 @@ import com.fasterxml.jackson.databind.module.SimpleModule import com.fasterxml.jackson.databind.type.LogicalType import com.fasterxml.jackson.datatype.jdk8.Jdk8Module import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule -import com.fasterxml.jackson.module.kotlin.kotlinModule import java.io.InputStream import java.time.DateTimeException import java.time.LocalDate @@ -47,7 +46,6 @@ import java.time.temporal.ChronoField fun jsonMapper(): JsonMapper = JsonMapper.builder() - .addModule(kotlinModule()) .addModule(Jdk8Module()) .addModule(JavaTimeModule()) .addModule( diff --git a/src/main/java/com/google/genai/interactions/core/handlers/JsonHandler.kt b/src/main/java/com/google/genai/interactions/core/handlers/JsonHandler.kt index c452f2eb0b5..28663fea207 100644 --- a/src/main/java/com/google/genai/interactions/core/handlers/JsonHandler.kt +++ b/src/main/java/com/google/genai/interactions/core/handlers/JsonHandler.kt @@ -19,7 +19,7 @@ package com.google.genai.interactions.core.handlers import com.fasterxml.jackson.databind.json.JsonMapper -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.http.HttpResponse import com.google.genai.interactions.core.http.HttpResponse.Handler import com.google.genai.interactions.errors.GeminiNextGenApiInvalidDataException diff --git a/src/main/java/com/google/genai/interactions/core/http/SseMessage.kt b/src/main/java/com/google/genai/interactions/core/http/SseMessage.kt index 532387727bc..1cb79d5c9e8 100644 --- a/src/main/java/com/google/genai/interactions/core/http/SseMessage.kt +++ b/src/main/java/com/google/genai/interactions/core/http/SseMessage.kt @@ -19,7 +19,7 @@ package com.google.genai.interactions.core.http import com.fasterxml.jackson.databind.json.JsonMapper -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.errors.GeminiNextGenApiInvalidDataException import java.util.Objects @@ -59,7 +59,7 @@ private constructor( inline fun json(): T = try { - jsonMapper.readerFor(jacksonTypeRef()).readValue(jsonNode) + jsonMapper.readerFor(object : TypeReference() {}).readValue(jsonNode) } catch (e: Exception) { throw GeminiNextGenApiInvalidDataException("Error reading response", e) } diff --git a/src/main/java/com/google/genai/interactions/models/interactions/Annotation.kt b/src/main/java/com/google/genai/interactions/models/interactions/Annotation.kt index 63870942e7d..a13389c3a78 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/Annotation.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/Annotation.kt @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.JsonValue @@ -204,17 +204,17 @@ private constructor( when (type) { "url_citation" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Annotation(urlCitation = it, _json = json) } ?: Annotation(_json = json) } "file_citation" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Annotation(fileCitation = it, _json = json) } ?: Annotation(_json = json) } "place_citation" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Annotation(placeCitation = it, _json = json) } ?: Annotation(_json = json) } diff --git a/src/main/java/com/google/genai/interactions/models/interactions/Content.kt b/src/main/java/com/google/genai/interactions/models/interactions/Content.kt index e59b2ed98bf..d4308cd620a 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/Content.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/Content.kt @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.JsonValue @@ -247,27 +247,27 @@ private constructor( when (type) { "text" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Content(text = it, _json = json) } ?: Content(_json = json) } "image" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Content(image = it, _json = json) } ?: Content(_json = json) } "audio" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Content(audio = it, _json = json) } ?: Content(_json = json) } "document" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Content(document = it, _json = json) } ?: Content(_json = json) } "video" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Content(video = it, _json = json) } ?: Content(_json = json) } diff --git a/src/main/java/com/google/genai/interactions/models/interactions/CreateAgentInteractionParams.kt b/src/main/java/com/google/genai/interactions/models/interactions/CreateAgentInteractionParams.kt index 94cd32d078d..918d3a6f445 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/CreateAgentInteractionParams.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/CreateAgentInteractionParams.kt @@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.Enum @@ -1635,28 +1635,28 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(textContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(imageContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(audioContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(documentContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(videoContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(string = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef>())?.let { + tryDeserialize(node, object : TypeReference>() {})?.let { Input(stepList = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef>())?.let { + tryDeserialize(node, object : TypeReference>() {})?.let { Input(contentList = it, _json = json) }, ) @@ -1848,12 +1848,12 @@ private constructor( when (type) { "dynamic" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { AgentConfig(dynamic = it, _json = json) } ?: AgentConfig(_json = json) } "deep-research" -> { - return tryDeserialize(node, jacksonTypeRef()) + return tryDeserialize(node, object : TypeReference() {}) ?.let { AgentConfig(deepResearch = it, _json = json) } ?: AgentConfig(_json = json) } @@ -2116,22 +2116,22 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(audio = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(text = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(image = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(video = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef>())?.let { + tryDeserialize(node, object : TypeReference>() {})?.let { ResponseFormat(list = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(jsonValue = it, _json = json) }, ) @@ -2387,19 +2387,19 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(audio = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(text = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(image = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(video = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(jsonValue = it, _json = json) }, ) diff --git a/src/main/java/com/google/genai/interactions/models/interactions/CreateModelInteractionParams.kt b/src/main/java/com/google/genai/interactions/models/interactions/CreateModelInteractionParams.kt index 8594fce1a80..adf34a65e21 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/CreateModelInteractionParams.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/CreateModelInteractionParams.kt @@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.Enum @@ -1490,28 +1490,28 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(textContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(imageContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(audioContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(documentContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(videoContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(string = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef>())?.let { + tryDeserialize(node, object : TypeReference>() {})?.let { Input(stepList = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef>())?.let { + tryDeserialize(node, object : TypeReference>() {})?.let { Input(contentList = it, _json = json) }, ) @@ -1790,22 +1790,22 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(audio = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(text = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(image = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(video = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef>())?.let { + tryDeserialize(node, object : TypeReference>() {})?.let { ResponseFormat(list = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(jsonValue = it, _json = json) }, ) @@ -2061,19 +2061,19 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(audio = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(text = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(image = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(video = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(jsonValue = it, _json = json) }, ) diff --git a/src/main/java/com/google/genai/interactions/models/interactions/FunctionResultStep.kt b/src/main/java/com/google/genai/interactions/models/interactions/FunctionResultStep.kt index 493092aec42..c65e6d6ed37 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/FunctionResultStep.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/FunctionResultStep.kt @@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.ExcludeMissing @@ -535,12 +535,12 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Result(string = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef>()) + tryDeserialize(node, object : TypeReference>() {}) ?.let { Result(functionResultSubcontentList = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Result(jsonValue = it, _json = json) }, ) @@ -728,12 +728,12 @@ private constructor( when (type) { "text" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { FunctionResultSubcontent(text = it, _json = json) } ?: FunctionResultSubcontent(_json = json) } "image" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { FunctionResultSubcontent(image = it, _json = json) } ?: FunctionResultSubcontent(_json = json) } diff --git a/src/main/java/com/google/genai/interactions/models/interactions/GenerationConfig.kt b/src/main/java/com/google/genai/interactions/models/interactions/GenerationConfig.kt index dd29cf4c0cd..e80b580c900 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/GenerationConfig.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/GenerationConfig.kt @@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.Enum @@ -838,10 +838,10 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ToolChoice(type = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ToolChoice(config = it, _json = json) }, ) diff --git a/src/main/java/com/google/genai/interactions/models/interactions/Interaction.kt b/src/main/java/com/google/genai/interactions/models/interactions/Interaction.kt index f13f058645a..e77d0c972a7 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/Interaction.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/Interaction.kt @@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.Enum @@ -1627,12 +1627,12 @@ private constructor( when (type) { "dynamic" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { AgentConfig(dynamic = it, _json = json) } ?: AgentConfig(_json = json) } "deep-research" -> { - return tryDeserialize(node, jacksonTypeRef()) + return tryDeserialize(node, object : TypeReference() {}) ?.let { AgentConfig(deepResearch = it, _json = json) } ?: AgentConfig(_json = json) } @@ -1956,28 +1956,28 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(textContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(imageContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(audioContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(documentContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(videoContent = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Input(string = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef>())?.let { + tryDeserialize(node, object : TypeReference>() {})?.let { Input(stepList = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef>())?.let { + tryDeserialize(node, object : TypeReference>() {})?.let { Input(contentList = it, _json = json) }, ) @@ -2256,22 +2256,22 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(audio = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(text = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(image = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(video = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef>())?.let { + tryDeserialize(node, object : TypeReference>() {})?.let { ResponseFormat(list = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { ResponseFormat(jsonValue = it, _json = json) }, ) @@ -2527,19 +2527,19 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(audio = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(text = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(image = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(video = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { InnerResponseFormat(jsonValue = it, _json = json) }, ) diff --git a/src/main/java/com/google/genai/interactions/models/interactions/InteractionCreateParams.kt b/src/main/java/com/google/genai/interactions/models/interactions/InteractionCreateParams.kt index 9a2e05239f2..878d27dbbf2 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/InteractionCreateParams.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/InteractionCreateParams.kt @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.JsonValue @@ -411,9 +411,9 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef()) + tryDeserialize(node, object : TypeReference() {}) ?.let { Body(createModelInteractionParams = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef()) + tryDeserialize(node, object : TypeReference() {}) ?.let { Body(createAgentInteractionParams = it, _json = json) }, ) .filterNotNull() diff --git a/src/main/java/com/google/genai/interactions/models/interactions/InteractionSseEvent.kt b/src/main/java/com/google/genai/interactions/models/interactions/InteractionSseEvent.kt index 97700613749..a5dd75c274c 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/InteractionSseEvent.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/InteractionSseEvent.kt @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.JsonValue @@ -281,37 +281,37 @@ private constructor( when (eventType) { "interaction.created" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { InteractionSseEvent(created = it, _json = json) } ?: InteractionSseEvent(_json = json) } "interaction.completed" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { InteractionSseEvent(completed = it, _json = json) } ?: InteractionSseEvent(_json = json) } "interaction.status_update" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { InteractionSseEvent(statusUpdate = it, _json = json) } ?: InteractionSseEvent(_json = json) } "error" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { InteractionSseEvent(error = it, _json = json) } ?: InteractionSseEvent(_json = json) } "step.start" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { InteractionSseEvent(stepStart = it, _json = json) } ?: InteractionSseEvent(_json = json) } "step.delta" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { InteractionSseEvent(stepDelta = it, _json = json) } ?: InteractionSseEvent(_json = json) } "step.stop" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { InteractionSseEvent(stepStop = it, _json = json) } ?: InteractionSseEvent(_json = json) } diff --git a/src/main/java/com/google/genai/interactions/models/interactions/McpServerToolResultStep.kt b/src/main/java/com/google/genai/interactions/models/interactions/McpServerToolResultStep.kt index 81da5319e81..fd3f35bab2c 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/McpServerToolResultStep.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/McpServerToolResultStep.kt @@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.ExcludeMissing @@ -538,12 +538,12 @@ private constructor( val bestMatches = sequenceOf( - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Result(string = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef>()) + tryDeserialize(node, object : TypeReference>() {}) ?.let { Result(functionResultSubcontentList = it, _json = json) }, - tryDeserialize(node, jacksonTypeRef())?.let { + tryDeserialize(node, object : TypeReference() {})?.let { Result(jsonValue = it, _json = json) }, ) @@ -731,12 +731,12 @@ private constructor( when (type) { "text" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { FunctionResultSubcontent(text = it, _json = json) } ?: FunctionResultSubcontent(_json = json) } "image" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { FunctionResultSubcontent(image = it, _json = json) } ?: FunctionResultSubcontent(_json = json) } diff --git a/src/main/java/com/google/genai/interactions/models/interactions/Step.kt b/src/main/java/com/google/genai/interactions/models/interactions/Step.kt index 973fe6d71b4..83c7cffe310 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/Step.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/Step.kt @@ -24,7 +24,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.JsonValue @@ -611,87 +611,87 @@ private constructor( when (type) { "user_input" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(userInput = it, _json = json) } ?: Step(_json = json) } "model_output" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(modelOutput = it, _json = json) } ?: Step(_json = json) } "thought" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(thought = it, _json = json) } ?: Step(_json = json) } "function_call" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(functionCall = it, _json = json) } ?: Step(_json = json) } "code_execution_call" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(codeExecutionCall = it, _json = json) } ?: Step(_json = json) } "url_context_call" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(urlContextCall = it, _json = json) } ?: Step(_json = json) } "mcp_server_tool_call" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(mcpServerToolCall = it, _json = json) } ?: Step(_json = json) } "google_search_call" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(googleSearchCall = it, _json = json) } ?: Step(_json = json) } "file_search_call" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(fileSearchCall = it, _json = json) } ?: Step(_json = json) } "google_maps_call" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(googleMapsCall = it, _json = json) } ?: Step(_json = json) } "function_result" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(functionResult = it, _json = json) } ?: Step(_json = json) } "code_execution_result" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(codeExecutionResult = it, _json = json) } ?: Step(_json = json) } "url_context_result" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(urlContextResult = it, _json = json) } ?: Step(_json = json) } "google_search_result" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(googleSearchResult = it, _json = json) } ?: Step(_json = json) } "mcp_server_tool_result" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(mcpServerToolResult = it, _json = json) } ?: Step(_json = json) } "file_search_result" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(fileSearchResult = it, _json = json) } ?: Step(_json = json) } "google_maps_result" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Step(googleMapsResult = it, _json = json) } ?: Step(_json = json) } diff --git a/src/main/java/com/google/genai/interactions/models/interactions/StepDelta.kt b/src/main/java/com/google/genai/interactions/models/interactions/StepDelta.kt index 0cd11c9fb3d..9440e058438 100644 --- a/src/main/java/com/google/genai/interactions/models/interactions/StepDelta.kt +++ b/src/main/java/com/google/genai/interactions/models/interactions/StepDelta.kt @@ -28,7 +28,7 @@ import com.fasterxml.jackson.databind.JsonNode import com.fasterxml.jackson.databind.SerializerProvider import com.fasterxml.jackson.databind.annotation.JsonDeserialize import com.fasterxml.jackson.databind.annotation.JsonSerialize -import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import com.fasterxml.jackson.core.type.TypeReference import com.google.genai.interactions.core.BaseDeserializer import com.google.genai.interactions.core.BaseSerializer import com.google.genai.interactions.core.Enum @@ -619,47 +619,47 @@ private constructor( when (type) { "text" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Delta(text = it, _json = json) } ?: Delta(_json = json) } "image" -> { - return tryDeserialize(node, jacksonTypeRef())?.let { + return tryDeserialize(node, object : TypeReference() {})?.let { Delta(image = it, _json = json) } ?: Delta(_json = json) } "audio" -> { - return tryDeserialize(node, jacksonTypeRef