Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions apple-maps-server-kotlin/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import com.vanniktech.maven.publish.KotlinJvm
import com.vanniktech.maven.publish.SonatypeHost

plugins {
kotlin("jvm") version "1.9.22"
kotlin("jvm") version "2.3.0"
id("com.vanniktech.maven.publish") version "0.26.0"
id("org.jetbrains.dokka") version "1.9.10"
id("org.jetbrains.dokka") version "2.1.0"

`java-library`
}
Expand All @@ -18,10 +18,10 @@ repositories {
}

dependencies {
implementation(kotlin("stdlib:1.9.20"))
implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.16.1")
implementation("com.fasterxml.jackson.core:jackson-annotations:2.16.1")
implementation("com.fasterxml.jackson.core:jackson-databind:2.16.1")
implementation(kotlin("stdlib"))
implementation(platform("tools.jackson:jackson-bom:3.0.3"))
implementation("tools.jackson.module:jackson-module-kotlin")
implementation("tools.jackson.core:jackson-databind")
}

mavenPublishing {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.doorbit.applemaps

import com.fasterxml.jackson.annotation.JsonInclude
import com.fasterxml.jackson.core.type.TypeReference
import com.fasterxml.jackson.databind.DeserializationFeature
import com.fasterxml.jackson.databind.ObjectMapper
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import tools.jackson.core.type.TypeReference
import tools.jackson.databind.ObjectMapper
import tools.jackson.databind.json.JsonMapper
import tools.jackson.module.kotlin.KotlinModule
import java.net.URI
import java.net.http.HttpClient
import java.net.http.HttpRequest
Expand Down Expand Up @@ -108,10 +108,12 @@ class AppleMaps(
}

private fun defaultObjectMapper(): ObjectMapper {
val om = jacksonObjectMapper()
om.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false)
om.setSerializationInclusion(JsonInclude.Include.NON_NULL)
return om
return JsonMapper.builder()
.addModule(KotlinModule.Builder().build())
.changeDefaultPropertyInclusion { incl ->
incl.withValueInclusion(JsonInclude.Include.NON_NULL)
}
.build()
Comment on lines +111 to +116

Copilot AI Jan 14, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The removal of configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) may cause deserialization to fail when the Apple Maps API returns unexpected fields. In Jackson 3, the default behavior is to fail on unknown properties. Consider adding .disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES) to the builder chain to maintain backward compatibility and prevent potential runtime failures.

Copilot uses AI. Check for mistakes.
}

companion object {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.doorbit.applemaps

import com.fasterxml.jackson.databind.JsonNode
import com.fasterxml.jackson.databind.ObjectMapper
import tools.jackson.databind.JsonNode
import tools.jackson.databind.ObjectMapper
import java.net.URI
import java.net.http.HttpClient
import java.net.http.HttpRequest
Expand Down Expand Up @@ -47,7 +47,7 @@ class AppleMapsAuthorizationService(
}

val jsonNode = objectMapper.readValue(response.body(), JsonNode::class.java)
val tokenString = jsonNode["accessToken"].asText()
val tokenString = jsonNode["accessToken"].stringValue()
val expiresAt = extractExpiry(tokenString)

this.accessToken = AccessToken(tokenString, expiresAt)
Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,7 @@ POM_SCM_DEV_CONNECTION=scm:git:ssh://git@github.com/Doorbit/apple-maps-server-ko

POM_DEVELOPER_ID=dbt-lucka
POM_DEVELOPER_NAME=Stefano Lucka
POM_DEVELOPER_URL=https://github.com/dbt-lucka/
POM_DEVELOPER_URL=https://github.com/dbt-lucka/

# JDK 24+ native access warning suppression
org.gradle.jvmargs=-Xmx512m --enable-native-access=ALL-UNNAMED
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading