diff --git a/.release-please-manifest.json b/.release-please-manifest.json index 3b0f7de..b3365ec 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "0.1.0-alpha.54" + ".": "0.1.0-alpha.55" } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 2617071..8bd8178 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## 0.1.0-alpha.55 (2025-01-02) + +Full Changelog: [v0.1.0-alpha.54...v0.1.0-alpha.55](https://github.com/OneBusAway/kotlin-sdk/compare/v0.1.0-alpha.54...v0.1.0-alpha.55) + +### Bug Fixes + +* correctly generate intersection tests ([#149](https://github.com/OneBusAway/kotlin-sdk/issues/149)) ([a34b53e](https://github.com/OneBusAway/kotlin-sdk/commit/a34b53ef47ffe593c6c8c6c916d3a38ebba2aaf6)) + + +### Chores + +* **internal:** codegen related update ([#148](https://github.com/OneBusAway/kotlin-sdk/issues/148)) ([531a52b](https://github.com/OneBusAway/kotlin-sdk/commit/531a52b6fa375d9720a99d178bc20d3e5ad199c6)) + ## 0.1.0-alpha.54 (2025-01-02) Full Changelog: [v0.1.0-alpha.53...v0.1.0-alpha.54](https://github.com/OneBusAway/kotlin-sdk/compare/v0.1.0-alpha.53...v0.1.0-alpha.54) diff --git a/README.md b/README.md index c42a424..7a38df8 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ The REST API documentation can be found on [developer.onebusaway.org](https://d ```kotlin -implementation("org.onebusaway:onebusaway-sdk-kotlin:0.1.0-alpha.54") +implementation("org.onebusaway:onebusaway-sdk-kotlin:0.1.0-alpha.55") ``` #### Maven @@ -30,7 +30,7 @@ implementation("org.onebusaway:onebusaway-sdk-kotlin:0.1.0-alpha.54") org.onebusaway onebusaway-sdk-kotlin - 0.1.0-alpha.54 + 0.1.0-alpha.55 ``` diff --git a/build.gradle.kts b/build.gradle.kts index 3b06bd1..8e8abd4 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -4,7 +4,7 @@ plugins { allprojects { group = "org.onebusaway" - version = "0.1.0-alpha.54" // x-release-please-version + version = "0.1.0-alpha.55" // x-release-please-version } nexusPublishing { diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/core/Utils.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/core/Utils.kt index 806ac8b..3b5d37e 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/core/Utils.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/core/Utils.kt @@ -13,7 +13,9 @@ internal fun List.toImmutable(): List = if (isEmpty()) Collections.emptyList() else Collections.unmodifiableList(toList()) internal fun Map.toImmutable(): Map = - if (isEmpty()) Collections.emptyMap() else Collections.unmodifiableMap(toMap()) + if (isEmpty()) immutableEmptyMap() else Collections.unmodifiableMap(toMap()) + +internal fun immutableEmptyMap(): Map = Collections.emptyMap() internal fun , V> SortedMap.toImmutable(): SortedMap = if (isEmpty()) Collections.emptySortedMap() diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/errors/OnebusawaySdkError.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/errors/OnebusawaySdkError.kt index 9a2b26f..7715cdd 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/errors/OnebusawaySdkError.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/errors/OnebusawaySdkError.kt @@ -4,18 +4,22 @@ package org.onebusaway.errors import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter -import com.fasterxml.jackson.databind.annotation.JsonDeserialize +import com.fasterxml.jackson.annotation.JsonCreator import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = OnebusawaySdkError.Builder::class) @NoAutoDetect class OnebusawaySdkError +@JsonCreator private constructor( - @JsonAnyGetter @ExcludeMissing val additionalProperties: Map, + @JsonAnyGetter + @ExcludeMissing + @JsonAnySetter + val additionalProperties: Map = immutableEmptyMap(), ) { fun toBuilder() = Builder().from(this) @@ -38,7 +42,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/AgenciesWithCoverageListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/AgenciesWithCoverageListResponse.kt index 000e12e..6ae25f8 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/AgenciesWithCoverageListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/AgenciesWithCoverageListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = AgenciesWithCoverageListResponse.Builder::class) @NoAutoDetect class AgenciesWithCoverageListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -100,32 +105,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -133,7 +128,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -159,14 +153,21 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val limitExceeded: JsonField, - private val list: JsonField>, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun limitExceeded(): Boolean = limitExceeded.getRequired("limitExceeded") @@ -219,22 +220,16 @@ private constructor( fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun list(list: kotlin.collections.List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -244,7 +239,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -268,16 +262,27 @@ private constructor( ) } - @JsonDeserialize(builder = List.Builder::class) @NoAutoDetect class List + @JsonCreator private constructor( - private val agencyId: JsonField, - private val lat: JsonField, - private val latSpan: JsonField, - private val lon: JsonField, - private val lonSpan: JsonField, - private val additionalProperties: Map, + @JsonProperty("agencyId") + @ExcludeMissing + private val agencyId: JsonField = JsonMissing.of(), + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("latSpan") + @ExcludeMissing + private val latSpan: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonProperty("lonSpan") + @ExcludeMissing + private val lonSpan: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun agencyId(): String = agencyId.getRequired("agencyId") @@ -344,32 +349,22 @@ private constructor( fun agencyId(agencyId: String) = agencyId(JsonField.of(agencyId)) - @JsonProperty("agencyId") - @ExcludeMissing fun agencyId(agencyId: JsonField) = apply { this.agencyId = agencyId } fun lat(lat: Double) = lat(JsonField.of(lat)) - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } fun latSpan(latSpan: Double) = latSpan(JsonField.of(latSpan)) - @JsonProperty("latSpan") - @ExcludeMissing fun latSpan(latSpan: JsonField) = apply { this.latSpan = latSpan } fun lon(lon: Double) = lon(JsonField.of(lon)) - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun lonSpan(lonSpan: Double) = lonSpan(JsonField.of(lonSpan)) - @JsonProperty("lonSpan") - @ExcludeMissing fun lonSpan(lonSpan: JsonField) = apply { this.lonSpan = lonSpan } fun additionalProperties(additionalProperties: Map) = apply { @@ -377,7 +372,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/AgencyRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/AgencyRetrieveResponse.kt index 560c628..acf60fd 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/AgencyRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/AgencyRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = AgencyRetrieveResponse.Builder::class) @NoAutoDetect class AgencyRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,14 +151,21 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val limitExceeded: JsonField, - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun limitExceeded(): Boolean = limitExceeded.getRequired("limitExceeded") @@ -217,22 +218,16 @@ private constructor( fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -242,7 +237,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -266,21 +260,42 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val disclaimer: JsonField, - private val email: JsonField, - private val fareUrl: JsonField, - private val id: JsonField, - private val lang: JsonField, - private val name: JsonField, - private val phone: JsonField, - private val privateService: JsonField, - private val timezone: JsonField, - private val url: JsonField, - private val additionalProperties: Map, + @JsonProperty("disclaimer") + @ExcludeMissing + private val disclaimer: JsonField = JsonMissing.of(), + @JsonProperty("email") + @ExcludeMissing + private val email: JsonField = JsonMissing.of(), + @JsonProperty("fareUrl") + @ExcludeMissing + private val fareUrl: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("lang") + @ExcludeMissing + private val lang: JsonField = JsonMissing.of(), + @JsonProperty("name") + @ExcludeMissing + private val name: JsonField = JsonMissing.of(), + @JsonProperty("phone") + @ExcludeMissing + private val phone: JsonField = JsonMissing.of(), + @JsonProperty("privateService") + @ExcludeMissing + private val privateService: JsonField = JsonMissing.of(), + @JsonProperty("timezone") + @ExcludeMissing + private val timezone: JsonField = JsonMissing.of(), + @JsonProperty("url") + @ExcludeMissing + private val url: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun disclaimer(): String? = disclaimer.getNullable("disclaimer") @@ -382,67 +397,47 @@ private constructor( fun disclaimer(disclaimer: String) = disclaimer(JsonField.of(disclaimer)) - @JsonProperty("disclaimer") - @ExcludeMissing fun disclaimer(disclaimer: JsonField) = apply { this.disclaimer = disclaimer } fun email(email: String) = email(JsonField.of(email)) - @JsonProperty("email") - @ExcludeMissing fun email(email: JsonField) = apply { this.email = email } fun fareUrl(fareUrl: String) = fareUrl(JsonField.of(fareUrl)) - @JsonProperty("fareUrl") - @ExcludeMissing fun fareUrl(fareUrl: JsonField) = apply { this.fareUrl = fareUrl } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun lang(lang: String) = lang(JsonField.of(lang)) - @JsonProperty("lang") - @ExcludeMissing fun lang(lang: JsonField) = apply { this.lang = lang } fun name(name: String) = name(JsonField.of(name)) - @JsonProperty("name") - @ExcludeMissing fun name(name: JsonField) = apply { this.name = name } fun phone(phone: String) = phone(JsonField.of(phone)) - @JsonProperty("phone") - @ExcludeMissing fun phone(phone: JsonField) = apply { this.phone = phone } fun privateService(privateService: Boolean) = privateService(JsonField.of(privateService)) - @JsonProperty("privateService") - @ExcludeMissing fun privateService(privateService: JsonField) = apply { this.privateService = privateService } fun timezone(timezone: String) = timezone(JsonField.of(timezone)) - @JsonProperty("timezone") - @ExcludeMissing fun timezone(timezone: JsonField) = apply { this.timezone = timezone } fun url(url: String) = url(JsonField.of(url)) - @JsonProperty("url") - @ExcludeMissing fun url(url: JsonField) = apply { this.url = url } fun additionalProperties(additionalProperties: Map) = apply { @@ -450,7 +445,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ArrivalAndDepartureListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ArrivalAndDepartureListResponse.kt index 2786353..ad69ac4 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ArrivalAndDepartureListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ArrivalAndDepartureListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = ArrivalAndDepartureListResponse.Builder::class) @NoAutoDetect class ArrivalAndDepartureListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -100,32 +105,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -133,7 +128,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -159,13 +153,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -211,14 +210,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -228,7 +223,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -251,12 +245,16 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val arrivalsAndDepartures: JsonField>, - private val additionalProperties: Map, + @JsonProperty("arrivalsAndDepartures") + @ExcludeMissing + private val arrivalsAndDepartures: JsonField> = + JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun arrivalsAndDepartures(): List = @@ -300,8 +298,6 @@ private constructor( fun arrivalsAndDepartures(arrivalsAndDepartures: List) = arrivalsAndDepartures(JsonField.of(arrivalsAndDepartures)) - @JsonProperty("arrivalsAndDepartures") - @ExcludeMissing fun arrivalsAndDepartures( arrivalsAndDepartures: JsonField> ) = apply { this.arrivalsAndDepartures = arrivalsAndDepartures } @@ -311,7 +307,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -336,45 +331,114 @@ private constructor( ) } - @JsonDeserialize(builder = ArrivalsAndDeparture.Builder::class) @NoAutoDetect class ArrivalsAndDeparture + @JsonCreator private constructor( - private val actualTrack: JsonField, - private val arrivalEnabled: JsonField, - private val blockTripSequence: JsonField, - private val departureEnabled: JsonField, - private val distanceFromStop: JsonField, - private val frequency: JsonField, - private val historicalOccupancy: JsonField, - private val lastUpdateTime: JsonField, - private val numberOfStopsAway: JsonField, - private val occupancyStatus: JsonField, - private val predicted: JsonField, - private val predictedArrivalInterval: JsonField, - private val predictedArrivalTime: JsonField, - private val predictedDepartureInterval: JsonField, - private val predictedDepartureTime: JsonField, - private val predictedOccupancy: JsonField, - private val routeId: JsonField, - private val routeLongName: JsonField, - private val routeShortName: JsonField, - private val scheduledArrivalInterval: JsonField, - private val scheduledArrivalTime: JsonField, - private val scheduledDepartureInterval: JsonField, - private val scheduledDepartureTime: JsonField, - private val scheduledTrack: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val status: JsonField, - private val stopId: JsonField, - private val stopSequence: JsonField, - private val totalStopsInTrip: JsonField, - private val tripHeadsign: JsonField, - private val tripId: JsonField, - private val tripStatus: JsonField, - private val vehicleId: JsonField, - private val additionalProperties: Map, + @JsonProperty("actualTrack") + @ExcludeMissing + private val actualTrack: JsonField = JsonMissing.of(), + @JsonProperty("arrivalEnabled") + @ExcludeMissing + private val arrivalEnabled: JsonField = JsonMissing.of(), + @JsonProperty("blockTripSequence") + @ExcludeMissing + private val blockTripSequence: JsonField = JsonMissing.of(), + @JsonProperty("departureEnabled") + @ExcludeMissing + private val departureEnabled: JsonField = JsonMissing.of(), + @JsonProperty("distanceFromStop") + @ExcludeMissing + private val distanceFromStop: JsonField = JsonMissing.of(), + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("historicalOccupancy") + @ExcludeMissing + private val historicalOccupancy: JsonField = JsonMissing.of(), + @JsonProperty("lastUpdateTime") + @ExcludeMissing + private val lastUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("numberOfStopsAway") + @ExcludeMissing + private val numberOfStopsAway: JsonField = JsonMissing.of(), + @JsonProperty("occupancyStatus") + @ExcludeMissing + private val occupancyStatus: JsonField = JsonMissing.of(), + @JsonProperty("predicted") + @ExcludeMissing + private val predicted: JsonField = JsonMissing.of(), + @JsonProperty("predictedArrivalInterval") + @ExcludeMissing + private val predictedArrivalInterval: JsonField = JsonMissing.of(), + @JsonProperty("predictedArrivalTime") + @ExcludeMissing + private val predictedArrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("predictedDepartureInterval") + @ExcludeMissing + private val predictedDepartureInterval: JsonField = JsonMissing.of(), + @JsonProperty("predictedDepartureTime") + @ExcludeMissing + private val predictedDepartureTime: JsonField = JsonMissing.of(), + @JsonProperty("predictedOccupancy") + @ExcludeMissing + private val predictedOccupancy: JsonField = JsonMissing.of(), + @JsonProperty("routeId") + @ExcludeMissing + private val routeId: JsonField = JsonMissing.of(), + @JsonProperty("routeLongName") + @ExcludeMissing + private val routeLongName: JsonField = JsonMissing.of(), + @JsonProperty("routeShortName") + @ExcludeMissing + private val routeShortName: JsonField = JsonMissing.of(), + @JsonProperty("scheduledArrivalInterval") + @ExcludeMissing + private val scheduledArrivalInterval: JsonField = JsonMissing.of(), + @JsonProperty("scheduledArrivalTime") + @ExcludeMissing + private val scheduledArrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("scheduledDepartureInterval") + @ExcludeMissing + private val scheduledDepartureInterval: JsonField = JsonMissing.of(), + @JsonProperty("scheduledDepartureTime") + @ExcludeMissing + private val scheduledDepartureTime: JsonField = JsonMissing.of(), + @JsonProperty("scheduledTrack") + @ExcludeMissing + private val scheduledTrack: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonProperty("stopId") + @ExcludeMissing + private val stopId: JsonField = JsonMissing.of(), + @JsonProperty("stopSequence") + @ExcludeMissing + private val stopSequence: JsonField = JsonMissing.of(), + @JsonProperty("totalStopsInTrip") + @ExcludeMissing + private val totalStopsInTrip: JsonField = JsonMissing.of(), + @JsonProperty("tripHeadsign") + @ExcludeMissing + private val tripHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonProperty("tripStatus") + @ExcludeMissing + private val tripStatus: JsonField = JsonMissing.of(), + @JsonProperty("vehicleId") + @ExcludeMissing + private val vehicleId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** The actual track information of the arriving transit vehicle. */ @@ -813,8 +877,6 @@ private constructor( fun actualTrack(actualTrack: String) = actualTrack(JsonField.of(actualTrack)) /** The actual track information of the arriving transit vehicle. */ - @JsonProperty("actualTrack") - @ExcludeMissing fun actualTrack(actualTrack: JsonField) = apply { this.actualTrack = actualTrack } @@ -824,8 +886,6 @@ private constructor( arrivalEnabled(JsonField.of(arrivalEnabled)) /** Indicates if riders can arrive on this transit vehicle. */ - @JsonProperty("arrivalEnabled") - @ExcludeMissing fun arrivalEnabled(arrivalEnabled: JsonField) = apply { this.arrivalEnabled = arrivalEnabled } @@ -839,8 +899,6 @@ private constructor( /** * Index of this arrival’s trip into the sequence of trips for the active block. */ - @JsonProperty("blockTripSequence") - @ExcludeMissing fun blockTripSequence(blockTripSequence: JsonField) = apply { this.blockTripSequence = blockTripSequence } @@ -850,8 +908,6 @@ private constructor( departureEnabled(JsonField.of(departureEnabled)) /** Indicates if riders can depart from this transit vehicle. */ - @JsonProperty("departureEnabled") - @ExcludeMissing fun departureEnabled(departureEnabled: JsonField) = apply { this.departureEnabled = departureEnabled } @@ -861,8 +917,6 @@ private constructor( distanceFromStop(JsonField.of(distanceFromStop)) /** Distance of the arriving transit vehicle from the stop, in meters. */ - @JsonProperty("distanceFromStop") - @ExcludeMissing fun distanceFromStop(distanceFromStop: JsonField) = apply { this.distanceFromStop = distanceFromStop } @@ -871,8 +925,6 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) /** Information about frequency-based scheduling, if applicable to the trip. */ - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } @@ -882,8 +934,6 @@ private constructor( historicalOccupancy(JsonField.of(historicalOccupancy)) /** Historical occupancy information of the transit vehicle. */ - @JsonProperty("historicalOccupancy") - @ExcludeMissing fun historicalOccupancy(historicalOccupancy: JsonField) = apply { this.historicalOccupancy = historicalOccupancy } @@ -893,8 +943,6 @@ private constructor( lastUpdateTime(JsonField.of(lastUpdateTime)) /** Timestamp of the last update time for this arrival. */ - @JsonProperty("lastUpdateTime") - @ExcludeMissing fun lastUpdateTime(lastUpdateTime: JsonField) = apply { this.lastUpdateTime = lastUpdateTime } @@ -910,8 +958,6 @@ private constructor( * Number of stops between the arriving transit vehicle and the current stop * (excluding the current stop). */ - @JsonProperty("numberOfStopsAway") - @ExcludeMissing fun numberOfStopsAway(numberOfStopsAway: JsonField) = apply { this.numberOfStopsAway = numberOfStopsAway } @@ -921,8 +967,6 @@ private constructor( occupancyStatus(JsonField.of(occupancyStatus)) /** Current occupancy status of the transit vehicle. */ - @JsonProperty("occupancyStatus") - @ExcludeMissing fun occupancyStatus(occupancyStatus: JsonField) = apply { this.occupancyStatus = occupancyStatus } @@ -931,8 +975,6 @@ private constructor( fun predicted(predicted: Boolean) = predicted(JsonField.of(predicted)) /** Indicates if real-time arrival info is available for this trip. */ - @JsonProperty("predicted") - @ExcludeMissing fun predicted(predicted: JsonField) = apply { this.predicted = predicted } @@ -942,8 +984,6 @@ private constructor( predictedArrivalInterval(JsonField.of(predictedArrivalInterval)) /** Interval for predicted arrival time, if available. */ - @JsonProperty("predictedArrivalInterval") - @ExcludeMissing fun predictedArrivalInterval(predictedArrivalInterval: JsonField) = apply { this.predictedArrivalInterval = predictedArrivalInterval @@ -960,8 +1000,6 @@ private constructor( * Predicted arrival time, in milliseconds since Unix epoch (zero if no * real-time available). */ - @JsonProperty("predictedArrivalTime") - @ExcludeMissing fun predictedArrivalTime(predictedArrivalTime: JsonField) = apply { this.predictedArrivalTime = predictedArrivalTime } @@ -971,8 +1009,6 @@ private constructor( predictedDepartureInterval(JsonField.of(predictedDepartureInterval)) /** Interval for predicted departure time, if available. */ - @JsonProperty("predictedDepartureInterval") - @ExcludeMissing fun predictedDepartureInterval(predictedDepartureInterval: JsonField) = apply { this.predictedDepartureInterval = predictedDepartureInterval @@ -989,8 +1025,6 @@ private constructor( * Predicted departure time, in milliseconds since Unix epoch (zero if no * real-time available). */ - @JsonProperty("predictedDepartureTime") - @ExcludeMissing fun predictedDepartureTime(predictedDepartureTime: JsonField) = apply { this.predictedDepartureTime = predictedDepartureTime } @@ -1000,8 +1034,6 @@ private constructor( predictedOccupancy(JsonField.of(predictedOccupancy)) /** Predicted occupancy status of the transit vehicle. */ - @JsonProperty("predictedOccupancy") - @ExcludeMissing fun predictedOccupancy(predictedOccupancy: JsonField) = apply { this.predictedOccupancy = predictedOccupancy } @@ -1010,8 +1042,6 @@ private constructor( fun routeId(routeId: String) = routeId(JsonField.of(routeId)) /** The ID of the route for the arriving vehicle. */ - @JsonProperty("routeId") - @ExcludeMissing fun routeId(routeId: JsonField) = apply { this.routeId = routeId } /** @@ -1025,8 +1055,6 @@ private constructor( * Optional route long name that potentially overrides the route long name in * the referenced route element. */ - @JsonProperty("routeLongName") - @ExcludeMissing fun routeLongName(routeLongName: JsonField) = apply { this.routeLongName = routeLongName } @@ -1042,8 +1070,6 @@ private constructor( * Optional route short name that potentially overrides the route short name in * the referenced route element. */ - @JsonProperty("routeShortName") - @ExcludeMissing fun routeShortName(routeShortName: JsonField) = apply { this.routeShortName = routeShortName } @@ -1053,8 +1079,6 @@ private constructor( scheduledArrivalInterval(JsonField.of(scheduledArrivalInterval)) /** Interval for scheduled arrival time. */ - @JsonProperty("scheduledArrivalInterval") - @ExcludeMissing fun scheduledArrivalInterval(scheduledArrivalInterval: JsonField) = apply { this.scheduledArrivalInterval = scheduledArrivalInterval @@ -1065,8 +1089,6 @@ private constructor( scheduledArrivalTime(JsonField.of(scheduledArrivalTime)) /** Scheduled arrival time, in milliseconds since Unix epoch. */ - @JsonProperty("scheduledArrivalTime") - @ExcludeMissing fun scheduledArrivalTime(scheduledArrivalTime: JsonField) = apply { this.scheduledArrivalTime = scheduledArrivalTime } @@ -1076,8 +1098,6 @@ private constructor( scheduledDepartureInterval(JsonField.of(scheduledDepartureInterval)) /** Interval for scheduled departure time. */ - @JsonProperty("scheduledDepartureInterval") - @ExcludeMissing fun scheduledDepartureInterval(scheduledDepartureInterval: JsonField) = apply { this.scheduledDepartureInterval = scheduledDepartureInterval @@ -1088,8 +1108,6 @@ private constructor( scheduledDepartureTime(JsonField.of(scheduledDepartureTime)) /** Scheduled departure time, in milliseconds since Unix epoch. */ - @JsonProperty("scheduledDepartureTime") - @ExcludeMissing fun scheduledDepartureTime(scheduledDepartureTime: JsonField) = apply { this.scheduledDepartureTime = scheduledDepartureTime } @@ -1099,8 +1117,6 @@ private constructor( scheduledTrack(JsonField.of(scheduledTrack)) /** Scheduled track information of the arriving transit vehicle. */ - @JsonProperty("scheduledTrack") - @ExcludeMissing fun scheduledTrack(scheduledTrack: JsonField) = apply { this.scheduledTrack = scheduledTrack } @@ -1115,8 +1131,6 @@ private constructor( * Time, in milliseconds since the Unix epoch, of midnight for the start of the * service date for the trip. */ - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -1126,8 +1140,6 @@ private constructor( situationIds(JsonField.of(situationIds)) /** References to situation elements (if any) applicable to this arrival. */ - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds } @@ -1136,16 +1148,12 @@ private constructor( fun status(status: String) = status(JsonField.of(status)) /** Current status of the arrival. */ - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } /** The ID of the stop the vehicle is arriving at. */ fun stopId(stopId: String) = stopId(JsonField.of(stopId)) /** The ID of the stop the vehicle is arriving at. */ - @JsonProperty("stopId") - @ExcludeMissing fun stopId(stopId: JsonField) = apply { this.stopId = stopId } /** @@ -1158,8 +1166,6 @@ private constructor( * Index of the stop into the sequence of stops that make up the trip for this * arrival. */ - @JsonProperty("stopSequence") - @ExcludeMissing fun stopSequence(stopSequence: JsonField) = apply { this.stopSequence = stopSequence } @@ -1169,8 +1175,6 @@ private constructor( totalStopsInTrip(JsonField.of(totalStopsInTrip)) /** Total number of stops visited on the trip for this arrival. */ - @JsonProperty("totalStopsInTrip") - @ExcludeMissing fun totalStopsInTrip(totalStopsInTrip: JsonField) = apply { this.totalStopsInTrip = totalStopsInTrip } @@ -1186,8 +1190,6 @@ private constructor( * Optional trip headsign that potentially overrides the trip headsign in the * referenced trip element. */ - @JsonProperty("tripHeadsign") - @ExcludeMissing fun tripHeadsign(tripHeadsign: JsonField) = apply { this.tripHeadsign = tripHeadsign } @@ -1196,16 +1198,12 @@ private constructor( fun tripId(tripId: String) = tripId(JsonField.of(tripId)) /** The ID of the trip for the arriving vehicle. */ - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } /** Trip-specific status for the arriving transit vehicle. */ fun tripStatus(tripStatus: TripStatus) = tripStatus(JsonField.of(tripStatus)) /** Trip-specific status for the arriving transit vehicle. */ - @JsonProperty("tripStatus") - @ExcludeMissing fun tripStatus(tripStatus: JsonField) = apply { this.tripStatus = tripStatus } @@ -1214,8 +1212,6 @@ private constructor( fun vehicleId(vehicleId: String) = vehicleId(JsonField.of(vehicleId)) /** ID of the transit vehicle serving this trip. */ - @JsonProperty("vehicleId") - @ExcludeMissing fun vehicleId(vehicleId: JsonField) = apply { this.vehicleId = vehicleId } @@ -1225,7 +1221,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1284,38 +1279,93 @@ private constructor( } /** Trip-specific status for the arriving transit vehicle. */ - @JsonDeserialize(builder = TripStatus.Builder::class) @NoAutoDetect class TripStatus + @JsonCreator private constructor( - private val activeTripId: JsonField, - private val blockTripSequence: JsonField, - private val closestStop: JsonField, - private val closestStopTimeOffset: JsonField, - private val distanceAlongTrip: JsonField, - private val frequency: JsonField, - private val lastKnownDistanceAlongTrip: JsonField, - private val lastKnownLocation: JsonField, - private val lastKnownOrientation: JsonField, - private val lastLocationUpdateTime: JsonField, - private val lastUpdateTime: JsonField, - private val nextStop: JsonField, - private val nextStopTimeOffset: JsonField, - private val occupancyCapacity: JsonField, - private val occupancyCount: JsonField, - private val occupancyStatus: JsonField, - private val orientation: JsonField, - private val phase: JsonField, - private val position: JsonField, - private val predicted: JsonField, - private val scheduleDeviation: JsonField, - private val scheduledDistanceAlongTrip: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val status: JsonField, - private val totalDistanceAlongTrip: JsonField, - private val vehicleId: JsonField, - private val additionalProperties: Map, + @JsonProperty("activeTripId") + @ExcludeMissing + private val activeTripId: JsonField = JsonMissing.of(), + @JsonProperty("blockTripSequence") + @ExcludeMissing + private val blockTripSequence: JsonField = JsonMissing.of(), + @JsonProperty("closestStop") + @ExcludeMissing + private val closestStop: JsonField = JsonMissing.of(), + @JsonProperty("closestStopTimeOffset") + @ExcludeMissing + private val closestStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownDistanceAlongTrip") + @ExcludeMissing + private val lastKnownDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownLocation") + @ExcludeMissing + private val lastKnownLocation: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownOrientation") + @ExcludeMissing + private val lastKnownOrientation: JsonField = JsonMissing.of(), + @JsonProperty("lastLocationUpdateTime") + @ExcludeMissing + private val lastLocationUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("lastUpdateTime") + @ExcludeMissing + private val lastUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("nextStop") + @ExcludeMissing + private val nextStop: JsonField = JsonMissing.of(), + @JsonProperty("nextStopTimeOffset") + @ExcludeMissing + private val nextStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCapacity") + @ExcludeMissing + private val occupancyCapacity: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCount") + @ExcludeMissing + private val occupancyCount: JsonField = JsonMissing.of(), + @JsonProperty("occupancyStatus") + @ExcludeMissing + private val occupancyStatus: JsonField = JsonMissing.of(), + @JsonProperty("orientation") + @ExcludeMissing + private val orientation: JsonField = JsonMissing.of(), + @JsonProperty("phase") + @ExcludeMissing + private val phase: JsonField = JsonMissing.of(), + @JsonProperty("position") + @ExcludeMissing + private val position: JsonField = JsonMissing.of(), + @JsonProperty("predicted") + @ExcludeMissing + private val predicted: JsonField = JsonMissing.of(), + @JsonProperty("scheduleDeviation") + @ExcludeMissing + private val scheduleDeviation: JsonField = JsonMissing.of(), + @JsonProperty("scheduledDistanceAlongTrip") + @ExcludeMissing + private val scheduledDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonProperty("totalDistanceAlongTrip") + @ExcludeMissing + private val totalDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("vehicleId") + @ExcludeMissing + private val vehicleId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Trip ID of the trip the vehicle is actively serving. */ @@ -1689,8 +1739,6 @@ private constructor( activeTripId(JsonField.of(activeTripId)) /** Trip ID of the trip the vehicle is actively serving. */ - @JsonProperty("activeTripId") - @ExcludeMissing fun activeTripId(activeTripId: JsonField) = apply { this.activeTripId = activeTripId } @@ -1704,8 +1752,6 @@ private constructor( /** * Index of the active trip into the sequence of trips for the active block. */ - @JsonProperty("blockTripSequence") - @ExcludeMissing fun blockTripSequence(blockTripSequence: JsonField) = apply { this.blockTripSequence = blockTripSequence } @@ -1719,8 +1765,6 @@ private constructor( /** * ID of the closest stop to the current location of the transit vehicle. */ - @JsonProperty("closestStop") - @ExcludeMissing fun closestStop(closestStop: JsonField) = apply { this.closestStop = closestStop } @@ -1736,8 +1780,6 @@ private constructor( * Time offset from the closest stop to the current position of the transit * vehicle (in seconds). */ - @JsonProperty("closestStopTimeOffset") - @ExcludeMissing fun closestStopTimeOffset(closestStopTimeOffset: JsonField) = apply { this.closestStopTimeOffset = closestStopTimeOffset } @@ -1753,8 +1795,6 @@ private constructor( * Distance, in meters, the transit vehicle has progressed along the active * trip. */ - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -1767,8 +1807,6 @@ private constructor( /** * Information about frequency-based scheduling, if applicable to the trip. */ - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } @@ -1784,8 +1822,6 @@ private constructor( * Last known distance along the trip received in real-time from the transit * vehicle. */ - @JsonProperty("lastKnownDistanceAlongTrip") - @ExcludeMissing fun lastKnownDistanceAlongTrip( lastKnownDistanceAlongTrip: JsonField ) = apply { this.lastKnownDistanceAlongTrip = lastKnownDistanceAlongTrip } @@ -1795,8 +1831,6 @@ private constructor( lastKnownLocation(JsonField.of(lastKnownLocation)) /** Last known location of the transit vehicle. */ - @JsonProperty("lastKnownLocation") - @ExcludeMissing fun lastKnownLocation(lastKnownLocation: JsonField) = apply { this.lastKnownLocation = lastKnownLocation @@ -1813,8 +1847,6 @@ private constructor( * Last known orientation value received in real-time from the transit * vehicle. */ - @JsonProperty("lastKnownOrientation") - @ExcludeMissing fun lastKnownOrientation(lastKnownOrientation: JsonField) = apply { this.lastKnownOrientation = lastKnownOrientation } @@ -1830,8 +1862,6 @@ private constructor( * Timestamp of the last known real-time location update from the transit * vehicle. */ - @JsonProperty("lastLocationUpdateTime") - @ExcludeMissing fun lastLocationUpdateTime(lastLocationUpdateTime: JsonField) = apply { this.lastLocationUpdateTime = lastLocationUpdateTime @@ -1846,8 +1876,6 @@ private constructor( /** * Timestamp of the last known real-time update from the transit vehicle. */ - @JsonProperty("lastUpdateTime") - @ExcludeMissing fun lastUpdateTime(lastUpdateTime: JsonField) = apply { this.lastUpdateTime = lastUpdateTime } @@ -1856,8 +1884,6 @@ private constructor( fun nextStop(nextStop: String) = nextStop(JsonField.of(nextStop)) /** ID of the next stop the transit vehicle is scheduled to arrive at. */ - @JsonProperty("nextStop") - @ExcludeMissing fun nextStop(nextStop: JsonField) = apply { this.nextStop = nextStop } @@ -1873,8 +1899,6 @@ private constructor( * Time offset from the next stop to the current position of the transit * vehicle (in seconds). */ - @JsonProperty("nextStopTimeOffset") - @ExcludeMissing fun nextStopTimeOffset(nextStopTimeOffset: JsonField) = apply { this.nextStopTimeOffset = nextStopTimeOffset } @@ -1884,8 +1908,6 @@ private constructor( occupancyCapacity(JsonField.of(occupancyCapacity)) /** Capacity of the transit vehicle in terms of occupancy. */ - @JsonProperty("occupancyCapacity") - @ExcludeMissing fun occupancyCapacity(occupancyCapacity: JsonField) = apply { this.occupancyCapacity = occupancyCapacity } @@ -1895,8 +1917,6 @@ private constructor( occupancyCount(JsonField.of(occupancyCount)) /** Current count of occupants in the transit vehicle. */ - @JsonProperty("occupancyCount") - @ExcludeMissing fun occupancyCount(occupancyCount: JsonField) = apply { this.occupancyCount = occupancyCount } @@ -1906,8 +1926,6 @@ private constructor( occupancyStatus(JsonField.of(occupancyStatus)) /** Current occupancy status of the transit vehicle. */ - @JsonProperty("occupancyStatus") - @ExcludeMissing fun occupancyStatus(occupancyStatus: JsonField) = apply { this.occupancyStatus = occupancyStatus } @@ -1921,8 +1939,6 @@ private constructor( /** * Orientation of the transit vehicle, represented as an angle in degrees. */ - @JsonProperty("orientation") - @ExcludeMissing fun orientation(orientation: JsonField) = apply { this.orientation = orientation } @@ -1931,16 +1947,12 @@ private constructor( fun phase(phase: String) = phase(JsonField.of(phase)) /** Current journey phase of the trip. */ - @JsonProperty("phase") - @ExcludeMissing fun phase(phase: JsonField) = apply { this.phase = phase } /** Current position of the transit vehicle. */ fun position(position: Position) = position(JsonField.of(position)) /** Current position of the transit vehicle. */ - @JsonProperty("position") - @ExcludeMissing fun position(position: JsonField) = apply { this.position = position } @@ -1949,8 +1961,6 @@ private constructor( fun predicted(predicted: Boolean) = predicted(JsonField.of(predicted)) /** Indicates if real-time arrival info is available for this trip. */ - @JsonProperty("predicted") - @ExcludeMissing fun predicted(predicted: JsonField) = apply { this.predicted = predicted } @@ -1966,8 +1976,6 @@ private constructor( * Deviation from the schedule in seconds (positive for late, negative for * early). */ - @JsonProperty("scheduleDeviation") - @ExcludeMissing fun scheduleDeviation(scheduleDeviation: JsonField) = apply { this.scheduleDeviation = scheduleDeviation } @@ -1983,8 +1991,6 @@ private constructor( * Distance, in meters, the transit vehicle is scheduled to have progressed * along the active trip. */ - @JsonProperty("scheduledDistanceAlongTrip") - @ExcludeMissing fun scheduledDistanceAlongTrip( scheduledDistanceAlongTrip: JsonField ) = apply { this.scheduledDistanceAlongTrip = scheduledDistanceAlongTrip } @@ -1999,8 +2005,6 @@ private constructor( * Time, in milliseconds since the Unix epoch, of midnight for the start of * the service date for the trip. */ - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -2010,8 +2014,6 @@ private constructor( situationIds(JsonField.of(situationIds)) /** References to situation elements (if any) applicable to this trip. */ - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds } @@ -2020,8 +2022,6 @@ private constructor( fun status(status: String) = status(JsonField.of(status)) /** Current status modifiers for the trip. */ - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } /** Total length of the trip, in meters. */ @@ -2029,8 +2029,6 @@ private constructor( totalDistanceAlongTrip(JsonField.of(totalDistanceAlongTrip)) /** Total length of the trip, in meters. */ - @JsonProperty("totalDistanceAlongTrip") - @ExcludeMissing fun totalDistanceAlongTrip(totalDistanceAlongTrip: JsonField) = apply { this.totalDistanceAlongTrip = totalDistanceAlongTrip @@ -2040,8 +2038,6 @@ private constructor( fun vehicleId(vehicleId: String) = vehicleId(JsonField.of(vehicleId)) /** ID of the transit vehicle currently serving the trip. */ - @JsonProperty("vehicleId") - @ExcludeMissing fun vehicleId(vehicleId: JsonField) = apply { this.vehicleId = vehicleId } @@ -2052,7 +2048,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -2103,13 +2098,19 @@ private constructor( } /** Last known location of the transit vehicle. */ - @JsonDeserialize(builder = LastKnownLocation.Builder::class) @NoAutoDetect class LastKnownLocation + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = + immutableEmptyMap(), ) { /** Latitude of the last known location of the transit vehicle. */ @@ -2163,16 +2164,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the last known location of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the last known location of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the last known location of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -2181,7 +2178,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -2225,13 +2221,19 @@ private constructor( } /** Current position of the transit vehicle. */ - @JsonDeserialize(builder = Position.Builder::class) @NoAutoDetect class Position + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = + immutableEmptyMap(), ) { /** Latitude of the current position of the transit vehicle. */ @@ -2284,16 +2286,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the current position of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the current position of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the current position of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -2302,7 +2300,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ArrivalAndDepartureRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ArrivalAndDepartureRetrieveResponse.kt index f3ef0cb..541b7bd 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ArrivalAndDepartureRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ArrivalAndDepartureRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = ArrivalAndDepartureRetrieveResponse.Builder::class) @NoAutoDetect class ArrivalAndDepartureRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -101,32 +106,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -134,7 +129,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -160,13 +154,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -212,14 +211,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -229,7 +224,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -252,45 +246,114 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val actualTrack: JsonField, - private val arrivalEnabled: JsonField, - private val blockTripSequence: JsonField, - private val departureEnabled: JsonField, - private val distanceFromStop: JsonField, - private val frequency: JsonField, - private val historicalOccupancy: JsonField, - private val lastUpdateTime: JsonField, - private val numberOfStopsAway: JsonField, - private val occupancyStatus: JsonField, - private val predicted: JsonField, - private val predictedArrivalInterval: JsonField, - private val predictedArrivalTime: JsonField, - private val predictedDepartureInterval: JsonField, - private val predictedDepartureTime: JsonField, - private val predictedOccupancy: JsonField, - private val routeId: JsonField, - private val routeLongName: JsonField, - private val routeShortName: JsonField, - private val scheduledArrivalInterval: JsonField, - private val scheduledArrivalTime: JsonField, - private val scheduledDepartureInterval: JsonField, - private val scheduledDepartureTime: JsonField, - private val scheduledTrack: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val status: JsonField, - private val stopId: JsonField, - private val stopSequence: JsonField, - private val totalStopsInTrip: JsonField, - private val tripHeadsign: JsonField, - private val tripId: JsonField, - private val tripStatus: JsonField, - private val vehicleId: JsonField, - private val additionalProperties: Map, + @JsonProperty("actualTrack") + @ExcludeMissing + private val actualTrack: JsonField = JsonMissing.of(), + @JsonProperty("arrivalEnabled") + @ExcludeMissing + private val arrivalEnabled: JsonField = JsonMissing.of(), + @JsonProperty("blockTripSequence") + @ExcludeMissing + private val blockTripSequence: JsonField = JsonMissing.of(), + @JsonProperty("departureEnabled") + @ExcludeMissing + private val departureEnabled: JsonField = JsonMissing.of(), + @JsonProperty("distanceFromStop") + @ExcludeMissing + private val distanceFromStop: JsonField = JsonMissing.of(), + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("historicalOccupancy") + @ExcludeMissing + private val historicalOccupancy: JsonField = JsonMissing.of(), + @JsonProperty("lastUpdateTime") + @ExcludeMissing + private val lastUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("numberOfStopsAway") + @ExcludeMissing + private val numberOfStopsAway: JsonField = JsonMissing.of(), + @JsonProperty("occupancyStatus") + @ExcludeMissing + private val occupancyStatus: JsonField = JsonMissing.of(), + @JsonProperty("predicted") + @ExcludeMissing + private val predicted: JsonField = JsonMissing.of(), + @JsonProperty("predictedArrivalInterval") + @ExcludeMissing + private val predictedArrivalInterval: JsonField = JsonMissing.of(), + @JsonProperty("predictedArrivalTime") + @ExcludeMissing + private val predictedArrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("predictedDepartureInterval") + @ExcludeMissing + private val predictedDepartureInterval: JsonField = JsonMissing.of(), + @JsonProperty("predictedDepartureTime") + @ExcludeMissing + private val predictedDepartureTime: JsonField = JsonMissing.of(), + @JsonProperty("predictedOccupancy") + @ExcludeMissing + private val predictedOccupancy: JsonField = JsonMissing.of(), + @JsonProperty("routeId") + @ExcludeMissing + private val routeId: JsonField = JsonMissing.of(), + @JsonProperty("routeLongName") + @ExcludeMissing + private val routeLongName: JsonField = JsonMissing.of(), + @JsonProperty("routeShortName") + @ExcludeMissing + private val routeShortName: JsonField = JsonMissing.of(), + @JsonProperty("scheduledArrivalInterval") + @ExcludeMissing + private val scheduledArrivalInterval: JsonField = JsonMissing.of(), + @JsonProperty("scheduledArrivalTime") + @ExcludeMissing + private val scheduledArrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("scheduledDepartureInterval") + @ExcludeMissing + private val scheduledDepartureInterval: JsonField = JsonMissing.of(), + @JsonProperty("scheduledDepartureTime") + @ExcludeMissing + private val scheduledDepartureTime: JsonField = JsonMissing.of(), + @JsonProperty("scheduledTrack") + @ExcludeMissing + private val scheduledTrack: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonProperty("stopId") + @ExcludeMissing + private val stopId: JsonField = JsonMissing.of(), + @JsonProperty("stopSequence") + @ExcludeMissing + private val stopSequence: JsonField = JsonMissing.of(), + @JsonProperty("totalStopsInTrip") + @ExcludeMissing + private val totalStopsInTrip: JsonField = JsonMissing.of(), + @JsonProperty("tripHeadsign") + @ExcludeMissing + private val tripHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonProperty("tripStatus") + @ExcludeMissing + private val tripStatus: JsonField = JsonMissing.of(), + @JsonProperty("vehicleId") + @ExcludeMissing + private val vehicleId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** The actual track information of the arriving transit vehicle. */ @@ -717,8 +780,6 @@ private constructor( fun actualTrack(actualTrack: String) = actualTrack(JsonField.of(actualTrack)) /** The actual track information of the arriving transit vehicle. */ - @JsonProperty("actualTrack") - @ExcludeMissing fun actualTrack(actualTrack: JsonField) = apply { this.actualTrack = actualTrack } @@ -728,8 +789,6 @@ private constructor( arrivalEnabled(JsonField.of(arrivalEnabled)) /** Indicates if riders can arrive on this transit vehicle. */ - @JsonProperty("arrivalEnabled") - @ExcludeMissing fun arrivalEnabled(arrivalEnabled: JsonField) = apply { this.arrivalEnabled = arrivalEnabled } @@ -739,8 +798,6 @@ private constructor( blockTripSequence(JsonField.of(blockTripSequence)) /** Index of this arrival’s trip into the sequence of trips for the active block. */ - @JsonProperty("blockTripSequence") - @ExcludeMissing fun blockTripSequence(blockTripSequence: JsonField) = apply { this.blockTripSequence = blockTripSequence } @@ -750,8 +807,6 @@ private constructor( departureEnabled(JsonField.of(departureEnabled)) /** Indicates if riders can depart from this transit vehicle. */ - @JsonProperty("departureEnabled") - @ExcludeMissing fun departureEnabled(departureEnabled: JsonField) = apply { this.departureEnabled = departureEnabled } @@ -761,8 +816,6 @@ private constructor( distanceFromStop(JsonField.of(distanceFromStop)) /** Distance of the arriving transit vehicle from the stop, in meters. */ - @JsonProperty("distanceFromStop") - @ExcludeMissing fun distanceFromStop(distanceFromStop: JsonField) = apply { this.distanceFromStop = distanceFromStop } @@ -771,8 +824,6 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) /** Information about frequency-based scheduling, if applicable to the trip. */ - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } /** Historical occupancy information of the transit vehicle. */ @@ -780,8 +831,6 @@ private constructor( historicalOccupancy(JsonField.of(historicalOccupancy)) /** Historical occupancy information of the transit vehicle. */ - @JsonProperty("historicalOccupancy") - @ExcludeMissing fun historicalOccupancy(historicalOccupancy: JsonField) = apply { this.historicalOccupancy = historicalOccupancy } @@ -791,8 +840,6 @@ private constructor( lastUpdateTime(JsonField.of(lastUpdateTime)) /** Timestamp of the last update time for this arrival. */ - @JsonProperty("lastUpdateTime") - @ExcludeMissing fun lastUpdateTime(lastUpdateTime: JsonField) = apply { this.lastUpdateTime = lastUpdateTime } @@ -808,8 +855,6 @@ private constructor( * Number of stops between the arriving transit vehicle and the current stop * (excluding the current stop). */ - @JsonProperty("numberOfStopsAway") - @ExcludeMissing fun numberOfStopsAway(numberOfStopsAway: JsonField) = apply { this.numberOfStopsAway = numberOfStopsAway } @@ -819,8 +864,6 @@ private constructor( occupancyStatus(JsonField.of(occupancyStatus)) /** Current occupancy status of the transit vehicle. */ - @JsonProperty("occupancyStatus") - @ExcludeMissing fun occupancyStatus(occupancyStatus: JsonField) = apply { this.occupancyStatus = occupancyStatus } @@ -829,8 +872,6 @@ private constructor( fun predicted(predicted: Boolean) = predicted(JsonField.of(predicted)) /** Indicates if real-time arrival info is available for this trip. */ - @JsonProperty("predicted") - @ExcludeMissing fun predicted(predicted: JsonField) = apply { this.predicted = predicted } /** Interval for predicted arrival time, if available. */ @@ -838,8 +879,6 @@ private constructor( predictedArrivalInterval(JsonField.of(predictedArrivalInterval)) /** Interval for predicted arrival time, if available. */ - @JsonProperty("predictedArrivalInterval") - @ExcludeMissing fun predictedArrivalInterval(predictedArrivalInterval: JsonField) = apply { this.predictedArrivalInterval = predictedArrivalInterval } @@ -855,8 +894,6 @@ private constructor( * Predicted arrival time, in milliseconds since Unix epoch (zero if no real-time * available). */ - @JsonProperty("predictedArrivalTime") - @ExcludeMissing fun predictedArrivalTime(predictedArrivalTime: JsonField) = apply { this.predictedArrivalTime = predictedArrivalTime } @@ -866,8 +903,6 @@ private constructor( predictedDepartureInterval(JsonField.of(predictedDepartureInterval)) /** Interval for predicted departure time, if available. */ - @JsonProperty("predictedDepartureInterval") - @ExcludeMissing fun predictedDepartureInterval(predictedDepartureInterval: JsonField) = apply { this.predictedDepartureInterval = predictedDepartureInterval @@ -884,8 +919,6 @@ private constructor( * Predicted departure time, in milliseconds since Unix epoch (zero if no real-time * available). */ - @JsonProperty("predictedDepartureTime") - @ExcludeMissing fun predictedDepartureTime(predictedDepartureTime: JsonField) = apply { this.predictedDepartureTime = predictedDepartureTime } @@ -895,8 +928,6 @@ private constructor( predictedOccupancy(JsonField.of(predictedOccupancy)) /** Predicted occupancy status of the transit vehicle. */ - @JsonProperty("predictedOccupancy") - @ExcludeMissing fun predictedOccupancy(predictedOccupancy: JsonField) = apply { this.predictedOccupancy = predictedOccupancy } @@ -905,8 +936,6 @@ private constructor( fun routeId(routeId: String) = routeId(JsonField.of(routeId)) /** The ID of the route for the arriving vehicle. */ - @JsonProperty("routeId") - @ExcludeMissing fun routeId(routeId: JsonField) = apply { this.routeId = routeId } /** @@ -920,8 +949,6 @@ private constructor( * Optional route long name that potentially overrides the route long name in the * referenced route element. */ - @JsonProperty("routeLongName") - @ExcludeMissing fun routeLongName(routeLongName: JsonField) = apply { this.routeLongName = routeLongName } @@ -937,8 +964,6 @@ private constructor( * Optional route short name that potentially overrides the route short name in the * referenced route element. */ - @JsonProperty("routeShortName") - @ExcludeMissing fun routeShortName(routeShortName: JsonField) = apply { this.routeShortName = routeShortName } @@ -948,8 +973,6 @@ private constructor( scheduledArrivalInterval(JsonField.of(scheduledArrivalInterval)) /** Interval for scheduled arrival time. */ - @JsonProperty("scheduledArrivalInterval") - @ExcludeMissing fun scheduledArrivalInterval(scheduledArrivalInterval: JsonField) = apply { this.scheduledArrivalInterval = scheduledArrivalInterval } @@ -959,8 +982,6 @@ private constructor( scheduledArrivalTime(JsonField.of(scheduledArrivalTime)) /** Scheduled arrival time, in milliseconds since Unix epoch. */ - @JsonProperty("scheduledArrivalTime") - @ExcludeMissing fun scheduledArrivalTime(scheduledArrivalTime: JsonField) = apply { this.scheduledArrivalTime = scheduledArrivalTime } @@ -970,8 +991,6 @@ private constructor( scheduledDepartureInterval(JsonField.of(scheduledDepartureInterval)) /** Interval for scheduled departure time. */ - @JsonProperty("scheduledDepartureInterval") - @ExcludeMissing fun scheduledDepartureInterval(scheduledDepartureInterval: JsonField) = apply { this.scheduledDepartureInterval = scheduledDepartureInterval @@ -982,8 +1001,6 @@ private constructor( scheduledDepartureTime(JsonField.of(scheduledDepartureTime)) /** Scheduled departure time, in milliseconds since Unix epoch. */ - @JsonProperty("scheduledDepartureTime") - @ExcludeMissing fun scheduledDepartureTime(scheduledDepartureTime: JsonField) = apply { this.scheduledDepartureTime = scheduledDepartureTime } @@ -993,8 +1010,6 @@ private constructor( scheduledTrack(JsonField.of(scheduledTrack)) /** Scheduled track information of the arriving transit vehicle. */ - @JsonProperty("scheduledTrack") - @ExcludeMissing fun scheduledTrack(scheduledTrack: JsonField) = apply { this.scheduledTrack = scheduledTrack } @@ -1009,8 +1024,6 @@ private constructor( * Time, in milliseconds since the Unix epoch, of midnight for the start of the * service date for the trip. */ - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -1020,8 +1033,6 @@ private constructor( situationIds(JsonField.of(situationIds)) /** References to situation elements (if any) applicable to this arrival. */ - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds } @@ -1030,16 +1041,12 @@ private constructor( fun status(status: String) = status(JsonField.of(status)) /** Current status of the arrival. */ - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } /** The ID of the stop the vehicle is arriving at. */ fun stopId(stopId: String) = stopId(JsonField.of(stopId)) /** The ID of the stop the vehicle is arriving at. */ - @JsonProperty("stopId") - @ExcludeMissing fun stopId(stopId: JsonField) = apply { this.stopId = stopId } /** @@ -1052,8 +1059,6 @@ private constructor( * Index of the stop into the sequence of stops that make up the trip for this * arrival. */ - @JsonProperty("stopSequence") - @ExcludeMissing fun stopSequence(stopSequence: JsonField) = apply { this.stopSequence = stopSequence } @@ -1063,8 +1068,6 @@ private constructor( totalStopsInTrip(JsonField.of(totalStopsInTrip)) /** Total number of stops visited on the trip for this arrival. */ - @JsonProperty("totalStopsInTrip") - @ExcludeMissing fun totalStopsInTrip(totalStopsInTrip: JsonField) = apply { this.totalStopsInTrip = totalStopsInTrip } @@ -1079,8 +1082,6 @@ private constructor( * Optional trip headsign that potentially overrides the trip headsign in the * referenced trip element. */ - @JsonProperty("tripHeadsign") - @ExcludeMissing fun tripHeadsign(tripHeadsign: JsonField) = apply { this.tripHeadsign = tripHeadsign } @@ -1089,16 +1090,12 @@ private constructor( fun tripId(tripId: String) = tripId(JsonField.of(tripId)) /** The ID of the trip for the arriving vehicle. */ - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } /** Trip-specific status for the arriving transit vehicle. */ fun tripStatus(tripStatus: TripStatus) = tripStatus(JsonField.of(tripStatus)) /** Trip-specific status for the arriving transit vehicle. */ - @JsonProperty("tripStatus") - @ExcludeMissing fun tripStatus(tripStatus: JsonField) = apply { this.tripStatus = tripStatus } @@ -1107,8 +1104,6 @@ private constructor( fun vehicleId(vehicleId: String) = vehicleId(JsonField.of(vehicleId)) /** ID of the transit vehicle serving this trip. */ - @JsonProperty("vehicleId") - @ExcludeMissing fun vehicleId(vehicleId: JsonField) = apply { this.vehicleId = vehicleId } fun additionalProperties(additionalProperties: Map) = apply { @@ -1116,7 +1111,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1175,38 +1169,93 @@ private constructor( } /** Trip-specific status for the arriving transit vehicle. */ - @JsonDeserialize(builder = TripStatus.Builder::class) @NoAutoDetect class TripStatus + @JsonCreator private constructor( - private val activeTripId: JsonField, - private val blockTripSequence: JsonField, - private val closestStop: JsonField, - private val closestStopTimeOffset: JsonField, - private val distanceAlongTrip: JsonField, - private val frequency: JsonField, - private val lastKnownDistanceAlongTrip: JsonField, - private val lastKnownLocation: JsonField, - private val lastKnownOrientation: JsonField, - private val lastLocationUpdateTime: JsonField, - private val lastUpdateTime: JsonField, - private val nextStop: JsonField, - private val nextStopTimeOffset: JsonField, - private val occupancyCapacity: JsonField, - private val occupancyCount: JsonField, - private val occupancyStatus: JsonField, - private val orientation: JsonField, - private val phase: JsonField, - private val position: JsonField, - private val predicted: JsonField, - private val scheduleDeviation: JsonField, - private val scheduledDistanceAlongTrip: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val status: JsonField, - private val totalDistanceAlongTrip: JsonField, - private val vehicleId: JsonField, - private val additionalProperties: Map, + @JsonProperty("activeTripId") + @ExcludeMissing + private val activeTripId: JsonField = JsonMissing.of(), + @JsonProperty("blockTripSequence") + @ExcludeMissing + private val blockTripSequence: JsonField = JsonMissing.of(), + @JsonProperty("closestStop") + @ExcludeMissing + private val closestStop: JsonField = JsonMissing.of(), + @JsonProperty("closestStopTimeOffset") + @ExcludeMissing + private val closestStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownDistanceAlongTrip") + @ExcludeMissing + private val lastKnownDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownLocation") + @ExcludeMissing + private val lastKnownLocation: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownOrientation") + @ExcludeMissing + private val lastKnownOrientation: JsonField = JsonMissing.of(), + @JsonProperty("lastLocationUpdateTime") + @ExcludeMissing + private val lastLocationUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("lastUpdateTime") + @ExcludeMissing + private val lastUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("nextStop") + @ExcludeMissing + private val nextStop: JsonField = JsonMissing.of(), + @JsonProperty("nextStopTimeOffset") + @ExcludeMissing + private val nextStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCapacity") + @ExcludeMissing + private val occupancyCapacity: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCount") + @ExcludeMissing + private val occupancyCount: JsonField = JsonMissing.of(), + @JsonProperty("occupancyStatus") + @ExcludeMissing + private val occupancyStatus: JsonField = JsonMissing.of(), + @JsonProperty("orientation") + @ExcludeMissing + private val orientation: JsonField = JsonMissing.of(), + @JsonProperty("phase") + @ExcludeMissing + private val phase: JsonField = JsonMissing.of(), + @JsonProperty("position") + @ExcludeMissing + private val position: JsonField = JsonMissing.of(), + @JsonProperty("predicted") + @ExcludeMissing + private val predicted: JsonField = JsonMissing.of(), + @JsonProperty("scheduleDeviation") + @ExcludeMissing + private val scheduleDeviation: JsonField = JsonMissing.of(), + @JsonProperty("scheduledDistanceAlongTrip") + @ExcludeMissing + private val scheduledDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonProperty("totalDistanceAlongTrip") + @ExcludeMissing + private val totalDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("vehicleId") + @ExcludeMissing + private val vehicleId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Trip ID of the trip the vehicle is actively serving. */ @@ -1564,8 +1613,6 @@ private constructor( activeTripId(JsonField.of(activeTripId)) /** Trip ID of the trip the vehicle is actively serving. */ - @JsonProperty("activeTripId") - @ExcludeMissing fun activeTripId(activeTripId: JsonField) = apply { this.activeTripId = activeTripId } @@ -1575,8 +1622,6 @@ private constructor( blockTripSequence(JsonField.of(blockTripSequence)) /** Index of the active trip into the sequence of trips for the active block. */ - @JsonProperty("blockTripSequence") - @ExcludeMissing fun blockTripSequence(blockTripSequence: JsonField) = apply { this.blockTripSequence = blockTripSequence } @@ -1585,8 +1630,6 @@ private constructor( fun closestStop(closestStop: String) = closestStop(JsonField.of(closestStop)) /** ID of the closest stop to the current location of the transit vehicle. */ - @JsonProperty("closestStop") - @ExcludeMissing fun closestStop(closestStop: JsonField) = apply { this.closestStop = closestStop } @@ -1602,8 +1645,6 @@ private constructor( * Time offset from the closest stop to the current position of the transit * vehicle (in seconds). */ - @JsonProperty("closestStopTimeOffset") - @ExcludeMissing fun closestStopTimeOffset(closestStopTimeOffset: JsonField) = apply { this.closestStopTimeOffset = closestStopTimeOffset } @@ -1619,8 +1660,6 @@ private constructor( * Distance, in meters, the transit vehicle has progressed along the active * trip. */ - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -1629,8 +1668,6 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) /** Information about frequency-based scheduling, if applicable to the trip. */ - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } @@ -1646,8 +1683,6 @@ private constructor( * Last known distance along the trip received in real-time from the transit * vehicle. */ - @JsonProperty("lastKnownDistanceAlongTrip") - @ExcludeMissing fun lastKnownDistanceAlongTrip(lastKnownDistanceAlongTrip: JsonField) = apply { this.lastKnownDistanceAlongTrip = lastKnownDistanceAlongTrip @@ -1658,8 +1693,6 @@ private constructor( lastKnownLocation(JsonField.of(lastKnownLocation)) /** Last known location of the transit vehicle. */ - @JsonProperty("lastKnownLocation") - @ExcludeMissing fun lastKnownLocation(lastKnownLocation: JsonField) = apply { this.lastKnownLocation = lastKnownLocation } @@ -1673,8 +1706,6 @@ private constructor( /** * Last known orientation value received in real-time from the transit vehicle. */ - @JsonProperty("lastKnownOrientation") - @ExcludeMissing fun lastKnownOrientation(lastKnownOrientation: JsonField) = apply { this.lastKnownOrientation = lastKnownOrientation } @@ -1690,8 +1721,6 @@ private constructor( * Timestamp of the last known real-time location update from the transit * vehicle. */ - @JsonProperty("lastLocationUpdateTime") - @ExcludeMissing fun lastLocationUpdateTime(lastLocationUpdateTime: JsonField) = apply { this.lastLocationUpdateTime = lastLocationUpdateTime } @@ -1701,8 +1730,6 @@ private constructor( lastUpdateTime(JsonField.of(lastUpdateTime)) /** Timestamp of the last known real-time update from the transit vehicle. */ - @JsonProperty("lastUpdateTime") - @ExcludeMissing fun lastUpdateTime(lastUpdateTime: JsonField) = apply { this.lastUpdateTime = lastUpdateTime } @@ -1711,8 +1738,6 @@ private constructor( fun nextStop(nextStop: String) = nextStop(JsonField.of(nextStop)) /** ID of the next stop the transit vehicle is scheduled to arrive at. */ - @JsonProperty("nextStop") - @ExcludeMissing fun nextStop(nextStop: JsonField) = apply { this.nextStop = nextStop } /** @@ -1726,8 +1751,6 @@ private constructor( * Time offset from the next stop to the current position of the transit vehicle * (in seconds). */ - @JsonProperty("nextStopTimeOffset") - @ExcludeMissing fun nextStopTimeOffset(nextStopTimeOffset: JsonField) = apply { this.nextStopTimeOffset = nextStopTimeOffset } @@ -1737,8 +1760,6 @@ private constructor( occupancyCapacity(JsonField.of(occupancyCapacity)) /** Capacity of the transit vehicle in terms of occupancy. */ - @JsonProperty("occupancyCapacity") - @ExcludeMissing fun occupancyCapacity(occupancyCapacity: JsonField) = apply { this.occupancyCapacity = occupancyCapacity } @@ -1748,8 +1769,6 @@ private constructor( occupancyCount(JsonField.of(occupancyCount)) /** Current count of occupants in the transit vehicle. */ - @JsonProperty("occupancyCount") - @ExcludeMissing fun occupancyCount(occupancyCount: JsonField) = apply { this.occupancyCount = occupancyCount } @@ -1759,8 +1778,6 @@ private constructor( occupancyStatus(JsonField.of(occupancyStatus)) /** Current occupancy status of the transit vehicle. */ - @JsonProperty("occupancyStatus") - @ExcludeMissing fun occupancyStatus(occupancyStatus: JsonField) = apply { this.occupancyStatus = occupancyStatus } @@ -1769,8 +1786,6 @@ private constructor( fun orientation(orientation: Double) = orientation(JsonField.of(orientation)) /** Orientation of the transit vehicle, represented as an angle in degrees. */ - @JsonProperty("orientation") - @ExcludeMissing fun orientation(orientation: JsonField) = apply { this.orientation = orientation } @@ -1779,24 +1794,18 @@ private constructor( fun phase(phase: String) = phase(JsonField.of(phase)) /** Current journey phase of the trip. */ - @JsonProperty("phase") - @ExcludeMissing fun phase(phase: JsonField) = apply { this.phase = phase } /** Current position of the transit vehicle. */ fun position(position: Position) = position(JsonField.of(position)) /** Current position of the transit vehicle. */ - @JsonProperty("position") - @ExcludeMissing fun position(position: JsonField) = apply { this.position = position } /** Indicates if real-time arrival info is available for this trip. */ fun predicted(predicted: Boolean) = predicted(JsonField.of(predicted)) /** Indicates if real-time arrival info is available for this trip. */ - @JsonProperty("predicted") - @ExcludeMissing fun predicted(predicted: JsonField) = apply { this.predicted = predicted } @@ -1812,8 +1821,6 @@ private constructor( * Deviation from the schedule in seconds (positive for late, negative for * early). */ - @JsonProperty("scheduleDeviation") - @ExcludeMissing fun scheduleDeviation(scheduleDeviation: JsonField) = apply { this.scheduleDeviation = scheduleDeviation } @@ -1829,8 +1836,6 @@ private constructor( * Distance, in meters, the transit vehicle is scheduled to have progressed * along the active trip. */ - @JsonProperty("scheduledDistanceAlongTrip") - @ExcludeMissing fun scheduledDistanceAlongTrip(scheduledDistanceAlongTrip: JsonField) = apply { this.scheduledDistanceAlongTrip = scheduledDistanceAlongTrip @@ -1846,8 +1851,6 @@ private constructor( * Time, in milliseconds since the Unix epoch, of midnight for the start of the * service date for the trip. */ - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -1857,8 +1860,6 @@ private constructor( situationIds(JsonField.of(situationIds)) /** References to situation elements (if any) applicable to this trip. */ - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds } @@ -1867,8 +1868,6 @@ private constructor( fun status(status: String) = status(JsonField.of(status)) /** Current status modifiers for the trip. */ - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } /** Total length of the trip, in meters. */ @@ -1876,8 +1875,6 @@ private constructor( totalDistanceAlongTrip(JsonField.of(totalDistanceAlongTrip)) /** Total length of the trip, in meters. */ - @JsonProperty("totalDistanceAlongTrip") - @ExcludeMissing fun totalDistanceAlongTrip(totalDistanceAlongTrip: JsonField) = apply { this.totalDistanceAlongTrip = totalDistanceAlongTrip } @@ -1886,8 +1883,6 @@ private constructor( fun vehicleId(vehicleId: String) = vehicleId(JsonField.of(vehicleId)) /** ID of the transit vehicle currently serving the trip. */ - @JsonProperty("vehicleId") - @ExcludeMissing fun vehicleId(vehicleId: JsonField) = apply { this.vehicleId = vehicleId } @@ -1897,7 +1892,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1949,13 +1943,18 @@ private constructor( } /** Last known location of the transit vehicle. */ - @JsonDeserialize(builder = LastKnownLocation.Builder::class) @NoAutoDetect class LastKnownLocation + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the last known location of the transit vehicle. */ @@ -2009,16 +2008,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the last known location of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the last known location of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the last known location of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -2027,7 +2022,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -2071,13 +2065,18 @@ private constructor( } /** Current position of the transit vehicle. */ - @JsonDeserialize(builder = Position.Builder::class) @NoAutoDetect class Position + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the current position of the transit vehicle. */ @@ -2130,16 +2129,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the current position of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the current position of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the current position of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -2148,7 +2143,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/BlockRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/BlockRetrieveResponse.kt index 0aa31b6..2fe5211 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/BlockRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/BlockRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = BlockRetrieveResponse.Builder::class) @NoAutoDetect class BlockRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,13 +151,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -209,14 +208,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -226,7 +221,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -249,13 +243,18 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val id: JsonField, - private val configurations: JsonField>, - private val additionalProperties: Map, + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("configurations") + @ExcludeMissing + private val configurations: JsonField> = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun id(): String = id.getRequired("id") @@ -301,15 +300,11 @@ private constructor( fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun configurations(configurations: List) = configurations(JsonField.of(configurations)) - @JsonProperty("configurations") - @ExcludeMissing fun configurations(configurations: JsonField>) = apply { this.configurations = configurations } @@ -319,7 +314,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -345,14 +339,21 @@ private constructor( ) } - @JsonDeserialize(builder = Configuration.Builder::class) @NoAutoDetect class Configuration + @JsonCreator private constructor( - private val activeServiceIds: JsonField>, - private val inactiveServiceIds: JsonField>, - private val trips: JsonField>, - private val additionalProperties: Map, + @JsonProperty("activeServiceIds") + @ExcludeMissing + private val activeServiceIds: JsonField> = JsonMissing.of(), + @JsonProperty("inactiveServiceIds") + @ExcludeMissing + private val inactiveServiceIds: JsonField> = JsonMissing.of(), + @JsonProperty("trips") + @ExcludeMissing + private val trips: JsonField> = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun activeServiceIds(): List = @@ -412,8 +413,6 @@ private constructor( fun activeServiceIds(activeServiceIds: List) = activeServiceIds(JsonField.of(activeServiceIds)) - @JsonProperty("activeServiceIds") - @ExcludeMissing fun activeServiceIds(activeServiceIds: JsonField>) = apply { this.activeServiceIds = activeServiceIds } @@ -421,16 +420,12 @@ private constructor( fun inactiveServiceIds(inactiveServiceIds: List) = inactiveServiceIds(JsonField.of(inactiveServiceIds)) - @JsonProperty("inactiveServiceIds") - @ExcludeMissing fun inactiveServiceIds(inactiveServiceIds: JsonField>) = apply { this.inactiveServiceIds = inactiveServiceIds } fun trips(trips: List) = trips(JsonField.of(trips)) - @JsonProperty("trips") - @ExcludeMissing fun trips(trips: JsonField>) = apply { this.trips = trips } fun additionalProperties(additionalProperties: Map) = apply { @@ -438,7 +433,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -465,15 +459,24 @@ private constructor( ) } - @JsonDeserialize(builder = Trip.Builder::class) @NoAutoDetect class Trip + @JsonCreator private constructor( - private val tripId: JsonField, - private val distanceAlongBlock: JsonField, - private val accumulatedSlackTime: JsonField, - private val blockStopTimes: JsonField>, - private val additionalProperties: Map, + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongBlock") + @ExcludeMissing + private val distanceAlongBlock: JsonField = JsonMissing.of(), + @JsonProperty("accumulatedSlackTime") + @ExcludeMissing + private val accumulatedSlackTime: JsonField = JsonMissing.of(), + @JsonProperty("blockStopTimes") + @ExcludeMissing + private val blockStopTimes: JsonField> = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun tripId(): String = tripId.getRequired("tripId") @@ -544,15 +547,11 @@ private constructor( fun tripId(tripId: String) = tripId(JsonField.of(tripId)) - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } fun distanceAlongBlock(distanceAlongBlock: Double) = distanceAlongBlock(JsonField.of(distanceAlongBlock)) - @JsonProperty("distanceAlongBlock") - @ExcludeMissing fun distanceAlongBlock(distanceAlongBlock: JsonField) = apply { this.distanceAlongBlock = distanceAlongBlock } @@ -560,8 +559,6 @@ private constructor( fun accumulatedSlackTime(accumulatedSlackTime: Double) = accumulatedSlackTime(JsonField.of(accumulatedSlackTime)) - @JsonProperty("accumulatedSlackTime") - @ExcludeMissing fun accumulatedSlackTime(accumulatedSlackTime: JsonField) = apply { this.accumulatedSlackTime = accumulatedSlackTime } @@ -569,8 +566,6 @@ private constructor( fun blockStopTimes(blockStopTimes: List) = blockStopTimes(JsonField.of(blockStopTimes)) - @JsonProperty("blockStopTimes") - @ExcludeMissing fun blockStopTimes(blockStopTimes: JsonField>) = apply { this.blockStopTimes = blockStopTimes } @@ -581,7 +576,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -608,15 +602,25 @@ private constructor( ) } - @JsonDeserialize(builder = BlockStopTime.Builder::class) @NoAutoDetect class BlockStopTime + @JsonCreator private constructor( - private val blockSequence: JsonField, - private val distanceAlongBlock: JsonField, - private val accumulatedSlackTime: JsonField, - private val stopTime: JsonField, - private val additionalProperties: Map, + @JsonProperty("blockSequence") + @ExcludeMissing + private val blockSequence: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongBlock") + @ExcludeMissing + private val distanceAlongBlock: JsonField = JsonMissing.of(), + @JsonProperty("accumulatedSlackTime") + @ExcludeMissing + private val accumulatedSlackTime: JsonField = JsonMissing.of(), + @JsonProperty("stopTime") + @ExcludeMissing + private val stopTime: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = + immutableEmptyMap(), ) { fun blockSequence(): Long = blockSequence.getRequired("blockSequence") @@ -687,8 +691,6 @@ private constructor( fun blockSequence(blockSequence: Long) = blockSequence(JsonField.of(blockSequence)) - @JsonProperty("blockSequence") - @ExcludeMissing fun blockSequence(blockSequence: JsonField) = apply { this.blockSequence = blockSequence } @@ -696,8 +698,6 @@ private constructor( fun distanceAlongBlock(distanceAlongBlock: Double) = distanceAlongBlock(JsonField.of(distanceAlongBlock)) - @JsonProperty("distanceAlongBlock") - @ExcludeMissing fun distanceAlongBlock(distanceAlongBlock: JsonField) = apply { this.distanceAlongBlock = distanceAlongBlock } @@ -705,8 +705,6 @@ private constructor( fun accumulatedSlackTime(accumulatedSlackTime: Double) = accumulatedSlackTime(JsonField.of(accumulatedSlackTime)) - @JsonProperty("accumulatedSlackTime") - @ExcludeMissing fun accumulatedSlackTime(accumulatedSlackTime: JsonField) = apply { this.accumulatedSlackTime = accumulatedSlackTime @@ -714,8 +712,6 @@ private constructor( fun stopTime(stopTime: StopTime) = stopTime(JsonField.of(stopTime)) - @JsonProperty("stopTime") - @ExcludeMissing fun stopTime(stopTime: JsonField) = apply { this.stopTime = stopTime } @@ -726,7 +722,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -753,16 +748,28 @@ private constructor( ) } - @JsonDeserialize(builder = StopTime.Builder::class) @NoAutoDetect class StopTime + @JsonCreator private constructor( - private val stopId: JsonField, - private val arrivalTime: JsonField, - private val departureTime: JsonField, - private val pickupType: JsonField, - private val dropOffType: JsonField, - private val additionalProperties: Map, + @JsonProperty("stopId") + @ExcludeMissing + private val stopId: JsonField = JsonMissing.of(), + @JsonProperty("arrivalTime") + @ExcludeMissing + private val arrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("departureTime") + @ExcludeMissing + private val departureTime: JsonField = JsonMissing.of(), + @JsonProperty("pickupType") + @ExcludeMissing + private val pickupType: JsonField = JsonMissing.of(), + @JsonProperty("dropOffType") + @ExcludeMissing + private val dropOffType: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = + immutableEmptyMap(), ) { fun stopId(): String = stopId.getRequired("stopId") @@ -840,8 +847,6 @@ private constructor( fun stopId(stopId: String) = stopId(JsonField.of(stopId)) - @JsonProperty("stopId") - @ExcludeMissing fun stopId(stopId: JsonField) = apply { this.stopId = stopId } @@ -849,8 +854,6 @@ private constructor( fun arrivalTime(arrivalTime: Long) = arrivalTime(JsonField.of(arrivalTime)) - @JsonProperty("arrivalTime") - @ExcludeMissing fun arrivalTime(arrivalTime: JsonField) = apply { this.arrivalTime = arrivalTime } @@ -858,8 +861,6 @@ private constructor( fun departureTime(departureTime: Long) = departureTime(JsonField.of(departureTime)) - @JsonProperty("departureTime") - @ExcludeMissing fun departureTime(departureTime: JsonField) = apply { this.departureTime = departureTime } @@ -867,8 +868,6 @@ private constructor( fun pickupType(pickupType: Long) = pickupType(JsonField.of(pickupType)) - @JsonProperty("pickupType") - @ExcludeMissing fun pickupType(pickupType: JsonField) = apply { this.pickupType = pickupType } @@ -876,8 +875,6 @@ private constructor( fun dropOffType(dropOffType: Long) = dropOffType(JsonField.of(dropOffType)) - @JsonProperty("dropOffType") - @ExcludeMissing fun dropOffType(dropOffType: JsonField) = apply { this.dropOffType = dropOffType } @@ -889,7 +886,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ConfigRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ConfigRetrieveResponse.kt index e644a73..4b83547 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ConfigRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ConfigRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = ConfigRetrieveResponse.Builder::class) @NoAutoDetect class ConfigRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,13 +151,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -209,14 +208,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -226,7 +221,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -249,16 +243,27 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val gitProperties: JsonField, - private val id: JsonField, - private val name: JsonField, - private val serviceDateFrom: JsonField, - private val serviceDateTo: JsonField, - private val additionalProperties: Map, + @JsonProperty("gitProperties") + @ExcludeMissing + private val gitProperties: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("name") + @ExcludeMissing + private val name: JsonField = JsonMissing.of(), + @JsonProperty("serviceDateFrom") + @ExcludeMissing + private val serviceDateFrom: JsonField = JsonMissing.of(), + @JsonProperty("serviceDateTo") + @ExcludeMissing + private val serviceDateTo: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun gitProperties(): GitProperties? = gitProperties.getNullable("gitProperties") @@ -328,29 +333,21 @@ private constructor( fun gitProperties(gitProperties: GitProperties) = gitProperties(JsonField.of(gitProperties)) - @JsonProperty("gitProperties") - @ExcludeMissing fun gitProperties(gitProperties: JsonField) = apply { this.gitProperties = gitProperties } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun name(name: String) = name(JsonField.of(name)) - @JsonProperty("name") - @ExcludeMissing fun name(name: JsonField) = apply { this.name = name } fun serviceDateFrom(serviceDateFrom: String) = serviceDateFrom(JsonField.of(serviceDateFrom)) - @JsonProperty("serviceDateFrom") - @ExcludeMissing fun serviceDateFrom(serviceDateFrom: JsonField) = apply { this.serviceDateFrom = serviceDateFrom } @@ -358,8 +355,6 @@ private constructor( fun serviceDateTo(serviceDateTo: String) = serviceDateTo(JsonField.of(serviceDateTo)) - @JsonProperty("serviceDateTo") - @ExcludeMissing fun serviceDateTo(serviceDateTo: JsonField) = apply { this.serviceDateTo = serviceDateTo } @@ -369,7 +364,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -398,31 +392,72 @@ private constructor( ) } - @JsonDeserialize(builder = GitProperties.Builder::class) @NoAutoDetect class GitProperties + @JsonCreator private constructor( - private val gitBranch: JsonField, - private val gitBuildHost: JsonField, - private val gitBuildTime: JsonField, - private val gitBuildUserEmail: JsonField, - private val gitBuildUserName: JsonField, - private val gitBuildVersion: JsonField, - private val gitClosestTagCommitCount: JsonField, - private val gitClosestTagName: JsonField, - private val gitCommitId: JsonField, - private val gitCommitIdAbbrev: JsonField, - private val gitCommitIdDescribe: JsonField, - private val gitCommitIdDescribeShort: JsonField, - private val gitCommitMessageFull: JsonField, - private val gitCommitMessageShort: JsonField, - private val gitCommitTime: JsonField, - private val gitCommitUserEmail: JsonField, - private val gitCommitUserName: JsonField, - private val gitDirty: JsonField, - private val gitRemoteOriginUrl: JsonField, - private val gitTags: JsonField, - private val additionalProperties: Map, + @JsonProperty("git.branch") + @ExcludeMissing + private val gitBranch: JsonField = JsonMissing.of(), + @JsonProperty("git.build.host") + @ExcludeMissing + private val gitBuildHost: JsonField = JsonMissing.of(), + @JsonProperty("git.build.time") + @ExcludeMissing + private val gitBuildTime: JsonField = JsonMissing.of(), + @JsonProperty("git.build.user.email") + @ExcludeMissing + private val gitBuildUserEmail: JsonField = JsonMissing.of(), + @JsonProperty("git.build.user.name") + @ExcludeMissing + private val gitBuildUserName: JsonField = JsonMissing.of(), + @JsonProperty("git.build.version") + @ExcludeMissing + private val gitBuildVersion: JsonField = JsonMissing.of(), + @JsonProperty("git.closest.tag.commit.count") + @ExcludeMissing + private val gitClosestTagCommitCount: JsonField = JsonMissing.of(), + @JsonProperty("git.closest.tag.name") + @ExcludeMissing + private val gitClosestTagName: JsonField = JsonMissing.of(), + @JsonProperty("git.commit.id") + @ExcludeMissing + private val gitCommitId: JsonField = JsonMissing.of(), + @JsonProperty("git.commit.id.abbrev") + @ExcludeMissing + private val gitCommitIdAbbrev: JsonField = JsonMissing.of(), + @JsonProperty("git.commit.id.describe") + @ExcludeMissing + private val gitCommitIdDescribe: JsonField = JsonMissing.of(), + @JsonProperty("git.commit.id.describe-short") + @ExcludeMissing + private val gitCommitIdDescribeShort: JsonField = JsonMissing.of(), + @JsonProperty("git.commit.message.full") + @ExcludeMissing + private val gitCommitMessageFull: JsonField = JsonMissing.of(), + @JsonProperty("git.commit.message.short") + @ExcludeMissing + private val gitCommitMessageShort: JsonField = JsonMissing.of(), + @JsonProperty("git.commit.time") + @ExcludeMissing + private val gitCommitTime: JsonField = JsonMissing.of(), + @JsonProperty("git.commit.user.email") + @ExcludeMissing + private val gitCommitUserEmail: JsonField = JsonMissing.of(), + @JsonProperty("git.commit.user.name") + @ExcludeMissing + private val gitCommitUserName: JsonField = JsonMissing.of(), + @JsonProperty("git.dirty") + @ExcludeMissing + private val gitDirty: JsonField = JsonMissing.of(), + @JsonProperty("git.remote.origin.url") + @ExcludeMissing + private val gitRemoteOriginUrl: JsonField = JsonMissing.of(), + @JsonProperty("git.tags") + @ExcludeMissing + private val gitTags: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun gitBranch(): String? = gitBranch.getNullable("git.branch") @@ -634,8 +669,6 @@ private constructor( fun gitBranch(gitBranch: String) = gitBranch(JsonField.of(gitBranch)) - @JsonProperty("git.branch") - @ExcludeMissing fun gitBranch(gitBranch: JsonField) = apply { this.gitBranch = gitBranch } @@ -643,8 +676,6 @@ private constructor( fun gitBuildHost(gitBuildHost: String) = gitBuildHost(JsonField.of(gitBuildHost)) - @JsonProperty("git.build.host") - @ExcludeMissing fun gitBuildHost(gitBuildHost: JsonField) = apply { this.gitBuildHost = gitBuildHost } @@ -652,8 +683,6 @@ private constructor( fun gitBuildTime(gitBuildTime: String) = gitBuildTime(JsonField.of(gitBuildTime)) - @JsonProperty("git.build.time") - @ExcludeMissing fun gitBuildTime(gitBuildTime: JsonField) = apply { this.gitBuildTime = gitBuildTime } @@ -661,8 +690,6 @@ private constructor( fun gitBuildUserEmail(gitBuildUserEmail: String) = gitBuildUserEmail(JsonField.of(gitBuildUserEmail)) - @JsonProperty("git.build.user.email") - @ExcludeMissing fun gitBuildUserEmail(gitBuildUserEmail: JsonField) = apply { this.gitBuildUserEmail = gitBuildUserEmail } @@ -670,8 +697,6 @@ private constructor( fun gitBuildUserName(gitBuildUserName: String) = gitBuildUserName(JsonField.of(gitBuildUserName)) - @JsonProperty("git.build.user.name") - @ExcludeMissing fun gitBuildUserName(gitBuildUserName: JsonField) = apply { this.gitBuildUserName = gitBuildUserName } @@ -679,8 +704,6 @@ private constructor( fun gitBuildVersion(gitBuildVersion: String) = gitBuildVersion(JsonField.of(gitBuildVersion)) - @JsonProperty("git.build.version") - @ExcludeMissing fun gitBuildVersion(gitBuildVersion: JsonField) = apply { this.gitBuildVersion = gitBuildVersion } @@ -688,8 +711,6 @@ private constructor( fun gitClosestTagCommitCount(gitClosestTagCommitCount: String) = gitClosestTagCommitCount(JsonField.of(gitClosestTagCommitCount)) - @JsonProperty("git.closest.tag.commit.count") - @ExcludeMissing fun gitClosestTagCommitCount(gitClosestTagCommitCount: JsonField) = apply { this.gitClosestTagCommitCount = gitClosestTagCommitCount @@ -698,16 +719,12 @@ private constructor( fun gitClosestTagName(gitClosestTagName: String) = gitClosestTagName(JsonField.of(gitClosestTagName)) - @JsonProperty("git.closest.tag.name") - @ExcludeMissing fun gitClosestTagName(gitClosestTagName: JsonField) = apply { this.gitClosestTagName = gitClosestTagName } fun gitCommitId(gitCommitId: String) = gitCommitId(JsonField.of(gitCommitId)) - @JsonProperty("git.commit.id") - @ExcludeMissing fun gitCommitId(gitCommitId: JsonField) = apply { this.gitCommitId = gitCommitId } @@ -715,8 +732,6 @@ private constructor( fun gitCommitIdAbbrev(gitCommitIdAbbrev: String) = gitCommitIdAbbrev(JsonField.of(gitCommitIdAbbrev)) - @JsonProperty("git.commit.id.abbrev") - @ExcludeMissing fun gitCommitIdAbbrev(gitCommitIdAbbrev: JsonField) = apply { this.gitCommitIdAbbrev = gitCommitIdAbbrev } @@ -724,8 +739,6 @@ private constructor( fun gitCommitIdDescribe(gitCommitIdDescribe: String) = gitCommitIdDescribe(JsonField.of(gitCommitIdDescribe)) - @JsonProperty("git.commit.id.describe") - @ExcludeMissing fun gitCommitIdDescribe(gitCommitIdDescribe: JsonField) = apply { this.gitCommitIdDescribe = gitCommitIdDescribe } @@ -733,8 +746,6 @@ private constructor( fun gitCommitIdDescribeShort(gitCommitIdDescribeShort: String) = gitCommitIdDescribeShort(JsonField.of(gitCommitIdDescribeShort)) - @JsonProperty("git.commit.id.describe-short") - @ExcludeMissing fun gitCommitIdDescribeShort(gitCommitIdDescribeShort: JsonField) = apply { this.gitCommitIdDescribeShort = gitCommitIdDescribeShort @@ -743,8 +754,6 @@ private constructor( fun gitCommitMessageFull(gitCommitMessageFull: String) = gitCommitMessageFull(JsonField.of(gitCommitMessageFull)) - @JsonProperty("git.commit.message.full") - @ExcludeMissing fun gitCommitMessageFull(gitCommitMessageFull: JsonField) = apply { this.gitCommitMessageFull = gitCommitMessageFull } @@ -752,8 +761,6 @@ private constructor( fun gitCommitMessageShort(gitCommitMessageShort: String) = gitCommitMessageShort(JsonField.of(gitCommitMessageShort)) - @JsonProperty("git.commit.message.short") - @ExcludeMissing fun gitCommitMessageShort(gitCommitMessageShort: JsonField) = apply { this.gitCommitMessageShort = gitCommitMessageShort } @@ -761,8 +768,6 @@ private constructor( fun gitCommitTime(gitCommitTime: String) = gitCommitTime(JsonField.of(gitCommitTime)) - @JsonProperty("git.commit.time") - @ExcludeMissing fun gitCommitTime(gitCommitTime: JsonField) = apply { this.gitCommitTime = gitCommitTime } @@ -770,8 +775,6 @@ private constructor( fun gitCommitUserEmail(gitCommitUserEmail: String) = gitCommitUserEmail(JsonField.of(gitCommitUserEmail)) - @JsonProperty("git.commit.user.email") - @ExcludeMissing fun gitCommitUserEmail(gitCommitUserEmail: JsonField) = apply { this.gitCommitUserEmail = gitCommitUserEmail } @@ -779,31 +782,23 @@ private constructor( fun gitCommitUserName(gitCommitUserName: String) = gitCommitUserName(JsonField.of(gitCommitUserName)) - @JsonProperty("git.commit.user.name") - @ExcludeMissing fun gitCommitUserName(gitCommitUserName: JsonField) = apply { this.gitCommitUserName = gitCommitUserName } fun gitDirty(gitDirty: String) = gitDirty(JsonField.of(gitDirty)) - @JsonProperty("git.dirty") - @ExcludeMissing fun gitDirty(gitDirty: JsonField) = apply { this.gitDirty = gitDirty } fun gitRemoteOriginUrl(gitRemoteOriginUrl: String) = gitRemoteOriginUrl(JsonField.of(gitRemoteOriginUrl)) - @JsonProperty("git.remote.origin.url") - @ExcludeMissing fun gitRemoteOriginUrl(gitRemoteOriginUrl: JsonField) = apply { this.gitRemoteOriginUrl = gitRemoteOriginUrl } fun gitTags(gitTags: String) = gitTags(JsonField.of(gitTags)) - @JsonProperty("git.tags") - @ExcludeMissing fun gitTags(gitTags: JsonField) = apply { this.gitTags = gitTags } fun additionalProperties(additionalProperties: Map) = apply { @@ -811,7 +806,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/CurrentTimeRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/CurrentTimeRetrieveResponse.kt index 41db2f6..47a6ee4 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/CurrentTimeRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/CurrentTimeRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = CurrentTimeRetrieveResponse.Builder::class) @NoAutoDetect class CurrentTimeRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,13 +151,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -209,14 +208,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -226,7 +221,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -249,13 +243,18 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val readableTime: JsonField, - private val time: JsonField, - private val additionalProperties: Map, + @JsonProperty("readableTime") + @ExcludeMissing + private val readableTime: JsonField = JsonMissing.of(), + @JsonProperty("time") + @ExcludeMissing + private val time: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun readableTime(): String? = readableTime.getNullable("readableTime") @@ -301,16 +300,12 @@ private constructor( fun readableTime(readableTime: String) = readableTime(JsonField.of(readableTime)) - @JsonProperty("readableTime") - @ExcludeMissing fun readableTime(readableTime: JsonField) = apply { this.readableTime = readableTime } fun time(time: Long) = time(JsonField.of(time)) - @JsonProperty("time") - @ExcludeMissing fun time(time: JsonField) = apply { this.time = time } fun additionalProperties(additionalProperties: Map) = apply { @@ -318,7 +313,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/References.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/References.kt index 62805c2..251b43c 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/References.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/References.kt @@ -6,7 +6,6 @@ import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.Enum import org.onebusaway.core.ExcludeMissing @@ -14,20 +13,33 @@ import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable import org.onebusaway.errors.OnebusawaySdkInvalidDataException -@JsonDeserialize(builder = References.Builder::class) @NoAutoDetect class References +@JsonCreator private constructor( - private val agencies: JsonField>, - private val routes: JsonField>, - private val situations: JsonField>, - private val stopTimes: JsonField>, - private val stops: JsonField>, - private val trips: JsonField>, - private val additionalProperties: Map, + @JsonProperty("agencies") + @ExcludeMissing + private val agencies: JsonField> = JsonMissing.of(), + @JsonProperty("routes") + @ExcludeMissing + private val routes: JsonField> = JsonMissing.of(), + @JsonProperty("situations") + @ExcludeMissing + private val situations: JsonField> = JsonMissing.of(), + @JsonProperty("stopTimes") + @ExcludeMissing + private val stopTimes: JsonField> = JsonMissing.of(), + @JsonProperty("stops") + @ExcludeMissing + private val stops: JsonField> = JsonMissing.of(), + @JsonProperty("trips") + @ExcludeMissing + private val trips: JsonField> = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun agencies(): List = agencies.getRequired("agencies") @@ -101,40 +113,28 @@ private constructor( fun agencies(agencies: List) = agencies(JsonField.of(agencies)) - @JsonProperty("agencies") - @ExcludeMissing fun agencies(agencies: JsonField>) = apply { this.agencies = agencies } fun routes(routes: List) = routes(JsonField.of(routes)) - @JsonProperty("routes") - @ExcludeMissing fun routes(routes: JsonField>) = apply { this.routes = routes } fun situations(situations: List) = situations(JsonField.of(situations)) - @JsonProperty("situations") - @ExcludeMissing fun situations(situations: JsonField>) = apply { this.situations = situations } fun stopTimes(stopTimes: List) = stopTimes(JsonField.of(stopTimes)) - @JsonProperty("stopTimes") - @ExcludeMissing fun stopTimes(stopTimes: JsonField>) = apply { this.stopTimes = stopTimes } fun stops(stops: List) = stops(JsonField.of(stops)) - @JsonProperty("stops") - @ExcludeMissing fun stops(stops: JsonField>) = apply { this.stops = stops } fun trips(trips: List) = trips(JsonField.of(trips)) - @JsonProperty("trips") - @ExcludeMissing fun trips(trips: JsonField>) = apply { this.trips = trips } fun additionalProperties(additionalProperties: Map) = apply { @@ -142,7 +142,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -169,21 +168,38 @@ private constructor( ) } - @JsonDeserialize(builder = Agency.Builder::class) @NoAutoDetect class Agency + @JsonCreator private constructor( - private val disclaimer: JsonField, - private val email: JsonField, - private val fareUrl: JsonField, - private val id: JsonField, - private val lang: JsonField, - private val name: JsonField, - private val phone: JsonField, - private val privateService: JsonField, - private val timezone: JsonField, - private val url: JsonField, - private val additionalProperties: Map, + @JsonProperty("disclaimer") + @ExcludeMissing + private val disclaimer: JsonField = JsonMissing.of(), + @JsonProperty("email") + @ExcludeMissing + private val email: JsonField = JsonMissing.of(), + @JsonProperty("fareUrl") + @ExcludeMissing + private val fareUrl: JsonField = JsonMissing.of(), + @JsonProperty("id") @ExcludeMissing private val id: JsonField = JsonMissing.of(), + @JsonProperty("lang") + @ExcludeMissing + private val lang: JsonField = JsonMissing.of(), + @JsonProperty("name") + @ExcludeMissing + private val name: JsonField = JsonMissing.of(), + @JsonProperty("phone") + @ExcludeMissing + private val phone: JsonField = JsonMissing.of(), + @JsonProperty("privateService") + @ExcludeMissing + private val privateService: JsonField = JsonMissing.of(), + @JsonProperty("timezone") + @ExcludeMissing + private val timezone: JsonField = JsonMissing.of(), + @JsonProperty("url") @ExcludeMissing private val url: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun disclaimer(): String? = disclaimer.getNullable("disclaimer") @@ -285,65 +301,45 @@ private constructor( fun disclaimer(disclaimer: String) = disclaimer(JsonField.of(disclaimer)) - @JsonProperty("disclaimer") - @ExcludeMissing fun disclaimer(disclaimer: JsonField) = apply { this.disclaimer = disclaimer } fun email(email: String) = email(JsonField.of(email)) - @JsonProperty("email") - @ExcludeMissing fun email(email: JsonField) = apply { this.email = email } fun fareUrl(fareUrl: String) = fareUrl(JsonField.of(fareUrl)) - @JsonProperty("fareUrl") - @ExcludeMissing fun fareUrl(fareUrl: JsonField) = apply { this.fareUrl = fareUrl } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun lang(lang: String) = lang(JsonField.of(lang)) - @JsonProperty("lang") - @ExcludeMissing fun lang(lang: JsonField) = apply { this.lang = lang } fun name(name: String) = name(JsonField.of(name)) - @JsonProperty("name") - @ExcludeMissing fun name(name: JsonField) = apply { this.name = name } fun phone(phone: String) = phone(JsonField.of(phone)) - @JsonProperty("phone") - @ExcludeMissing fun phone(phone: JsonField) = apply { this.phone = phone } fun privateService(privateService: Boolean) = privateService(JsonField.of(privateService)) - @JsonProperty("privateService") - @ExcludeMissing fun privateService(privateService: JsonField) = apply { this.privateService = privateService } fun timezone(timezone: String) = timezone(JsonField.of(timezone)) - @JsonProperty("timezone") - @ExcludeMissing fun timezone(timezone: JsonField) = apply { this.timezone = timezone } fun url(url: String) = url(JsonField.of(url)) - @JsonProperty("url") - @ExcludeMissing fun url(url: JsonField) = apply { this.url = url } fun additionalProperties(additionalProperties: Map) = apply { @@ -351,7 +347,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -400,21 +395,36 @@ private constructor( "Agency{disclaimer=$disclaimer, email=$email, fareUrl=$fareUrl, id=$id, lang=$lang, name=$name, phone=$phone, privateService=$privateService, timezone=$timezone, url=$url, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Route.Builder::class) @NoAutoDetect class Route + @JsonCreator private constructor( - private val agencyId: JsonField, - private val color: JsonField, - private val description: JsonField, - private val id: JsonField, - private val longName: JsonField, - private val nullSafeShortName: JsonField, - private val shortName: JsonField, - private val textColor: JsonField, - private val type: JsonField, - private val url: JsonField, - private val additionalProperties: Map, + @JsonProperty("agencyId") + @ExcludeMissing + private val agencyId: JsonField = JsonMissing.of(), + @JsonProperty("color") + @ExcludeMissing + private val color: JsonField = JsonMissing.of(), + @JsonProperty("description") + @ExcludeMissing + private val description: JsonField = JsonMissing.of(), + @JsonProperty("id") @ExcludeMissing private val id: JsonField = JsonMissing.of(), + @JsonProperty("longName") + @ExcludeMissing + private val longName: JsonField = JsonMissing.of(), + @JsonProperty("nullSafeShortName") + @ExcludeMissing + private val nullSafeShortName: JsonField = JsonMissing.of(), + @JsonProperty("shortName") + @ExcludeMissing + private val shortName: JsonField = JsonMissing.of(), + @JsonProperty("textColor") + @ExcludeMissing + private val textColor: JsonField = JsonMissing.of(), + @JsonProperty("type") @ExcludeMissing private val type: JsonField = JsonMissing.of(), + @JsonProperty("url") @ExcludeMissing private val url: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun agencyId(): String = agencyId.getRequired("agencyId") @@ -518,67 +528,47 @@ private constructor( fun agencyId(agencyId: String) = agencyId(JsonField.of(agencyId)) - @JsonProperty("agencyId") - @ExcludeMissing fun agencyId(agencyId: JsonField) = apply { this.agencyId = agencyId } fun color(color: String) = color(JsonField.of(color)) - @JsonProperty("color") - @ExcludeMissing fun color(color: JsonField) = apply { this.color = color } fun description(description: String) = description(JsonField.of(description)) - @JsonProperty("description") - @ExcludeMissing fun description(description: JsonField) = apply { this.description = description } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun longName(longName: String) = longName(JsonField.of(longName)) - @JsonProperty("longName") - @ExcludeMissing fun longName(longName: JsonField) = apply { this.longName = longName } fun nullSafeShortName(nullSafeShortName: String) = nullSafeShortName(JsonField.of(nullSafeShortName)) - @JsonProperty("nullSafeShortName") - @ExcludeMissing fun nullSafeShortName(nullSafeShortName: JsonField) = apply { this.nullSafeShortName = nullSafeShortName } fun shortName(shortName: String) = shortName(JsonField.of(shortName)) - @JsonProperty("shortName") - @ExcludeMissing fun shortName(shortName: JsonField) = apply { this.shortName = shortName } fun textColor(textColor: String) = textColor(JsonField.of(textColor)) - @JsonProperty("textColor") - @ExcludeMissing fun textColor(textColor: JsonField) = apply { this.textColor = textColor } fun type(type: Long) = type(JsonField.of(type)) - @JsonProperty("type") - @ExcludeMissing fun type(type: JsonField) = apply { this.type = type } fun url(url: String) = url(JsonField.of(url)) - @JsonProperty("url") - @ExcludeMissing fun url(url: JsonField) = apply { this.url = url } fun additionalProperties(additionalProperties: Map) = apply { @@ -586,7 +576,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -635,23 +624,44 @@ private constructor( "Route{agencyId=$agencyId, color=$color, description=$description, id=$id, longName=$longName, nullSafeShortName=$nullSafeShortName, shortName=$shortName, textColor=$textColor, type=$type, url=$url, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Situation.Builder::class) @NoAutoDetect class Situation + @JsonCreator private constructor( - private val id: JsonField, - private val creationTime: JsonField, - private val reason: JsonField, - private val summary: JsonField, - private val description: JsonField, - private val url: JsonField, - private val activeWindows: JsonField>, - private val allAffects: JsonField>, - private val consequences: JsonField>, - private val publicationWindows: JsonField>, - private val severity: JsonField, - private val consequenceMessage: JsonField, - private val additionalProperties: Map, + @JsonProperty("id") @ExcludeMissing private val id: JsonField = JsonMissing.of(), + @JsonProperty("creationTime") + @ExcludeMissing + private val creationTime: JsonField = JsonMissing.of(), + @JsonProperty("reason") + @ExcludeMissing + private val reason: JsonField = JsonMissing.of(), + @JsonProperty("summary") + @ExcludeMissing + private val summary: JsonField = JsonMissing.of(), + @JsonProperty("description") + @ExcludeMissing + private val description: JsonField = JsonMissing.of(), + @JsonProperty("url") @ExcludeMissing private val url: JsonField = JsonMissing.of(), + @JsonProperty("activeWindows") + @ExcludeMissing + private val activeWindows: JsonField> = JsonMissing.of(), + @JsonProperty("allAffects") + @ExcludeMissing + private val allAffects: JsonField> = JsonMissing.of(), + @JsonProperty("consequences") + @ExcludeMissing + private val consequences: JsonField> = JsonMissing.of(), + @JsonProperty("publicationWindows") + @ExcludeMissing + private val publicationWindows: JsonField> = JsonMissing.of(), + @JsonProperty("severity") + @ExcludeMissing + private val severity: JsonField = JsonMissing.of(), + @JsonProperty("consequenceMessage") + @ExcludeMissing + private val consequenceMessage: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Unique identifier for the situation. */ @@ -784,16 +794,12 @@ private constructor( fun id(id: String) = id(JsonField.of(id)) /** Unique identifier for the situation. */ - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } /** Unix timestamp of when this situation was created. */ fun creationTime(creationTime: Long) = creationTime(JsonField.of(creationTime)) /** Unix timestamp of when this situation was created. */ - @JsonProperty("creationTime") - @ExcludeMissing fun creationTime(creationTime: JsonField) = apply { this.creationTime = creationTime } @@ -802,43 +808,31 @@ private constructor( fun reason(reason: Reason) = reason(JsonField.of(reason)) /** Reason for the service alert, taken from TPEG codes. */ - @JsonProperty("reason") - @ExcludeMissing fun reason(reason: JsonField) = apply { this.reason = reason } fun summary(summary: Summary) = summary(JsonField.of(summary)) - @JsonProperty("summary") - @ExcludeMissing fun summary(summary: JsonField) = apply { this.summary = summary } fun description(description: Description) = description(JsonField.of(description)) - @JsonProperty("description") - @ExcludeMissing fun description(description: JsonField) = apply { this.description = description } fun url(url: Url) = url(JsonField.of(url)) - @JsonProperty("url") - @ExcludeMissing fun url(url: JsonField) = apply { this.url = url } fun activeWindows(activeWindows: List) = activeWindows(JsonField.of(activeWindows)) - @JsonProperty("activeWindows") - @ExcludeMissing fun activeWindows(activeWindows: JsonField>) = apply { this.activeWindows = activeWindows } fun allAffects(allAffects: List) = allAffects(JsonField.of(allAffects)) - @JsonProperty("allAffects") - @ExcludeMissing fun allAffects(allAffects: JsonField>) = apply { this.allAffects = allAffects } @@ -846,8 +840,6 @@ private constructor( fun consequences(consequences: List) = consequences(JsonField.of(consequences)) - @JsonProperty("consequences") - @ExcludeMissing fun consequences(consequences: JsonField>) = apply { this.consequences = consequences } @@ -855,8 +847,6 @@ private constructor( fun publicationWindows(publicationWindows: List) = publicationWindows(JsonField.of(publicationWindows)) - @JsonProperty("publicationWindows") - @ExcludeMissing fun publicationWindows(publicationWindows: JsonField>) = apply { this.publicationWindows = publicationWindows } @@ -865,8 +855,6 @@ private constructor( fun severity(severity: String) = severity(JsonField.of(severity)) /** Severity of the situation. */ - @JsonProperty("severity") - @ExcludeMissing fun severity(severity: JsonField) = apply { this.severity = severity } /** Message regarding the consequence of the situation. */ @@ -874,8 +862,6 @@ private constructor( consequenceMessage(JsonField.of(consequenceMessage)) /** Message regarding the consequence of the situation. */ - @JsonProperty("consequenceMessage") - @ExcludeMissing fun consequenceMessage(consequenceMessage: JsonField) = apply { this.consequenceMessage = consequenceMessage } @@ -885,7 +871,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -918,13 +903,16 @@ private constructor( ) } - @JsonDeserialize(builder = ActiveWindow.Builder::class) @NoAutoDetect class ActiveWindow + @JsonCreator private constructor( - private val from: JsonField, - private val to: JsonField, - private val additionalProperties: Map, + @JsonProperty("from") + @ExcludeMissing + private val from: JsonField = JsonMissing.of(), + @JsonProperty("to") @ExcludeMissing private val to: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Start time of the active window as a Unix timestamp. */ @@ -976,16 +964,12 @@ private constructor( fun from(from: Long) = from(JsonField.of(from)) /** Start time of the active window as a Unix timestamp. */ - @JsonProperty("from") - @ExcludeMissing fun from(from: JsonField) = apply { this.from = from } /** End time of the active window as a Unix timestamp. */ fun to(to: Long) = to(JsonField.of(to)) /** End time of the active window as a Unix timestamp. */ - @JsonProperty("to") - @ExcludeMissing fun to(to: JsonField) = apply { this.to = to } fun additionalProperties(additionalProperties: Map) = apply { @@ -993,7 +977,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1037,17 +1020,30 @@ private constructor( "ActiveWindow{from=$from, to=$to, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = AllAffect.Builder::class) @NoAutoDetect class AllAffect + @JsonCreator private constructor( - private val agencyId: JsonField, - private val applicationId: JsonField, - private val directionId: JsonField, - private val routeId: JsonField, - private val stopId: JsonField, - private val tripId: JsonField, - private val additionalProperties: Map, + @JsonProperty("agencyId") + @ExcludeMissing + private val agencyId: JsonField = JsonMissing.of(), + @JsonProperty("applicationId") + @ExcludeMissing + private val applicationId: JsonField = JsonMissing.of(), + @JsonProperty("directionId") + @ExcludeMissing + private val directionId: JsonField = JsonMissing.of(), + @JsonProperty("routeId") + @ExcludeMissing + private val routeId: JsonField = JsonMissing.of(), + @JsonProperty("stopId") + @ExcludeMissing + private val stopId: JsonField = JsonMissing.of(), + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Identifier for the agency. */ @@ -1135,8 +1131,6 @@ private constructor( fun agencyId(agencyId: String) = agencyId(JsonField.of(agencyId)) /** Identifier for the agency. */ - @JsonProperty("agencyId") - @ExcludeMissing fun agencyId(agencyId: JsonField) = apply { this.agencyId = agencyId } /** Identifier for the application. */ @@ -1144,8 +1138,6 @@ private constructor( applicationId(JsonField.of(applicationId)) /** Identifier for the application. */ - @JsonProperty("applicationId") - @ExcludeMissing fun applicationId(applicationId: JsonField) = apply { this.applicationId = applicationId } @@ -1154,8 +1146,6 @@ private constructor( fun directionId(directionId: String) = directionId(JsonField.of(directionId)) /** Identifier for the direction. */ - @JsonProperty("directionId") - @ExcludeMissing fun directionId(directionId: JsonField) = apply { this.directionId = directionId } @@ -1164,24 +1154,18 @@ private constructor( fun routeId(routeId: String) = routeId(JsonField.of(routeId)) /** Identifier for the route. */ - @JsonProperty("routeId") - @ExcludeMissing fun routeId(routeId: JsonField) = apply { this.routeId = routeId } /** Identifier for the stop. */ fun stopId(stopId: String) = stopId(JsonField.of(stopId)) /** Identifier for the stop. */ - @JsonProperty("stopId") - @ExcludeMissing fun stopId(stopId: JsonField) = apply { this.stopId = stopId } /** Identifier for the trip. */ fun tripId(tripId: String) = tripId(JsonField.of(tripId)) /** Identifier for the trip. */ - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } fun additionalProperties(additionalProperties: Map) = apply { @@ -1189,7 +1173,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1237,13 +1220,18 @@ private constructor( "AllAffect{agencyId=$agencyId, applicationId=$applicationId, directionId=$directionId, routeId=$routeId, stopId=$stopId, tripId=$tripId, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Consequence.Builder::class) @NoAutoDetect class Consequence + @JsonCreator private constructor( - private val condition: JsonField, - private val conditionDetails: JsonField, - private val additionalProperties: Map, + @JsonProperty("condition") + @ExcludeMissing + private val condition: JsonField = JsonMissing.of(), + @JsonProperty("conditionDetails") + @ExcludeMissing + private val conditionDetails: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Condition of the consequence. */ @@ -1296,15 +1284,11 @@ private constructor( fun condition(condition: String) = condition(JsonField.of(condition)) /** Condition of the consequence. */ - @JsonProperty("condition") - @ExcludeMissing fun condition(condition: JsonField) = apply { this.condition = condition } fun conditionDetails(conditionDetails: ConditionDetails) = conditionDetails(JsonField.of(conditionDetails)) - @JsonProperty("conditionDetails") - @ExcludeMissing fun conditionDetails(conditionDetails: JsonField) = apply { this.conditionDetails = conditionDetails } @@ -1314,7 +1298,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1340,13 +1323,18 @@ private constructor( ) } - @JsonDeserialize(builder = ConditionDetails.Builder::class) @NoAutoDetect class ConditionDetails + @JsonCreator private constructor( - private val diversionPath: JsonField, - private val diversionStopIds: JsonField>, - private val additionalProperties: Map, + @JsonProperty("diversionPath") + @ExcludeMissing + private val diversionPath: JsonField = JsonMissing.of(), + @JsonProperty("diversionStopIds") + @ExcludeMissing + private val diversionStopIds: JsonField> = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun diversionPath(): DiversionPath? = diversionPath.getNullable("diversionPath") @@ -1396,8 +1384,6 @@ private constructor( fun diversionPath(diversionPath: DiversionPath) = diversionPath(JsonField.of(diversionPath)) - @JsonProperty("diversionPath") - @ExcludeMissing fun diversionPath(diversionPath: JsonField) = apply { this.diversionPath = diversionPath } @@ -1405,8 +1391,6 @@ private constructor( fun diversionStopIds(diversionStopIds: List) = diversionStopIds(JsonField.of(diversionStopIds)) - @JsonProperty("diversionStopIds") - @ExcludeMissing fun diversionStopIds(diversionStopIds: JsonField>) = apply { this.diversionStopIds = diversionStopIds } @@ -1416,7 +1400,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1442,14 +1425,21 @@ private constructor( ) } - @JsonDeserialize(builder = DiversionPath.Builder::class) @NoAutoDetect class DiversionPath + @JsonCreator private constructor( - private val length: JsonField, - private val levels: JsonField, - private val points: JsonField, - private val additionalProperties: Map, + @JsonProperty("length") + @ExcludeMissing + private val length: JsonField = JsonMissing.of(), + @JsonProperty("levels") + @ExcludeMissing + private val levels: JsonField = JsonMissing.of(), + @JsonProperty("points") + @ExcludeMissing + private val points: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Length of the diversion path. */ @@ -1511,24 +1501,18 @@ private constructor( fun length(length: Long) = length(JsonField.of(length)) /** Length of the diversion path. */ - @JsonProperty("length") - @ExcludeMissing fun length(length: JsonField) = apply { this.length = length } /** Levels of the diversion path. */ fun levels(levels: String) = levels(JsonField.of(levels)) /** Levels of the diversion path. */ - @JsonProperty("levels") - @ExcludeMissing fun levels(levels: JsonField) = apply { this.levels = levels } /** Points of the diversion path. */ fun points(points: String) = points(JsonField.of(points)) /** Points of the diversion path. */ - @JsonProperty("points") - @ExcludeMissing fun points(points: JsonField) = apply { this.points = points } fun additionalProperties(additionalProperties: Map) = @@ -1537,7 +1521,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1617,13 +1600,18 @@ private constructor( "Consequence{condition=$condition, conditionDetails=$conditionDetails, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Description.Builder::class) @NoAutoDetect class Description + @JsonCreator private constructor( - private val lang: JsonField, - private val value: JsonField, - private val additionalProperties: Map, + @JsonProperty("lang") + @ExcludeMissing + private val lang: JsonField = JsonMissing.of(), + @JsonProperty("value") + @ExcludeMissing + private val value: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Language of the description. */ @@ -1675,16 +1663,12 @@ private constructor( fun lang(lang: String) = lang(JsonField.of(lang)) /** Language of the description. */ - @JsonProperty("lang") - @ExcludeMissing fun lang(lang: JsonField) = apply { this.lang = lang } /** Longer description of the situation. */ fun value(value: String) = value(JsonField.of(value)) /** Longer description of the situation. */ - @JsonProperty("value") - @ExcludeMissing fun value(value: JsonField) = apply { this.value = value } fun additionalProperties(additionalProperties: Map) = apply { @@ -1692,7 +1676,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1736,13 +1719,16 @@ private constructor( "Description{lang=$lang, value=$value, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = PublicationWindow.Builder::class) @NoAutoDetect class PublicationWindow + @JsonCreator private constructor( - private val from: JsonField, - private val to: JsonField, - private val additionalProperties: Map, + @JsonProperty("from") + @ExcludeMissing + private val from: JsonField = JsonMissing.of(), + @JsonProperty("to") @ExcludeMissing private val to: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Start time of the time window as a Unix timestamp. */ @@ -1794,16 +1780,12 @@ private constructor( fun from(from: Long) = from(JsonField.of(from)) /** Start time of the time window as a Unix timestamp. */ - @JsonProperty("from") - @ExcludeMissing fun from(from: JsonField) = apply { this.from = from } /** End time of the time window as a Unix timestamp. */ fun to(to: Long) = to(JsonField.of(to)) /** End time of the time window as a Unix timestamp. */ - @JsonProperty("to") - @ExcludeMissing fun to(to: JsonField) = apply { this.to = to } fun additionalProperties(additionalProperties: Map) = apply { @@ -1811,7 +1793,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1930,13 +1911,18 @@ private constructor( override fun toString() = value.toString() } - @JsonDeserialize(builder = Summary.Builder::class) @NoAutoDetect class Summary + @JsonCreator private constructor( - private val lang: JsonField, - private val value: JsonField, - private val additionalProperties: Map, + @JsonProperty("lang") + @ExcludeMissing + private val lang: JsonField = JsonMissing.of(), + @JsonProperty("value") + @ExcludeMissing + private val value: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Language of the summary. */ @@ -1988,16 +1974,12 @@ private constructor( fun lang(lang: String) = lang(JsonField.of(lang)) /** Language of the summary. */ - @JsonProperty("lang") - @ExcludeMissing fun lang(lang: JsonField) = apply { this.lang = lang } /** Short summary of the situation. */ fun value(value: String) = value(JsonField.of(value)) /** Short summary of the situation. */ - @JsonProperty("value") - @ExcludeMissing fun value(value: JsonField) = apply { this.value = value } fun additionalProperties(additionalProperties: Map) = apply { @@ -2005,7 +1987,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -2049,13 +2030,18 @@ private constructor( "Summary{lang=$lang, value=$value, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Url.Builder::class) @NoAutoDetect class Url + @JsonCreator private constructor( - private val lang: JsonField, - private val value: JsonField, - private val additionalProperties: Map, + @JsonProperty("lang") + @ExcludeMissing + private val lang: JsonField = JsonMissing.of(), + @JsonProperty("value") + @ExcludeMissing + private val value: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Language of the URL. */ @@ -2107,16 +2093,12 @@ private constructor( fun lang(lang: String) = lang(JsonField.of(lang)) /** Language of the URL. */ - @JsonProperty("lang") - @ExcludeMissing fun lang(lang: JsonField) = apply { this.lang = lang } /** URL for more information about the situation. */ fun value(value: String) = value(JsonField.of(value)) /** URL for more information about the situation. */ - @JsonProperty("value") - @ExcludeMissing fun value(value: JsonField) = apply { this.value = value } fun additionalProperties(additionalProperties: Map) = apply { @@ -2124,7 +2106,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -2186,22 +2167,39 @@ private constructor( "Situation{id=$id, creationTime=$creationTime, reason=$reason, summary=$summary, description=$description, url=$url, activeWindows=$activeWindows, allAffects=$allAffects, consequences=$consequences, publicationWindows=$publicationWindows, severity=$severity, consequenceMessage=$consequenceMessage, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Stop.Builder::class) @NoAutoDetect class Stop + @JsonCreator private constructor( - private val code: JsonField, - private val direction: JsonField, - private val id: JsonField, - private val lat: JsonField, - private val locationType: JsonField, - private val lon: JsonField, - private val name: JsonField, - private val parent: JsonField, - private val routeIds: JsonField>, - private val staticRouteIds: JsonField>, - private val wheelchairBoarding: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") + @ExcludeMissing + private val code: JsonField = JsonMissing.of(), + @JsonProperty("direction") + @ExcludeMissing + private val direction: JsonField = JsonMissing.of(), + @JsonProperty("id") @ExcludeMissing private val id: JsonField = JsonMissing.of(), + @JsonProperty("lat") @ExcludeMissing private val lat: JsonField = JsonMissing.of(), + @JsonProperty("locationType") + @ExcludeMissing + private val locationType: JsonField = JsonMissing.of(), + @JsonProperty("lon") @ExcludeMissing private val lon: JsonField = JsonMissing.of(), + @JsonProperty("name") + @ExcludeMissing + private val name: JsonField = JsonMissing.of(), + @JsonProperty("parent") + @ExcludeMissing + private val parent: JsonField = JsonMissing.of(), + @JsonProperty("routeIds") + @ExcludeMissing + private val routeIds: JsonField> = JsonMissing.of(), + @JsonProperty("staticRouteIds") + @ExcludeMissing + private val staticRouteIds: JsonField> = JsonMissing.of(), + @JsonProperty("wheelchairBoarding") + @ExcludeMissing + private val wheelchairBoarding: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): String? = code.getNullable("code") @@ -2312,65 +2310,45 @@ private constructor( fun code(code: String) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun direction(direction: String) = direction(JsonField.of(direction)) - @JsonProperty("direction") - @ExcludeMissing fun direction(direction: JsonField) = apply { this.direction = direction } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun lat(lat: Double) = lat(JsonField.of(lat)) - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } fun locationType(locationType: Long) = locationType(JsonField.of(locationType)) - @JsonProperty("locationType") - @ExcludeMissing fun locationType(locationType: JsonField) = apply { this.locationType = locationType } fun lon(lon: Double) = lon(JsonField.of(lon)) - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun name(name: String) = name(JsonField.of(name)) - @JsonProperty("name") - @ExcludeMissing fun name(name: JsonField) = apply { this.name = name } fun parent(parent: String) = parent(JsonField.of(parent)) - @JsonProperty("parent") - @ExcludeMissing fun parent(parent: JsonField) = apply { this.parent = parent } fun routeIds(routeIds: List) = routeIds(JsonField.of(routeIds)) - @JsonProperty("routeIds") - @ExcludeMissing fun routeIds(routeIds: JsonField>) = apply { this.routeIds = routeIds } fun staticRouteIds(staticRouteIds: List) = staticRouteIds(JsonField.of(staticRouteIds)) - @JsonProperty("staticRouteIds") - @ExcludeMissing fun staticRouteIds(staticRouteIds: JsonField>) = apply { this.staticRouteIds = staticRouteIds } @@ -2378,8 +2356,6 @@ private constructor( fun wheelchairBoarding(wheelchairBoarding: String) = wheelchairBoarding(JsonField.of(wheelchairBoarding)) - @JsonProperty("wheelchairBoarding") - @ExcludeMissing fun wheelchairBoarding(wheelchairBoarding: JsonField) = apply { this.wheelchairBoarding = wheelchairBoarding } @@ -2389,7 +2365,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -2439,17 +2414,30 @@ private constructor( "Stop{code=$code, direction=$direction, id=$id, lat=$lat, locationType=$locationType, lon=$lon, name=$name, parent=$parent, routeIds=$routeIds, staticRouteIds=$staticRouteIds, wheelchairBoarding=$wheelchairBoarding, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = StopTime.Builder::class) @NoAutoDetect class StopTime + @JsonCreator private constructor( - private val arrivalTime: JsonField, - private val departureTime: JsonField, - private val distanceAlongTrip: JsonField, - private val historicalOccupancy: JsonField, - private val stopHeadsign: JsonField, - private val stopId: JsonField, - private val additionalProperties: Map, + @JsonProperty("arrivalTime") + @ExcludeMissing + private val arrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("departureTime") + @ExcludeMissing + private val departureTime: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("historicalOccupancy") + @ExcludeMissing + private val historicalOccupancy: JsonField = JsonMissing.of(), + @JsonProperty("stopHeadsign") + @ExcludeMissing + private val stopHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("stopId") + @ExcludeMissing + private val stopId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun arrivalTime(): Long? = arrivalTime.getNullable("arrivalTime") @@ -2527,14 +2515,10 @@ private constructor( fun arrivalTime(arrivalTime: Long) = arrivalTime(JsonField.of(arrivalTime)) - @JsonProperty("arrivalTime") - @ExcludeMissing fun arrivalTime(arrivalTime: JsonField) = apply { this.arrivalTime = arrivalTime } fun departureTime(departureTime: Long) = departureTime(JsonField.of(departureTime)) - @JsonProperty("departureTime") - @ExcludeMissing fun departureTime(departureTime: JsonField) = apply { this.departureTime = departureTime } @@ -2542,8 +2526,6 @@ private constructor( fun distanceAlongTrip(distanceAlongTrip: Double) = distanceAlongTrip(JsonField.of(distanceAlongTrip)) - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -2551,24 +2533,18 @@ private constructor( fun historicalOccupancy(historicalOccupancy: String) = historicalOccupancy(JsonField.of(historicalOccupancy)) - @JsonProperty("historicalOccupancy") - @ExcludeMissing fun historicalOccupancy(historicalOccupancy: JsonField) = apply { this.historicalOccupancy = historicalOccupancy } fun stopHeadsign(stopHeadsign: String) = stopHeadsign(JsonField.of(stopHeadsign)) - @JsonProperty("stopHeadsign") - @ExcludeMissing fun stopHeadsign(stopHeadsign: JsonField) = apply { this.stopHeadsign = stopHeadsign } fun stopId(stopId: String) = stopId(JsonField.of(stopId)) - @JsonProperty("stopId") - @ExcludeMissing fun stopId(stopId: JsonField) = apply { this.stopId = stopId } fun additionalProperties(additionalProperties: Map) = apply { @@ -2576,7 +2552,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -2621,22 +2596,43 @@ private constructor( "StopTime{arrivalTime=$arrivalTime, departureTime=$departureTime, distanceAlongTrip=$distanceAlongTrip, historicalOccupancy=$historicalOccupancy, stopHeadsign=$stopHeadsign, stopId=$stopId, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Trip.Builder::class) @NoAutoDetect class Trip + @JsonCreator private constructor( - private val blockId: JsonField, - private val directionId: JsonField, - private val id: JsonField, - private val peakOffpeak: JsonField, - private val routeId: JsonField, - private val routeShortName: JsonField, - private val serviceId: JsonField, - private val shapeId: JsonField, - private val timeZone: JsonField, - private val tripHeadsign: JsonField, - private val tripShortName: JsonField, - private val additionalProperties: Map, + @JsonProperty("blockId") + @ExcludeMissing + private val blockId: JsonField = JsonMissing.of(), + @JsonProperty("directionId") + @ExcludeMissing + private val directionId: JsonField = JsonMissing.of(), + @JsonProperty("id") @ExcludeMissing private val id: JsonField = JsonMissing.of(), + @JsonProperty("peakOffpeak") + @ExcludeMissing + private val peakOffpeak: JsonField = JsonMissing.of(), + @JsonProperty("routeId") + @ExcludeMissing + private val routeId: JsonField = JsonMissing.of(), + @JsonProperty("routeShortName") + @ExcludeMissing + private val routeShortName: JsonField = JsonMissing.of(), + @JsonProperty("serviceId") + @ExcludeMissing + private val serviceId: JsonField = JsonMissing.of(), + @JsonProperty("shapeId") + @ExcludeMissing + private val shapeId: JsonField = JsonMissing.of(), + @JsonProperty("timeZone") + @ExcludeMissing + private val timeZone: JsonField = JsonMissing.of(), + @JsonProperty("tripHeadsign") + @ExcludeMissing + private val tripHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("tripShortName") + @ExcludeMissing + private val tripShortName: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun blockId(): String? = blockId.getNullable("blockId") @@ -2745,75 +2741,53 @@ private constructor( fun blockId(blockId: String) = blockId(JsonField.of(blockId)) - @JsonProperty("blockId") - @ExcludeMissing fun blockId(blockId: JsonField) = apply { this.blockId = blockId } fun directionId(directionId: String) = directionId(JsonField.of(directionId)) - @JsonProperty("directionId") - @ExcludeMissing fun directionId(directionId: JsonField) = apply { this.directionId = directionId } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun peakOffpeak(peakOffpeak: Long) = peakOffpeak(JsonField.of(peakOffpeak)) - @JsonProperty("peakOffpeak") - @ExcludeMissing fun peakOffpeak(peakOffpeak: JsonField) = apply { this.peakOffpeak = peakOffpeak } fun routeId(routeId: String) = routeId(JsonField.of(routeId)) - @JsonProperty("routeId") - @ExcludeMissing fun routeId(routeId: JsonField) = apply { this.routeId = routeId } fun routeShortName(routeShortName: String) = routeShortName(JsonField.of(routeShortName)) - @JsonProperty("routeShortName") - @ExcludeMissing fun routeShortName(routeShortName: JsonField) = apply { this.routeShortName = routeShortName } fun serviceId(serviceId: String) = serviceId(JsonField.of(serviceId)) - @JsonProperty("serviceId") - @ExcludeMissing fun serviceId(serviceId: JsonField) = apply { this.serviceId = serviceId } fun shapeId(shapeId: String) = shapeId(JsonField.of(shapeId)) - @JsonProperty("shapeId") - @ExcludeMissing fun shapeId(shapeId: JsonField) = apply { this.shapeId = shapeId } fun timeZone(timeZone: String) = timeZone(JsonField.of(timeZone)) - @JsonProperty("timeZone") - @ExcludeMissing fun timeZone(timeZone: JsonField) = apply { this.timeZone = timeZone } fun tripHeadsign(tripHeadsign: String) = tripHeadsign(JsonField.of(tripHeadsign)) - @JsonProperty("tripHeadsign") - @ExcludeMissing fun tripHeadsign(tripHeadsign: JsonField) = apply { this.tripHeadsign = tripHeadsign } fun tripShortName(tripShortName: String) = tripShortName(JsonField.of(tripShortName)) - @JsonProperty("tripShortName") - @ExcludeMissing fun tripShortName(tripShortName: JsonField) = apply { this.tripShortName = tripShortName } @@ -2823,7 +2797,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ResponseWrapper.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ResponseWrapper.kt index 3673af2..7b81b9e 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ResponseWrapper.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ResponseWrapper.kt @@ -4,25 +4,30 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = ResponseWrapper.Builder::class) @NoAutoDetect class ResponseWrapper +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -82,26 +87,18 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun additionalProperties(additionalProperties: Map) = apply { @@ -109,7 +106,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RouteIdsForAgencyListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RouteIdsForAgencyListResponse.kt index 899f1aa..6d7ffb5 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RouteIdsForAgencyListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RouteIdsForAgencyListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = RouteIdsForAgencyListResponse.Builder::class) @NoAutoDetect class RouteIdsForAgencyListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,14 +151,21 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val limitExceeded: JsonField, - private val list: JsonField>, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun limitExceeded(): Boolean = limitExceeded.getRequired("limitExceeded") @@ -217,22 +218,16 @@ private constructor( fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun list(list: List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -242,7 +237,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RouteRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RouteRetrieveResponse.kt index f481e34..34f6f0a 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RouteRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RouteRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = RouteRetrieveResponse.Builder::class) @NoAutoDetect class RouteRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,13 +151,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -209,14 +208,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -226,7 +221,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -249,21 +243,42 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val agencyId: JsonField, - private val color: JsonField, - private val description: JsonField, - private val id: JsonField, - private val longName: JsonField, - private val nullSafeShortName: JsonField, - private val shortName: JsonField, - private val textColor: JsonField, - private val type: JsonField, - private val url: JsonField, - private val additionalProperties: Map, + @JsonProperty("agencyId") + @ExcludeMissing + private val agencyId: JsonField = JsonMissing.of(), + @JsonProperty("color") + @ExcludeMissing + private val color: JsonField = JsonMissing.of(), + @JsonProperty("description") + @ExcludeMissing + private val description: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("longName") + @ExcludeMissing + private val longName: JsonField = JsonMissing.of(), + @JsonProperty("nullSafeShortName") + @ExcludeMissing + private val nullSafeShortName: JsonField = JsonMissing.of(), + @JsonProperty("shortName") + @ExcludeMissing + private val shortName: JsonField = JsonMissing.of(), + @JsonProperty("textColor") + @ExcludeMissing + private val textColor: JsonField = JsonMissing.of(), + @JsonProperty("type") + @ExcludeMissing + private val type: JsonField = JsonMissing.of(), + @JsonProperty("url") + @ExcludeMissing + private val url: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun agencyId(): String = agencyId.getRequired("agencyId") @@ -367,67 +382,47 @@ private constructor( fun agencyId(agencyId: String) = agencyId(JsonField.of(agencyId)) - @JsonProperty("agencyId") - @ExcludeMissing fun agencyId(agencyId: JsonField) = apply { this.agencyId = agencyId } fun color(color: String) = color(JsonField.of(color)) - @JsonProperty("color") - @ExcludeMissing fun color(color: JsonField) = apply { this.color = color } fun description(description: String) = description(JsonField.of(description)) - @JsonProperty("description") - @ExcludeMissing fun description(description: JsonField) = apply { this.description = description } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun longName(longName: String) = longName(JsonField.of(longName)) - @JsonProperty("longName") - @ExcludeMissing fun longName(longName: JsonField) = apply { this.longName = longName } fun nullSafeShortName(nullSafeShortName: String) = nullSafeShortName(JsonField.of(nullSafeShortName)) - @JsonProperty("nullSafeShortName") - @ExcludeMissing fun nullSafeShortName(nullSafeShortName: JsonField) = apply { this.nullSafeShortName = nullSafeShortName } fun shortName(shortName: String) = shortName(JsonField.of(shortName)) - @JsonProperty("shortName") - @ExcludeMissing fun shortName(shortName: JsonField) = apply { this.shortName = shortName } fun textColor(textColor: String) = textColor(JsonField.of(textColor)) - @JsonProperty("textColor") - @ExcludeMissing fun textColor(textColor: JsonField) = apply { this.textColor = textColor } fun type(type: Long) = type(JsonField.of(type)) - @JsonProperty("type") - @ExcludeMissing fun type(type: JsonField) = apply { this.type = type } fun url(url: String) = url(JsonField.of(url)) - @JsonProperty("url") - @ExcludeMissing fun url(url: JsonField) = apply { this.url = url } fun additionalProperties(additionalProperties: Map) = apply { @@ -435,7 +430,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RoutesForAgencyListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RoutesForAgencyListResponse.kt index 76ae387..4cd3e53 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RoutesForAgencyListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RoutesForAgencyListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = RoutesForAgencyListResponse.Builder::class) @NoAutoDetect class RoutesForAgencyListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,14 +151,21 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val limitExceeded: JsonField, - private val list: JsonField>, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun limitExceeded(): Boolean = limitExceeded.getRequired("limitExceeded") @@ -217,22 +218,16 @@ private constructor( fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun list(list: kotlin.collections.List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -242,7 +237,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -266,21 +260,42 @@ private constructor( ) } - @JsonDeserialize(builder = List.Builder::class) @NoAutoDetect class List + @JsonCreator private constructor( - private val agencyId: JsonField, - private val color: JsonField, - private val description: JsonField, - private val id: JsonField, - private val longName: JsonField, - private val nullSafeShortName: JsonField, - private val shortName: JsonField, - private val textColor: JsonField, - private val type: JsonField, - private val url: JsonField, - private val additionalProperties: Map, + @JsonProperty("agencyId") + @ExcludeMissing + private val agencyId: JsonField = JsonMissing.of(), + @JsonProperty("color") + @ExcludeMissing + private val color: JsonField = JsonMissing.of(), + @JsonProperty("description") + @ExcludeMissing + private val description: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("longName") + @ExcludeMissing + private val longName: JsonField = JsonMissing.of(), + @JsonProperty("nullSafeShortName") + @ExcludeMissing + private val nullSafeShortName: JsonField = JsonMissing.of(), + @JsonProperty("shortName") + @ExcludeMissing + private val shortName: JsonField = JsonMissing.of(), + @JsonProperty("textColor") + @ExcludeMissing + private val textColor: JsonField = JsonMissing.of(), + @JsonProperty("type") + @ExcludeMissing + private val type: JsonField = JsonMissing.of(), + @JsonProperty("url") + @ExcludeMissing + private val url: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun agencyId(): String = agencyId.getRequired("agencyId") @@ -384,67 +399,47 @@ private constructor( fun agencyId(agencyId: String) = agencyId(JsonField.of(agencyId)) - @JsonProperty("agencyId") - @ExcludeMissing fun agencyId(agencyId: JsonField) = apply { this.agencyId = agencyId } fun color(color: String) = color(JsonField.of(color)) - @JsonProperty("color") - @ExcludeMissing fun color(color: JsonField) = apply { this.color = color } fun description(description: String) = description(JsonField.of(description)) - @JsonProperty("description") - @ExcludeMissing fun description(description: JsonField) = apply { this.description = description } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun longName(longName: String) = longName(JsonField.of(longName)) - @JsonProperty("longName") - @ExcludeMissing fun longName(longName: JsonField) = apply { this.longName = longName } fun nullSafeShortName(nullSafeShortName: String) = nullSafeShortName(JsonField.of(nullSafeShortName)) - @JsonProperty("nullSafeShortName") - @ExcludeMissing fun nullSafeShortName(nullSafeShortName: JsonField) = apply { this.nullSafeShortName = nullSafeShortName } fun shortName(shortName: String) = shortName(JsonField.of(shortName)) - @JsonProperty("shortName") - @ExcludeMissing fun shortName(shortName: JsonField) = apply { this.shortName = shortName } fun textColor(textColor: String) = textColor(JsonField.of(textColor)) - @JsonProperty("textColor") - @ExcludeMissing fun textColor(textColor: JsonField) = apply { this.textColor = textColor } fun type(type: Long) = type(JsonField.of(type)) - @JsonProperty("type") - @ExcludeMissing fun type(type: JsonField) = apply { this.type = type } fun url(url: String) = url(JsonField.of(url)) - @JsonProperty("url") - @ExcludeMissing fun url(url: JsonField) = apply { this.url = url } fun additionalProperties(additionalProperties: Map) = apply { @@ -452,7 +447,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RoutesForLocationListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RoutesForLocationListResponse.kt index 58cb298..a0576a7 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RoutesForLocationListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/RoutesForLocationListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = RoutesForLocationListResponse.Builder::class) @NoAutoDetect class RoutesForLocationListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,15 +151,24 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val limitExceeded: JsonField, - private val list: JsonField>, - private val outOfRange: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("outOfRange") + @ExcludeMissing + private val outOfRange: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun limitExceeded(): Boolean = limitExceeded.getRequired("limitExceeded") @@ -225,28 +228,20 @@ private constructor( fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun list(list: kotlin.collections.List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } fun outOfRange(outOfRange: Boolean) = outOfRange(JsonField.of(outOfRange)) - @JsonProperty("outOfRange") - @ExcludeMissing fun outOfRange(outOfRange: JsonField) = apply { this.outOfRange = outOfRange } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -256,7 +251,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -281,21 +275,42 @@ private constructor( ) } - @JsonDeserialize(builder = List.Builder::class) @NoAutoDetect class List + @JsonCreator private constructor( - private val agencyId: JsonField, - private val color: JsonField, - private val description: JsonField, - private val id: JsonField, - private val longName: JsonField, - private val nullSafeShortName: JsonField, - private val shortName: JsonField, - private val textColor: JsonField, - private val type: JsonField, - private val url: JsonField, - private val additionalProperties: Map, + @JsonProperty("agencyId") + @ExcludeMissing + private val agencyId: JsonField = JsonMissing.of(), + @JsonProperty("color") + @ExcludeMissing + private val color: JsonField = JsonMissing.of(), + @JsonProperty("description") + @ExcludeMissing + private val description: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("longName") + @ExcludeMissing + private val longName: JsonField = JsonMissing.of(), + @JsonProperty("nullSafeShortName") + @ExcludeMissing + private val nullSafeShortName: JsonField = JsonMissing.of(), + @JsonProperty("shortName") + @ExcludeMissing + private val shortName: JsonField = JsonMissing.of(), + @JsonProperty("textColor") + @ExcludeMissing + private val textColor: JsonField = JsonMissing.of(), + @JsonProperty("type") + @ExcludeMissing + private val type: JsonField = JsonMissing.of(), + @JsonProperty("url") + @ExcludeMissing + private val url: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun agencyId(): String = agencyId.getRequired("agencyId") @@ -399,67 +414,47 @@ private constructor( fun agencyId(agencyId: String) = agencyId(JsonField.of(agencyId)) - @JsonProperty("agencyId") - @ExcludeMissing fun agencyId(agencyId: JsonField) = apply { this.agencyId = agencyId } fun color(color: String) = color(JsonField.of(color)) - @JsonProperty("color") - @ExcludeMissing fun color(color: JsonField) = apply { this.color = color } fun description(description: String) = description(JsonField.of(description)) - @JsonProperty("description") - @ExcludeMissing fun description(description: JsonField) = apply { this.description = description } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun longName(longName: String) = longName(JsonField.of(longName)) - @JsonProperty("longName") - @ExcludeMissing fun longName(longName: JsonField) = apply { this.longName = longName } fun nullSafeShortName(nullSafeShortName: String) = nullSafeShortName(JsonField.of(nullSafeShortName)) - @JsonProperty("nullSafeShortName") - @ExcludeMissing fun nullSafeShortName(nullSafeShortName: JsonField) = apply { this.nullSafeShortName = nullSafeShortName } fun shortName(shortName: String) = shortName(JsonField.of(shortName)) - @JsonProperty("shortName") - @ExcludeMissing fun shortName(shortName: JsonField) = apply { this.shortName = shortName } fun textColor(textColor: String) = textColor(JsonField.of(textColor)) - @JsonProperty("textColor") - @ExcludeMissing fun textColor(textColor: JsonField) = apply { this.textColor = textColor } fun type(type: Long) = type(JsonField.of(type)) - @JsonProperty("type") - @ExcludeMissing fun type(type: JsonField) = apply { this.type = type } fun url(url: String) = url(JsonField.of(url)) - @JsonProperty("url") - @ExcludeMissing fun url(url: JsonField) = apply { this.url = url } fun additionalProperties(additionalProperties: Map) = apply { @@ -467,7 +462,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ScheduleForRouteRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ScheduleForRouteRetrieveResponse.kt index 6c7d221..9d326b5 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ScheduleForRouteRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ScheduleForRouteRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = ScheduleForRouteRetrieveResponse.Builder::class) @NoAutoDetect class ScheduleForRouteRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -100,32 +105,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -133,7 +128,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -159,12 +153,15 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -203,8 +200,6 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun additionalProperties(additionalProperties: Map) = apply { @@ -212,7 +207,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -230,17 +224,30 @@ private constructor( fun build(): Data = Data(entry, additionalProperties.toImmutable()) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val routeId: JsonField, - private val scheduleDate: JsonField, - private val serviceIds: JsonField>, - private val stopTripGroupings: JsonField>, - private val stops: JsonField>, - private val trips: JsonField>, - private val additionalProperties: Map, + @JsonProperty("routeId") + @ExcludeMissing + private val routeId: JsonField = JsonMissing.of(), + @JsonProperty("scheduleDate") + @ExcludeMissing + private val scheduleDate: JsonField = JsonMissing.of(), + @JsonProperty("serviceIds") + @ExcludeMissing + private val serviceIds: JsonField> = JsonMissing.of(), + @JsonProperty("stopTripGroupings") + @ExcludeMissing + private val stopTripGroupings: JsonField> = JsonMissing.of(), + @JsonProperty("stops") + @ExcludeMissing + private val stops: JsonField> = JsonMissing.of(), + @JsonProperty("trips") + @ExcludeMissing + private val trips: JsonField> = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun routeId(): String = routeId.getRequired("routeId") @@ -317,22 +324,16 @@ private constructor( fun routeId(routeId: String) = routeId(JsonField.of(routeId)) - @JsonProperty("routeId") - @ExcludeMissing fun routeId(routeId: JsonField) = apply { this.routeId = routeId } fun scheduleDate(scheduleDate: Long) = scheduleDate(JsonField.of(scheduleDate)) - @JsonProperty("scheduleDate") - @ExcludeMissing fun scheduleDate(scheduleDate: JsonField) = apply { this.scheduleDate = scheduleDate } fun serviceIds(serviceIds: List) = serviceIds(JsonField.of(serviceIds)) - @JsonProperty("serviceIds") - @ExcludeMissing fun serviceIds(serviceIds: JsonField>) = apply { this.serviceIds = serviceIds } @@ -340,8 +341,6 @@ private constructor( fun stopTripGroupings(stopTripGroupings: List) = stopTripGroupings(JsonField.of(stopTripGroupings)) - @JsonProperty("stopTripGroupings") - @ExcludeMissing fun stopTripGroupings(stopTripGroupings: JsonField>) = apply { this.stopTripGroupings = stopTripGroupings @@ -349,14 +348,10 @@ private constructor( fun stops(stops: List) = stops(JsonField.of(stops)) - @JsonProperty("stops") - @ExcludeMissing fun stops(stops: JsonField>) = apply { this.stops = stops } fun trips(trips: List) = trips(JsonField.of(trips)) - @JsonProperty("trips") - @ExcludeMissing fun trips(trips: JsonField>) = apply { this.trips = trips } fun additionalProperties(additionalProperties: Map) = apply { @@ -364,7 +359,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -394,22 +388,45 @@ private constructor( ) } - @JsonDeserialize(builder = Stop.Builder::class) @NoAutoDetect class Stop + @JsonCreator private constructor( - private val code: JsonField, - private val direction: JsonField, - private val id: JsonField, - private val lat: JsonField, - private val locationType: JsonField, - private val lon: JsonField, - private val name: JsonField, - private val parent: JsonField, - private val routeIds: JsonField>, - private val staticRouteIds: JsonField>, - private val wheelchairBoarding: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") + @ExcludeMissing + private val code: JsonField = JsonMissing.of(), + @JsonProperty("direction") + @ExcludeMissing + private val direction: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("locationType") + @ExcludeMissing + private val locationType: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonProperty("name") + @ExcludeMissing + private val name: JsonField = JsonMissing.of(), + @JsonProperty("parent") + @ExcludeMissing + private val parent: JsonField = JsonMissing.of(), + @JsonProperty("routeIds") + @ExcludeMissing + private val routeIds: JsonField> = JsonMissing.of(), + @JsonProperty("staticRouteIds") + @ExcludeMissing + private val staticRouteIds: JsonField> = JsonMissing.of(), + @JsonProperty("wheelchairBoarding") + @ExcludeMissing + private val wheelchairBoarding: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): String? = code.getNullable("code") @@ -523,60 +540,42 @@ private constructor( fun code(code: String) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun direction(direction: String) = direction(JsonField.of(direction)) - @JsonProperty("direction") - @ExcludeMissing fun direction(direction: JsonField) = apply { this.direction = direction } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun lat(lat: Double) = lat(JsonField.of(lat)) - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } fun locationType(locationType: Long) = locationType(JsonField.of(locationType)) - @JsonProperty("locationType") - @ExcludeMissing fun locationType(locationType: JsonField) = apply { this.locationType = locationType } fun lon(lon: Double) = lon(JsonField.of(lon)) - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun name(name: String) = name(JsonField.of(name)) - @JsonProperty("name") - @ExcludeMissing fun name(name: JsonField) = apply { this.name = name } fun parent(parent: String) = parent(JsonField.of(parent)) - @JsonProperty("parent") - @ExcludeMissing fun parent(parent: JsonField) = apply { this.parent = parent } fun routeIds(routeIds: List) = routeIds(JsonField.of(routeIds)) - @JsonProperty("routeIds") - @ExcludeMissing fun routeIds(routeIds: JsonField>) = apply { this.routeIds = routeIds } @@ -584,8 +583,6 @@ private constructor( fun staticRouteIds(staticRouteIds: List) = staticRouteIds(JsonField.of(staticRouteIds)) - @JsonProperty("staticRouteIds") - @ExcludeMissing fun staticRouteIds(staticRouteIds: JsonField>) = apply { this.staticRouteIds = staticRouteIds } @@ -593,8 +590,6 @@ private constructor( fun wheelchairBoarding(wheelchairBoarding: String) = wheelchairBoarding(JsonField.of(wheelchairBoarding)) - @JsonProperty("wheelchairBoarding") - @ExcludeMissing fun wheelchairBoarding(wheelchairBoarding: JsonField) = apply { this.wheelchairBoarding = wheelchairBoarding } @@ -604,7 +599,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -657,16 +651,28 @@ private constructor( "Stop{code=$code, direction=$direction, id=$id, lat=$lat, locationType=$locationType, lon=$lon, name=$name, parent=$parent, routeIds=$routeIds, staticRouteIds=$staticRouteIds, wheelchairBoarding=$wheelchairBoarding, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = StopTripGrouping.Builder::class) @NoAutoDetect class StopTripGrouping + @JsonCreator private constructor( - private val directionId: JsonField, - private val stopIds: JsonField>, - private val tripHeadsigns: JsonField>, - private val tripIds: JsonField>, - private val tripsWithStopTimes: JsonField>, - private val additionalProperties: Map, + @JsonProperty("directionId") + @ExcludeMissing + private val directionId: JsonField = JsonMissing.of(), + @JsonProperty("stopIds") + @ExcludeMissing + private val stopIds: JsonField> = JsonMissing.of(), + @JsonProperty("tripHeadsigns") + @ExcludeMissing + private val tripHeadsigns: JsonField> = JsonMissing.of(), + @JsonProperty("tripIds") + @ExcludeMissing + private val tripIds: JsonField> = JsonMissing.of(), + @JsonProperty("tripsWithStopTimes") + @ExcludeMissing + private val tripsWithStopTimes: JsonField> = + JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun directionId(): String = directionId.getRequired("directionId") @@ -737,38 +743,28 @@ private constructor( fun directionId(directionId: String) = directionId(JsonField.of(directionId)) - @JsonProperty("directionId") - @ExcludeMissing fun directionId(directionId: JsonField) = apply { this.directionId = directionId } fun stopIds(stopIds: List) = stopIds(JsonField.of(stopIds)) - @JsonProperty("stopIds") - @ExcludeMissing fun stopIds(stopIds: JsonField>) = apply { this.stopIds = stopIds } fun tripHeadsigns(tripHeadsigns: List) = tripHeadsigns(JsonField.of(tripHeadsigns)) - @JsonProperty("tripHeadsigns") - @ExcludeMissing fun tripHeadsigns(tripHeadsigns: JsonField>) = apply { this.tripHeadsigns = tripHeadsigns } fun tripIds(tripIds: List) = tripIds(JsonField.of(tripIds)) - @JsonProperty("tripIds") - @ExcludeMissing fun tripIds(tripIds: JsonField>) = apply { this.tripIds = tripIds } fun tripsWithStopTimes(tripsWithStopTimes: List) = tripsWithStopTimes(JsonField.of(tripsWithStopTimes)) - @JsonProperty("tripsWithStopTimes") - @ExcludeMissing fun tripsWithStopTimes(tripsWithStopTimes: JsonField>) = apply { this.tripsWithStopTimes = tripsWithStopTimes @@ -779,7 +775,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -808,13 +803,18 @@ private constructor( ) } - @JsonDeserialize(builder = TripsWithStopTime.Builder::class) @NoAutoDetect class TripsWithStopTime + @JsonCreator private constructor( - private val tripId: JsonField, - private val stopTimes: JsonField>, - private val additionalProperties: Map, + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonProperty("stopTimes") + @ExcludeMissing + private val stopTimes: JsonField> = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun tripId(): String = tripId.getRequired("tripId") @@ -862,15 +862,11 @@ private constructor( fun tripId(tripId: String) = tripId(JsonField.of(tripId)) - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } fun stopTimes(stopTimes: List) = stopTimes(JsonField.of(stopTimes)) - @JsonProperty("stopTimes") - @ExcludeMissing fun stopTimes(stopTimes: JsonField>) = apply { this.stopTimes = stopTimes } @@ -881,7 +877,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -906,19 +901,37 @@ private constructor( ) } - @JsonDeserialize(builder = StopTime.Builder::class) @NoAutoDetect class StopTime + @JsonCreator private constructor( - private val arrivalEnabled: JsonField, - private val arrivalTime: JsonField, - private val departureEnabled: JsonField, - private val departureTime: JsonField, - private val serviceId: JsonField, - private val stopHeadsign: JsonField, - private val stopId: JsonField, - private val tripId: JsonField, - private val additionalProperties: Map, + @JsonProperty("arrivalEnabled") + @ExcludeMissing + private val arrivalEnabled: JsonField = JsonMissing.of(), + @JsonProperty("arrivalTime") + @ExcludeMissing + private val arrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("departureEnabled") + @ExcludeMissing + private val departureEnabled: JsonField = JsonMissing.of(), + @JsonProperty("departureTime") + @ExcludeMissing + private val departureTime: JsonField = JsonMissing.of(), + @JsonProperty("serviceId") + @ExcludeMissing + private val serviceId: JsonField = JsonMissing.of(), + @JsonProperty("stopHeadsign") + @ExcludeMissing + private val stopHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("stopId") + @ExcludeMissing + private val stopId: JsonField = JsonMissing.of(), + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = + immutableEmptyMap(), ) { fun arrivalEnabled(): Boolean = arrivalEnabled.getRequired("arrivalEnabled") @@ -1019,8 +1032,6 @@ private constructor( fun arrivalEnabled(arrivalEnabled: Boolean) = arrivalEnabled(JsonField.of(arrivalEnabled)) - @JsonProperty("arrivalEnabled") - @ExcludeMissing fun arrivalEnabled(arrivalEnabled: JsonField) = apply { this.arrivalEnabled = arrivalEnabled } @@ -1028,8 +1039,6 @@ private constructor( fun arrivalTime(arrivalTime: Long) = arrivalTime(JsonField.of(arrivalTime)) - @JsonProperty("arrivalTime") - @ExcludeMissing fun arrivalTime(arrivalTime: JsonField) = apply { this.arrivalTime = arrivalTime } @@ -1037,8 +1046,6 @@ private constructor( fun departureEnabled(departureEnabled: Boolean) = departureEnabled(JsonField.of(departureEnabled)) - @JsonProperty("departureEnabled") - @ExcludeMissing fun departureEnabled(departureEnabled: JsonField) = apply { this.departureEnabled = departureEnabled } @@ -1046,16 +1053,12 @@ private constructor( fun departureTime(departureTime: Long) = departureTime(JsonField.of(departureTime)) - @JsonProperty("departureTime") - @ExcludeMissing fun departureTime(departureTime: JsonField) = apply { this.departureTime = departureTime } fun serviceId(serviceId: String) = serviceId(JsonField.of(serviceId)) - @JsonProperty("serviceId") - @ExcludeMissing fun serviceId(serviceId: JsonField) = apply { this.serviceId = serviceId } @@ -1063,22 +1066,16 @@ private constructor( fun stopHeadsign(stopHeadsign: String) = stopHeadsign(JsonField.of(stopHeadsign)) - @JsonProperty("stopHeadsign") - @ExcludeMissing fun stopHeadsign(stopHeadsign: JsonField) = apply { this.stopHeadsign = stopHeadsign } fun stopId(stopId: String) = stopId(JsonField.of(stopId)) - @JsonProperty("stopId") - @ExcludeMissing fun stopId(stopId: JsonField) = apply { this.stopId = stopId } fun tripId(tripId: String) = tripId(JsonField.of(tripId)) - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } fun additionalProperties(additionalProperties: Map) = @@ -1087,7 +1084,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1172,22 +1168,45 @@ private constructor( "StopTripGrouping{directionId=$directionId, stopIds=$stopIds, tripHeadsigns=$tripHeadsigns, tripIds=$tripIds, tripsWithStopTimes=$tripsWithStopTimes, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Trip.Builder::class) @NoAutoDetect class Trip + @JsonCreator private constructor( - private val blockId: JsonField, - private val directionId: JsonField, - private val id: JsonField, - private val peakOffpeak: JsonField, - private val routeId: JsonField, - private val routeShortName: JsonField, - private val serviceId: JsonField, - private val shapeId: JsonField, - private val timeZone: JsonField, - private val tripHeadsign: JsonField, - private val tripShortName: JsonField, - private val additionalProperties: Map, + @JsonProperty("blockId") + @ExcludeMissing + private val blockId: JsonField = JsonMissing.of(), + @JsonProperty("directionId") + @ExcludeMissing + private val directionId: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("peakOffpeak") + @ExcludeMissing + private val peakOffpeak: JsonField = JsonMissing.of(), + @JsonProperty("routeId") + @ExcludeMissing + private val routeId: JsonField = JsonMissing.of(), + @JsonProperty("routeShortName") + @ExcludeMissing + private val routeShortName: JsonField = JsonMissing.of(), + @JsonProperty("serviceId") + @ExcludeMissing + private val serviceId: JsonField = JsonMissing.of(), + @JsonProperty("shapeId") + @ExcludeMissing + private val shapeId: JsonField = JsonMissing.of(), + @JsonProperty("timeZone") + @ExcludeMissing + private val timeZone: JsonField = JsonMissing.of(), + @JsonProperty("tripHeadsign") + @ExcludeMissing + private val tripHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("tripShortName") + @ExcludeMissing + private val tripShortName: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun blockId(): String? = blockId.getNullable("blockId") @@ -1298,72 +1317,52 @@ private constructor( fun blockId(blockId: String) = blockId(JsonField.of(blockId)) - @JsonProperty("blockId") - @ExcludeMissing fun blockId(blockId: JsonField) = apply { this.blockId = blockId } fun directionId(directionId: String) = directionId(JsonField.of(directionId)) - @JsonProperty("directionId") - @ExcludeMissing fun directionId(directionId: JsonField) = apply { this.directionId = directionId } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun peakOffpeak(peakOffpeak: Long) = peakOffpeak(JsonField.of(peakOffpeak)) - @JsonProperty("peakOffpeak") - @ExcludeMissing fun peakOffpeak(peakOffpeak: JsonField) = apply { this.peakOffpeak = peakOffpeak } fun routeId(routeId: String) = routeId(JsonField.of(routeId)) - @JsonProperty("routeId") - @ExcludeMissing fun routeId(routeId: JsonField) = apply { this.routeId = routeId } fun routeShortName(routeShortName: String) = routeShortName(JsonField.of(routeShortName)) - @JsonProperty("routeShortName") - @ExcludeMissing fun routeShortName(routeShortName: JsonField) = apply { this.routeShortName = routeShortName } fun serviceId(serviceId: String) = serviceId(JsonField.of(serviceId)) - @JsonProperty("serviceId") - @ExcludeMissing fun serviceId(serviceId: JsonField) = apply { this.serviceId = serviceId } fun shapeId(shapeId: String) = shapeId(JsonField.of(shapeId)) - @JsonProperty("shapeId") - @ExcludeMissing fun shapeId(shapeId: JsonField) = apply { this.shapeId = shapeId } fun timeZone(timeZone: String) = timeZone(JsonField.of(timeZone)) - @JsonProperty("timeZone") - @ExcludeMissing fun timeZone(timeZone: JsonField) = apply { this.timeZone = timeZone } fun tripHeadsign(tripHeadsign: String) = tripHeadsign(JsonField.of(tripHeadsign)) - @JsonProperty("tripHeadsign") - @ExcludeMissing fun tripHeadsign(tripHeadsign: JsonField) = apply { this.tripHeadsign = tripHeadsign } @@ -1371,8 +1370,6 @@ private constructor( fun tripShortName(tripShortName: String) = tripShortName(JsonField.of(tripShortName)) - @JsonProperty("tripShortName") - @ExcludeMissing fun tripShortName(tripShortName: JsonField) = apply { this.tripShortName = tripShortName } @@ -1382,7 +1379,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ScheduleForStopRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ScheduleForStopRetrieveResponse.kt index 9c08f3c..29c9377 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ScheduleForStopRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ScheduleForStopRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = ScheduleForStopRetrieveResponse.Builder::class) @NoAutoDetect class ScheduleForStopRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -100,32 +105,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -133,7 +128,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -159,13 +153,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -211,14 +210,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -228,7 +223,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -251,14 +245,21 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val date: JsonField, - private val stopId: JsonField, - private val stopRouteSchedules: JsonField>, - private val additionalProperties: Map, + @JsonProperty("date") + @ExcludeMissing + private val date: JsonField = JsonMissing.of(), + @JsonProperty("stopId") + @ExcludeMissing + private val stopId: JsonField = JsonMissing.of(), + @JsonProperty("stopRouteSchedules") + @ExcludeMissing + private val stopRouteSchedules: JsonField> = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun date(): Long = date.getRequired("date") @@ -315,21 +316,15 @@ private constructor( fun date(date: Long) = date(JsonField.of(date)) - @JsonProperty("date") - @ExcludeMissing fun date(date: JsonField) = apply { this.date = date } fun stopId(stopId: String) = stopId(JsonField.of(stopId)) - @JsonProperty("stopId") - @ExcludeMissing fun stopId(stopId: JsonField) = apply { this.stopId = stopId } fun stopRouteSchedules(stopRouteSchedules: List) = stopRouteSchedules(JsonField.of(stopRouteSchedules)) - @JsonProperty("stopRouteSchedules") - @ExcludeMissing fun stopRouteSchedules(stopRouteSchedules: JsonField>) = apply { this.stopRouteSchedules = stopRouteSchedules @@ -340,7 +335,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -367,14 +361,20 @@ private constructor( ) } - @JsonDeserialize(builder = StopRouteSchedule.Builder::class) @NoAutoDetect class StopRouteSchedule + @JsonCreator private constructor( - private val routeId: JsonField, + @JsonProperty("routeId") + @ExcludeMissing + private val routeId: JsonField = JsonMissing.of(), + @JsonProperty("stopRouteDirectionSchedules") + @ExcludeMissing private val stopRouteDirectionSchedules: - JsonField>, - private val additionalProperties: Map, + JsonField> = + JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun routeId(): String = routeId.getRequired("routeId") @@ -425,16 +425,12 @@ private constructor( fun routeId(routeId: String) = routeId(JsonField.of(routeId)) - @JsonProperty("routeId") - @ExcludeMissing fun routeId(routeId: JsonField) = apply { this.routeId = routeId } fun stopRouteDirectionSchedules( stopRouteDirectionSchedules: List ) = stopRouteDirectionSchedules(JsonField.of(stopRouteDirectionSchedules)) - @JsonProperty("stopRouteDirectionSchedules") - @ExcludeMissing fun stopRouteDirectionSchedules( stopRouteDirectionSchedules: JsonField> ) = apply { this.stopRouteDirectionSchedules = stopRouteDirectionSchedules } @@ -444,7 +440,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -470,14 +465,23 @@ private constructor( ) } - @JsonDeserialize(builder = StopRouteDirectionSchedule.Builder::class) @NoAutoDetect class StopRouteDirectionSchedule + @JsonCreator private constructor( - private val scheduleFrequencies: JsonField>, - private val scheduleStopTimes: JsonField>, - private val tripHeadsign: JsonField, - private val additionalProperties: Map, + @JsonProperty("scheduleFrequencies") + @ExcludeMissing + private val scheduleFrequencies: JsonField> = + JsonMissing.of(), + @JsonProperty("scheduleStopTimes") + @ExcludeMissing + private val scheduleStopTimes: JsonField> = + JsonMissing.of(), + @JsonProperty("tripHeadsign") + @ExcludeMissing + private val tripHeadsign: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun scheduleFrequencies(): List? = @@ -542,8 +546,6 @@ private constructor( fun scheduleFrequencies(scheduleFrequencies: List) = scheduleFrequencies(JsonField.of(scheduleFrequencies)) - @JsonProperty("scheduleFrequencies") - @ExcludeMissing fun scheduleFrequencies( scheduleFrequencies: JsonField> ) = apply { this.scheduleFrequencies = scheduleFrequencies } @@ -551,8 +553,6 @@ private constructor( fun scheduleStopTimes(scheduleStopTimes: List) = scheduleStopTimes(JsonField.of(scheduleStopTimes)) - @JsonProperty("scheduleStopTimes") - @ExcludeMissing fun scheduleStopTimes( scheduleStopTimes: JsonField> ) = apply { this.scheduleStopTimes = scheduleStopTimes } @@ -560,8 +560,6 @@ private constructor( fun tripHeadsign(tripHeadsign: String) = tripHeadsign(JsonField.of(tripHeadsign)) - @JsonProperty("tripHeadsign") - @ExcludeMissing fun tripHeadsign(tripHeadsign: JsonField) = apply { this.tripHeadsign = tripHeadsign } @@ -572,7 +570,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -598,18 +595,34 @@ private constructor( ) } - @JsonDeserialize(builder = ScheduleStopTime.Builder::class) @NoAutoDetect class ScheduleStopTime + @JsonCreator private constructor( - private val arrivalEnabled: JsonField, - private val arrivalTime: JsonField, - private val departureEnabled: JsonField, - private val departureTime: JsonField, - private val serviceId: JsonField, - private val stopHeadsign: JsonField, - private val tripId: JsonField, - private val additionalProperties: Map, + @JsonProperty("arrivalEnabled") + @ExcludeMissing + private val arrivalEnabled: JsonField = JsonMissing.of(), + @JsonProperty("arrivalTime") + @ExcludeMissing + private val arrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("departureEnabled") + @ExcludeMissing + private val departureEnabled: JsonField = JsonMissing.of(), + @JsonProperty("departureTime") + @ExcludeMissing + private val departureTime: JsonField = JsonMissing.of(), + @JsonProperty("serviceId") + @ExcludeMissing + private val serviceId: JsonField = JsonMissing.of(), + @JsonProperty("stopHeadsign") + @ExcludeMissing + private val stopHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = + immutableEmptyMap(), ) { fun arrivalEnabled(): Boolean = arrivalEnabled.getRequired("arrivalEnabled") @@ -704,8 +717,6 @@ private constructor( fun arrivalEnabled(arrivalEnabled: Boolean) = arrivalEnabled(JsonField.of(arrivalEnabled)) - @JsonProperty("arrivalEnabled") - @ExcludeMissing fun arrivalEnabled(arrivalEnabled: JsonField) = apply { this.arrivalEnabled = arrivalEnabled } @@ -713,8 +724,6 @@ private constructor( fun arrivalTime(arrivalTime: Long) = arrivalTime(JsonField.of(arrivalTime)) - @JsonProperty("arrivalTime") - @ExcludeMissing fun arrivalTime(arrivalTime: JsonField) = apply { this.arrivalTime = arrivalTime } @@ -722,8 +731,6 @@ private constructor( fun departureEnabled(departureEnabled: Boolean) = departureEnabled(JsonField.of(departureEnabled)) - @JsonProperty("departureEnabled") - @ExcludeMissing fun departureEnabled(departureEnabled: JsonField) = apply { this.departureEnabled = departureEnabled } @@ -731,16 +738,12 @@ private constructor( fun departureTime(departureTime: Long) = departureTime(JsonField.of(departureTime)) - @JsonProperty("departureTime") - @ExcludeMissing fun departureTime(departureTime: JsonField) = apply { this.departureTime = departureTime } fun serviceId(serviceId: String) = serviceId(JsonField.of(serviceId)) - @JsonProperty("serviceId") - @ExcludeMissing fun serviceId(serviceId: JsonField) = apply { this.serviceId = serviceId } @@ -748,16 +751,12 @@ private constructor( fun stopHeadsign(stopHeadsign: String) = stopHeadsign(JsonField.of(stopHeadsign)) - @JsonProperty("stopHeadsign") - @ExcludeMissing fun stopHeadsign(stopHeadsign: JsonField) = apply { this.stopHeadsign = stopHeadsign } fun tripId(tripId: String) = tripId(JsonField.of(tripId)) - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } fun additionalProperties(additionalProperties: Map) = @@ -766,7 +765,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -814,17 +812,31 @@ private constructor( "ScheduleStopTime{arrivalEnabled=$arrivalEnabled, arrivalTime=$arrivalTime, departureEnabled=$departureEnabled, departureTime=$departureTime, serviceId=$serviceId, stopHeadsign=$stopHeadsign, tripId=$tripId, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = ScheduleFrequency.Builder::class) @NoAutoDetect class ScheduleFrequency + @JsonCreator private constructor( - private val serviceDate: JsonField, - private val startTime: JsonField, - private val endTime: JsonField, - private val headway: JsonField, - private val serviceId: JsonField, - private val tripId: JsonField, - private val additionalProperties: Map, + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("startTime") + @ExcludeMissing + private val startTime: JsonField = JsonMissing.of(), + @JsonProperty("endTime") + @ExcludeMissing + private val endTime: JsonField = JsonMissing.of(), + @JsonProperty("headway") + @ExcludeMissing + private val headway: JsonField = JsonMissing.of(), + @JsonProperty("serviceId") + @ExcludeMissing + private val serviceId: JsonField = JsonMissing.of(), + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = + immutableEmptyMap(), ) { fun serviceDate(): Long = serviceDate.getRequired("serviceDate") @@ -903,44 +915,32 @@ private constructor( fun serviceDate(serviceDate: Long) = serviceDate(JsonField.of(serviceDate)) - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } fun startTime(startTime: Long) = startTime(JsonField.of(startTime)) - @JsonProperty("startTime") - @ExcludeMissing fun startTime(startTime: JsonField) = apply { this.startTime = startTime } fun endTime(endTime: Long) = endTime(JsonField.of(endTime)) - @JsonProperty("endTime") - @ExcludeMissing fun endTime(endTime: JsonField) = apply { this.endTime = endTime } fun headway(headway: Long) = headway(JsonField.of(headway)) - @JsonProperty("headway") - @ExcludeMissing fun headway(headway: JsonField) = apply { this.headway = headway } fun serviceId(serviceId: String) = serviceId(JsonField.of(serviceId)) - @JsonProperty("serviceId") - @ExcludeMissing fun serviceId(serviceId: JsonField) = apply { this.serviceId = serviceId } fun tripId(tripId: String) = tripId(JsonField.of(tripId)) - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } fun additionalProperties(additionalProperties: Map) = @@ -949,7 +949,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/SearchForRouteListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/SearchForRouteListResponse.kt index 2bb3b2d..d713ac7 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/SearchForRouteListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/SearchForRouteListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = SearchForRouteListResponse.Builder::class) @NoAutoDetect class SearchForRouteListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,15 +151,24 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val limitExceeded: JsonField, - private val list: JsonField>, - private val outOfRange: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("outOfRange") + @ExcludeMissing + private val outOfRange: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun limitExceeded(): Boolean = limitExceeded.getRequired("limitExceeded") @@ -225,28 +228,20 @@ private constructor( fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun list(list: kotlin.collections.List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } fun outOfRange(outOfRange: Boolean) = outOfRange(JsonField.of(outOfRange)) - @JsonProperty("outOfRange") - @ExcludeMissing fun outOfRange(outOfRange: JsonField) = apply { this.outOfRange = outOfRange } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -256,7 +251,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -281,21 +275,42 @@ private constructor( ) } - @JsonDeserialize(builder = List.Builder::class) @NoAutoDetect class List + @JsonCreator private constructor( - private val agencyId: JsonField, - private val color: JsonField, - private val description: JsonField, - private val id: JsonField, - private val longName: JsonField, - private val nullSafeShortName: JsonField, - private val shortName: JsonField, - private val textColor: JsonField, - private val type: JsonField, - private val url: JsonField, - private val additionalProperties: Map, + @JsonProperty("agencyId") + @ExcludeMissing + private val agencyId: JsonField = JsonMissing.of(), + @JsonProperty("color") + @ExcludeMissing + private val color: JsonField = JsonMissing.of(), + @JsonProperty("description") + @ExcludeMissing + private val description: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("longName") + @ExcludeMissing + private val longName: JsonField = JsonMissing.of(), + @JsonProperty("nullSafeShortName") + @ExcludeMissing + private val nullSafeShortName: JsonField = JsonMissing.of(), + @JsonProperty("shortName") + @ExcludeMissing + private val shortName: JsonField = JsonMissing.of(), + @JsonProperty("textColor") + @ExcludeMissing + private val textColor: JsonField = JsonMissing.of(), + @JsonProperty("type") + @ExcludeMissing + private val type: JsonField = JsonMissing.of(), + @JsonProperty("url") + @ExcludeMissing + private val url: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun agencyId(): String = agencyId.getRequired("agencyId") @@ -399,67 +414,47 @@ private constructor( fun agencyId(agencyId: String) = agencyId(JsonField.of(agencyId)) - @JsonProperty("agencyId") - @ExcludeMissing fun agencyId(agencyId: JsonField) = apply { this.agencyId = agencyId } fun color(color: String) = color(JsonField.of(color)) - @JsonProperty("color") - @ExcludeMissing fun color(color: JsonField) = apply { this.color = color } fun description(description: String) = description(JsonField.of(description)) - @JsonProperty("description") - @ExcludeMissing fun description(description: JsonField) = apply { this.description = description } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun longName(longName: String) = longName(JsonField.of(longName)) - @JsonProperty("longName") - @ExcludeMissing fun longName(longName: JsonField) = apply { this.longName = longName } fun nullSafeShortName(nullSafeShortName: String) = nullSafeShortName(JsonField.of(nullSafeShortName)) - @JsonProperty("nullSafeShortName") - @ExcludeMissing fun nullSafeShortName(nullSafeShortName: JsonField) = apply { this.nullSafeShortName = nullSafeShortName } fun shortName(shortName: String) = shortName(JsonField.of(shortName)) - @JsonProperty("shortName") - @ExcludeMissing fun shortName(shortName: JsonField) = apply { this.shortName = shortName } fun textColor(textColor: String) = textColor(JsonField.of(textColor)) - @JsonProperty("textColor") - @ExcludeMissing fun textColor(textColor: JsonField) = apply { this.textColor = textColor } fun type(type: Long) = type(JsonField.of(type)) - @JsonProperty("type") - @ExcludeMissing fun type(type: JsonField) = apply { this.type = type } fun url(url: String) = url(JsonField.of(url)) - @JsonProperty("url") - @ExcludeMissing fun url(url: JsonField) = apply { this.url = url } fun additionalProperties(additionalProperties: Map) = apply { @@ -467,7 +462,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/SearchForStopListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/SearchForStopListResponse.kt index 21eeb92..e0263bd 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/SearchForStopListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/SearchForStopListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = SearchForStopListResponse.Builder::class) @NoAutoDetect class SearchForStopListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,15 +151,24 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val limitExceeded: JsonField, - private val list: JsonField>, - private val outOfRange: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("outOfRange") + @ExcludeMissing + private val outOfRange: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun limitExceeded(): Boolean = limitExceeded.getRequired("limitExceeded") @@ -225,28 +228,20 @@ private constructor( fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun list(list: kotlin.collections.List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } fun outOfRange(outOfRange: Boolean) = outOfRange(JsonField.of(outOfRange)) - @JsonProperty("outOfRange") - @ExcludeMissing fun outOfRange(outOfRange: JsonField) = apply { this.outOfRange = outOfRange } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -256,7 +251,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -281,22 +275,45 @@ private constructor( ) } - @JsonDeserialize(builder = List.Builder::class) @NoAutoDetect class List + @JsonCreator private constructor( - private val code: JsonField, - private val direction: JsonField, - private val id: JsonField, - private val lat: JsonField, - private val locationType: JsonField, - private val lon: JsonField, - private val name: JsonField, - private val parent: JsonField, - private val routeIds: JsonField>, - private val staticRouteIds: JsonField>, - private val wheelchairBoarding: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") + @ExcludeMissing + private val code: JsonField = JsonMissing.of(), + @JsonProperty("direction") + @ExcludeMissing + private val direction: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("locationType") + @ExcludeMissing + private val locationType: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonProperty("name") + @ExcludeMissing + private val name: JsonField = JsonMissing.of(), + @JsonProperty("parent") + @ExcludeMissing + private val parent: JsonField = JsonMissing.of(), + @JsonProperty("routeIds") + @ExcludeMissing + private val routeIds: JsonField> = JsonMissing.of(), + @JsonProperty("staticRouteIds") + @ExcludeMissing + private val staticRouteIds: JsonField> = JsonMissing.of(), + @JsonProperty("wheelchairBoarding") + @ExcludeMissing + private val wheelchairBoarding: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): String? = code.getNullable("code") @@ -409,59 +426,41 @@ private constructor( fun code(code: String) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun direction(direction: String) = direction(JsonField.of(direction)) - @JsonProperty("direction") - @ExcludeMissing fun direction(direction: JsonField) = apply { this.direction = direction } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun lat(lat: Double) = lat(JsonField.of(lat)) - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } fun locationType(locationType: Long) = locationType(JsonField.of(locationType)) - @JsonProperty("locationType") - @ExcludeMissing fun locationType(locationType: JsonField) = apply { this.locationType = locationType } fun lon(lon: Double) = lon(JsonField.of(lon)) - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun name(name: String) = name(JsonField.of(name)) - @JsonProperty("name") - @ExcludeMissing fun name(name: JsonField) = apply { this.name = name } fun parent(parent: String) = parent(JsonField.of(parent)) - @JsonProperty("parent") - @ExcludeMissing fun parent(parent: JsonField) = apply { this.parent = parent } fun routeIds(routeIds: kotlin.collections.List) = routeIds(JsonField.of(routeIds)) - @JsonProperty("routeIds") - @ExcludeMissing fun routeIds(routeIds: JsonField>) = apply { this.routeIds = routeIds } @@ -469,8 +468,6 @@ private constructor( fun staticRouteIds(staticRouteIds: kotlin.collections.List) = staticRouteIds(JsonField.of(staticRouteIds)) - @JsonProperty("staticRouteIds") - @ExcludeMissing fun staticRouteIds(staticRouteIds: JsonField>) = apply { this.staticRouteIds = staticRouteIds @@ -479,8 +476,6 @@ private constructor( fun wheelchairBoarding(wheelchairBoarding: String) = wheelchairBoarding(JsonField.of(wheelchairBoarding)) - @JsonProperty("wheelchairBoarding") - @ExcludeMissing fun wheelchairBoarding(wheelchairBoarding: JsonField) = apply { this.wheelchairBoarding = wheelchairBoarding } @@ -490,7 +485,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ShapeRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ShapeRetrieveResponse.kt index c61a58f..d8ff912 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ShapeRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/ShapeRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = ShapeRetrieveResponse.Builder::class) @NoAutoDetect class ShapeRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,13 +151,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -209,14 +208,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -226,7 +221,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -249,14 +243,21 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val length: JsonField, - private val levels: JsonField, - private val points: JsonField, - private val additionalProperties: Map, + @JsonProperty("length") + @ExcludeMissing + private val length: JsonField = JsonMissing.of(), + @JsonProperty("levels") + @ExcludeMissing + private val levels: JsonField = JsonMissing.of(), + @JsonProperty("points") + @ExcludeMissing + private val points: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun length(): Long = length.getRequired("length") @@ -311,22 +312,16 @@ private constructor( fun length(length: Long) = length(JsonField.of(length)) - @JsonProperty("length") - @ExcludeMissing fun length(length: JsonField) = apply { this.length = length } fun levels(levels: String) = levels(JsonField.of(levels)) - @JsonProperty("levels") - @ExcludeMissing fun levels(levels: JsonField) = apply { this.levels = levels } /** Encoded polyline format representing the shape of the path */ fun points(points: String) = points(JsonField.of(points)) /** Encoded polyline format representing the shape of the path */ - @JsonProperty("points") - @ExcludeMissing fun points(points: JsonField) = apply { this.points = points } fun additionalProperties(additionalProperties: Map) = apply { @@ -334,7 +329,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopIdsForAgencyListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopIdsForAgencyListResponse.kt index 0054bba..63241b6 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopIdsForAgencyListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopIdsForAgencyListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = StopIdsForAgencyListResponse.Builder::class) @NoAutoDetect class StopIdsForAgencyListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,14 +151,21 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val limitExceeded: JsonField, - private val list: JsonField>, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun limitExceeded(): Boolean = limitExceeded.getRequired("limitExceeded") @@ -217,22 +218,16 @@ private constructor( fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun list(list: List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -242,7 +237,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopRetrieveResponse.kt index 725ab4a..49b385f 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = StopRetrieveResponse.Builder::class) @NoAutoDetect class StopRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,13 +151,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -209,14 +208,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -226,7 +221,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -249,22 +243,45 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val code: JsonField, - private val direction: JsonField, - private val id: JsonField, - private val lat: JsonField, - private val locationType: JsonField, - private val lon: JsonField, - private val name: JsonField, - private val parent: JsonField, - private val routeIds: JsonField>, - private val staticRouteIds: JsonField>, - private val wheelchairBoarding: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") + @ExcludeMissing + private val code: JsonField = JsonMissing.of(), + @JsonProperty("direction") + @ExcludeMissing + private val direction: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("locationType") + @ExcludeMissing + private val locationType: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonProperty("name") + @ExcludeMissing + private val name: JsonField = JsonMissing.of(), + @JsonProperty("parent") + @ExcludeMissing + private val parent: JsonField = JsonMissing.of(), + @JsonProperty("routeIds") + @ExcludeMissing + private val routeIds: JsonField> = JsonMissing.of(), + @JsonProperty("staticRouteIds") + @ExcludeMissing + private val staticRouteIds: JsonField> = JsonMissing.of(), + @JsonProperty("wheelchairBoarding") + @ExcludeMissing + private val wheelchairBoarding: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): String? = code.getNullable("code") @@ -375,65 +392,45 @@ private constructor( fun code(code: String) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun direction(direction: String) = direction(JsonField.of(direction)) - @JsonProperty("direction") - @ExcludeMissing fun direction(direction: JsonField) = apply { this.direction = direction } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun lat(lat: Double) = lat(JsonField.of(lat)) - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } fun locationType(locationType: Long) = locationType(JsonField.of(locationType)) - @JsonProperty("locationType") - @ExcludeMissing fun locationType(locationType: JsonField) = apply { this.locationType = locationType } fun lon(lon: Double) = lon(JsonField.of(lon)) - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun name(name: String) = name(JsonField.of(name)) - @JsonProperty("name") - @ExcludeMissing fun name(name: JsonField) = apply { this.name = name } fun parent(parent: String) = parent(JsonField.of(parent)) - @JsonProperty("parent") - @ExcludeMissing fun parent(parent: JsonField) = apply { this.parent = parent } fun routeIds(routeIds: List) = routeIds(JsonField.of(routeIds)) - @JsonProperty("routeIds") - @ExcludeMissing fun routeIds(routeIds: JsonField>) = apply { this.routeIds = routeIds } fun staticRouteIds(staticRouteIds: List) = staticRouteIds(JsonField.of(staticRouteIds)) - @JsonProperty("staticRouteIds") - @ExcludeMissing fun staticRouteIds(staticRouteIds: JsonField>) = apply { this.staticRouteIds = staticRouteIds } @@ -441,8 +438,6 @@ private constructor( fun wheelchairBoarding(wheelchairBoarding: String) = wheelchairBoarding(JsonField.of(wheelchairBoarding)) - @JsonProperty("wheelchairBoarding") - @ExcludeMissing fun wheelchairBoarding(wheelchairBoarding: JsonField) = apply { this.wheelchairBoarding = wheelchairBoarding } @@ -452,7 +447,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForAgencyListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForAgencyListResponse.kt index 8a2b43c..3c46544 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForAgencyListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForAgencyListResponse.kt @@ -4,29 +4,42 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = StopsForAgencyListResponse.Builder::class) @NoAutoDetect class StopsForAgencyListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val limitExceeded: JsonField, - private val outOfRange: JsonField, - private val list: JsonField>, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("outOfRange") + @ExcludeMissing + private val outOfRange: JsonField = JsonMissing.of(), + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -122,52 +135,36 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun outOfRange(outOfRange: Boolean) = outOfRange(JsonField.of(outOfRange)) - @JsonProperty("outOfRange") - @ExcludeMissing fun outOfRange(outOfRange: JsonField) = apply { this.outOfRange = outOfRange } fun list(list: kotlin.collections.List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } fun additionalProperties(additionalProperties: Map) = apply { @@ -175,7 +172,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -204,22 +200,39 @@ private constructor( ) } - @JsonDeserialize(builder = List.Builder::class) @NoAutoDetect class List + @JsonCreator private constructor( - private val code: JsonField, - private val direction: JsonField, - private val id: JsonField, - private val lat: JsonField, - private val locationType: JsonField, - private val lon: JsonField, - private val name: JsonField, - private val parent: JsonField, - private val routeIds: JsonField>, - private val staticRouteIds: JsonField>, - private val wheelchairBoarding: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") + @ExcludeMissing + private val code: JsonField = JsonMissing.of(), + @JsonProperty("direction") + @ExcludeMissing + private val direction: JsonField = JsonMissing.of(), + @JsonProperty("id") @ExcludeMissing private val id: JsonField = JsonMissing.of(), + @JsonProperty("lat") @ExcludeMissing private val lat: JsonField = JsonMissing.of(), + @JsonProperty("locationType") + @ExcludeMissing + private val locationType: JsonField = JsonMissing.of(), + @JsonProperty("lon") @ExcludeMissing private val lon: JsonField = JsonMissing.of(), + @JsonProperty("name") + @ExcludeMissing + private val name: JsonField = JsonMissing.of(), + @JsonProperty("parent") + @ExcludeMissing + private val parent: JsonField = JsonMissing.of(), + @JsonProperty("routeIds") + @ExcludeMissing + private val routeIds: JsonField> = JsonMissing.of(), + @JsonProperty("staticRouteIds") + @ExcludeMissing + private val staticRouteIds: JsonField> = JsonMissing.of(), + @JsonProperty("wheelchairBoarding") + @ExcludeMissing + private val wheelchairBoarding: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): String? = code.getNullable("code") @@ -332,59 +345,41 @@ private constructor( fun code(code: String) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun direction(direction: String) = direction(JsonField.of(direction)) - @JsonProperty("direction") - @ExcludeMissing fun direction(direction: JsonField) = apply { this.direction = direction } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun lat(lat: Double) = lat(JsonField.of(lat)) - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } fun locationType(locationType: Long) = locationType(JsonField.of(locationType)) - @JsonProperty("locationType") - @ExcludeMissing fun locationType(locationType: JsonField) = apply { this.locationType = locationType } fun lon(lon: Double) = lon(JsonField.of(lon)) - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun name(name: String) = name(JsonField.of(name)) - @JsonProperty("name") - @ExcludeMissing fun name(name: JsonField) = apply { this.name = name } fun parent(parent: String) = parent(JsonField.of(parent)) - @JsonProperty("parent") - @ExcludeMissing fun parent(parent: JsonField) = apply { this.parent = parent } fun routeIds(routeIds: kotlin.collections.List) = routeIds(JsonField.of(routeIds)) - @JsonProperty("routeIds") - @ExcludeMissing fun routeIds(routeIds: JsonField>) = apply { this.routeIds = routeIds } @@ -392,8 +387,6 @@ private constructor( fun staticRouteIds(staticRouteIds: kotlin.collections.List) = staticRouteIds(JsonField.of(staticRouteIds)) - @JsonProperty("staticRouteIds") - @ExcludeMissing fun staticRouteIds(staticRouteIds: JsonField>) = apply { this.staticRouteIds = staticRouteIds } @@ -401,8 +394,6 @@ private constructor( fun wheelchairBoarding(wheelchairBoarding: String) = wheelchairBoarding(JsonField.of(wheelchairBoarding)) - @JsonProperty("wheelchairBoarding") - @ExcludeMissing fun wheelchairBoarding(wheelchairBoarding: JsonField) = apply { this.wheelchairBoarding = wheelchairBoarding } @@ -412,7 +403,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForLocationListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForLocationListResponse.kt index e2e10f5..2618fb5 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForLocationListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForLocationListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = StopsForLocationListResponse.Builder::class) @NoAutoDetect class StopsForLocationListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,15 +151,24 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val limitExceeded: JsonField, - private val outOfRange: JsonField, - private val list: JsonField>, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("outOfRange") + @ExcludeMissing + private val outOfRange: JsonField = JsonMissing.of(), + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun limitExceeded(): Boolean = limitExceeded.getRequired("limitExceeded") @@ -225,28 +228,20 @@ private constructor( fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun outOfRange(outOfRange: Boolean) = outOfRange(JsonField.of(outOfRange)) - @JsonProperty("outOfRange") - @ExcludeMissing fun outOfRange(outOfRange: JsonField) = apply { this.outOfRange = outOfRange } fun list(list: kotlin.collections.List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -256,7 +251,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -281,22 +275,45 @@ private constructor( ) } - @JsonDeserialize(builder = List.Builder::class) @NoAutoDetect class List + @JsonCreator private constructor( - private val code: JsonField, - private val direction: JsonField, - private val id: JsonField, - private val lat: JsonField, - private val locationType: JsonField, - private val lon: JsonField, - private val name: JsonField, - private val parent: JsonField, - private val routeIds: JsonField>, - private val staticRouteIds: JsonField>, - private val wheelchairBoarding: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") + @ExcludeMissing + private val code: JsonField = JsonMissing.of(), + @JsonProperty("direction") + @ExcludeMissing + private val direction: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("locationType") + @ExcludeMissing + private val locationType: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonProperty("name") + @ExcludeMissing + private val name: JsonField = JsonMissing.of(), + @JsonProperty("parent") + @ExcludeMissing + private val parent: JsonField = JsonMissing.of(), + @JsonProperty("routeIds") + @ExcludeMissing + private val routeIds: JsonField> = JsonMissing.of(), + @JsonProperty("staticRouteIds") + @ExcludeMissing + private val staticRouteIds: JsonField> = JsonMissing.of(), + @JsonProperty("wheelchairBoarding") + @ExcludeMissing + private val wheelchairBoarding: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): String? = code.getNullable("code") @@ -409,59 +426,41 @@ private constructor( fun code(code: String) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun direction(direction: String) = direction(JsonField.of(direction)) - @JsonProperty("direction") - @ExcludeMissing fun direction(direction: JsonField) = apply { this.direction = direction } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun lat(lat: Double) = lat(JsonField.of(lat)) - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } fun locationType(locationType: Long) = locationType(JsonField.of(locationType)) - @JsonProperty("locationType") - @ExcludeMissing fun locationType(locationType: JsonField) = apply { this.locationType = locationType } fun lon(lon: Double) = lon(JsonField.of(lon)) - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun name(name: String) = name(JsonField.of(name)) - @JsonProperty("name") - @ExcludeMissing fun name(name: JsonField) = apply { this.name = name } fun parent(parent: String) = parent(JsonField.of(parent)) - @JsonProperty("parent") - @ExcludeMissing fun parent(parent: JsonField) = apply { this.parent = parent } fun routeIds(routeIds: kotlin.collections.List) = routeIds(JsonField.of(routeIds)) - @JsonProperty("routeIds") - @ExcludeMissing fun routeIds(routeIds: JsonField>) = apply { this.routeIds = routeIds } @@ -469,8 +468,6 @@ private constructor( fun staticRouteIds(staticRouteIds: kotlin.collections.List) = staticRouteIds(JsonField.of(staticRouteIds)) - @JsonProperty("staticRouteIds") - @ExcludeMissing fun staticRouteIds(staticRouteIds: JsonField>) = apply { this.staticRouteIds = staticRouteIds @@ -479,8 +476,6 @@ private constructor( fun wheelchairBoarding(wheelchairBoarding: String) = wheelchairBoarding(JsonField.of(wheelchairBoarding)) - @JsonProperty("wheelchairBoarding") - @ExcludeMissing fun wheelchairBoarding(wheelchairBoarding: JsonField) = apply { this.wheelchairBoarding = wheelchairBoarding } @@ -490,7 +485,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForRouteListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForRouteListResponse.kt index 718b62c..6eabac7 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForRouteListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/StopsForRouteListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = StopsForRouteListResponse.Builder::class) @NoAutoDetect class StopsForRouteListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,13 +151,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -209,14 +208,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -226,7 +221,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -249,15 +243,24 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val polylines: JsonField>, - private val routeId: JsonField, - private val stopGroupings: JsonField>, - private val stopIds: JsonField>, - private val additionalProperties: Map, + @JsonProperty("polylines") + @ExcludeMissing + private val polylines: JsonField> = JsonMissing.of(), + @JsonProperty("routeId") + @ExcludeMissing + private val routeId: JsonField = JsonMissing.of(), + @JsonProperty("stopGroupings") + @ExcludeMissing + private val stopGroupings: JsonField> = JsonMissing.of(), + @JsonProperty("stopIds") + @ExcludeMissing + private val stopIds: JsonField> = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun polylines(): List? = polylines.getNullable("polylines") @@ -317,31 +320,23 @@ private constructor( fun polylines(polylines: List) = polylines(JsonField.of(polylines)) - @JsonProperty("polylines") - @ExcludeMissing fun polylines(polylines: JsonField>) = apply { this.polylines = polylines } fun routeId(routeId: String) = routeId(JsonField.of(routeId)) - @JsonProperty("routeId") - @ExcludeMissing fun routeId(routeId: JsonField) = apply { this.routeId = routeId } fun stopGroupings(stopGroupings: List) = stopGroupings(JsonField.of(stopGroupings)) - @JsonProperty("stopGroupings") - @ExcludeMissing fun stopGroupings(stopGroupings: JsonField>) = apply { this.stopGroupings = stopGroupings } fun stopIds(stopIds: List) = stopIds(JsonField.of(stopIds)) - @JsonProperty("stopIds") - @ExcludeMissing fun stopIds(stopIds: JsonField>) = apply { this.stopIds = stopIds } fun additionalProperties(additionalProperties: Map) = apply { @@ -349,7 +344,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -377,14 +371,21 @@ private constructor( ) } - @JsonDeserialize(builder = Polyline.Builder::class) @NoAutoDetect class Polyline + @JsonCreator private constructor( - private val length: JsonField, - private val levels: JsonField, - private val points: JsonField, - private val additionalProperties: Map, + @JsonProperty("length") + @ExcludeMissing + private val length: JsonField = JsonMissing.of(), + @JsonProperty("levels") + @ExcludeMissing + private val levels: JsonField = JsonMissing.of(), + @JsonProperty("points") + @ExcludeMissing + private val points: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun length(): Long? = length.getNullable("length") @@ -437,20 +438,14 @@ private constructor( fun length(length: Long) = length(JsonField.of(length)) - @JsonProperty("length") - @ExcludeMissing fun length(length: JsonField) = apply { this.length = length } fun levels(levels: String) = levels(JsonField.of(levels)) - @JsonProperty("levels") - @ExcludeMissing fun levels(levels: JsonField) = apply { this.levels = levels } fun points(points: String) = points(JsonField.of(points)) - @JsonProperty("points") - @ExcludeMissing fun points(points: JsonField) = apply { this.points = points } fun additionalProperties(additionalProperties: Map) = apply { @@ -458,7 +453,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -503,15 +497,24 @@ private constructor( "Polyline{length=$length, levels=$levels, points=$points, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = StopGrouping.Builder::class) @NoAutoDetect class StopGrouping + @JsonCreator private constructor( - private val id: JsonField, - private val name: JsonField, - private val polylines: JsonField>, - private val stopIds: JsonField>, - private val additionalProperties: Map, + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("name") + @ExcludeMissing + private val name: JsonField = JsonMissing.of(), + @JsonProperty("polylines") + @ExcludeMissing + private val polylines: JsonField> = JsonMissing.of(), + @JsonProperty("stopIds") + @ExcludeMissing + private val stopIds: JsonField> = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun id(): String? = id.getNullable("id") @@ -571,28 +574,20 @@ private constructor( fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun name(name: Name) = name(JsonField.of(name)) - @JsonProperty("name") - @ExcludeMissing fun name(name: JsonField) = apply { this.name = name } fun polylines(polylines: List) = polylines(JsonField.of(polylines)) - @JsonProperty("polylines") - @ExcludeMissing fun polylines(polylines: JsonField>) = apply { this.polylines = polylines } fun stopIds(stopIds: List) = stopIds(JsonField.of(stopIds)) - @JsonProperty("stopIds") - @ExcludeMissing fun stopIds(stopIds: JsonField>) = apply { this.stopIds = stopIds } fun additionalProperties(additionalProperties: Map) = apply { @@ -600,7 +595,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -628,14 +622,21 @@ private constructor( ) } - @JsonDeserialize(builder = Name.Builder::class) @NoAutoDetect class Name + @JsonCreator private constructor( - private val name: JsonField, - private val names: JsonField>, - private val type: JsonField, - private val additionalProperties: Map, + @JsonProperty("name") + @ExcludeMissing + private val name: JsonField = JsonMissing.of(), + @JsonProperty("names") + @ExcludeMissing + private val names: JsonField> = JsonMissing.of(), + @JsonProperty("type") + @ExcludeMissing + private val type: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun name(): String? = name.getNullable("name") @@ -689,20 +690,14 @@ private constructor( fun name(name: String) = name(JsonField.of(name)) - @JsonProperty("name") - @ExcludeMissing fun name(name: JsonField) = apply { this.name = name } fun names(names: List) = names(JsonField.of(names)) - @JsonProperty("names") - @ExcludeMissing fun names(names: JsonField>) = apply { this.names = names } fun type(type: String) = type(JsonField.of(type)) - @JsonProperty("type") - @ExcludeMissing fun type(type: JsonField) = apply { this.type = type } fun additionalProperties(additionalProperties: Map) = @@ -711,7 +706,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -755,14 +749,21 @@ private constructor( "Name{name=$name, names=$names, type=$type, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Polyline.Builder::class) @NoAutoDetect class Polyline + @JsonCreator private constructor( - private val length: JsonField, - private val levels: JsonField, - private val points: JsonField, - private val additionalProperties: Map, + @JsonProperty("length") + @ExcludeMissing + private val length: JsonField = JsonMissing.of(), + @JsonProperty("levels") + @ExcludeMissing + private val levels: JsonField = JsonMissing.of(), + @JsonProperty("points") + @ExcludeMissing + private val points: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun length(): Long? = length.getNullable("length") @@ -816,20 +817,14 @@ private constructor( fun length(length: Long) = length(JsonField.of(length)) - @JsonProperty("length") - @ExcludeMissing fun length(length: JsonField) = apply { this.length = length } fun levels(levels: String) = levels(JsonField.of(levels)) - @JsonProperty("levels") - @ExcludeMissing fun levels(levels: JsonField) = apply { this.levels = levels } fun points(points: String) = points(JsonField.of(points)) - @JsonProperty("points") - @ExcludeMissing fun points(points: JsonField) = apply { this.points = points } fun additionalProperties(additionalProperties: Map) = @@ -838,7 +833,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripDetailRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripDetailRetrieveResponse.kt index e362e9b..3da8252 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripDetailRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripDetailRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = TripDetailRetrieveResponse.Builder::class) @NoAutoDetect class TripDetailRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,13 +151,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -209,14 +208,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -226,7 +221,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -249,17 +243,30 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val frequency: JsonField, - private val schedule: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val status: JsonField, - private val tripId: JsonField, - private val additionalProperties: Map, + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("schedule") + @ExcludeMissing + private val schedule: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun frequency(): String? = frequency.getNullable("frequency") @@ -333,20 +340,14 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } fun schedule(schedule: Schedule) = schedule(JsonField.of(schedule)) - @JsonProperty("schedule") - @ExcludeMissing fun schedule(schedule: JsonField) = apply { this.schedule = schedule } fun serviceDate(serviceDate: Long) = serviceDate(JsonField.of(serviceDate)) - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -354,22 +355,16 @@ private constructor( fun situationIds(situationIds: List) = situationIds(JsonField.of(situationIds)) - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds } fun status(status: Status) = status(JsonField.of(status)) - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } fun tripId(tripId: String) = tripId(JsonField.of(tripId)) - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } fun additionalProperties(additionalProperties: Map) = apply { @@ -377,7 +372,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -407,16 +401,27 @@ private constructor( ) } - @JsonDeserialize(builder = Schedule.Builder::class) @NoAutoDetect class Schedule + @JsonCreator private constructor( - private val frequency: JsonField, - private val nextTripId: JsonField, - private val previousTripId: JsonField, - private val stopTimes: JsonField>, - private val timeZone: JsonField, - private val additionalProperties: Map, + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("nextTripId") + @ExcludeMissing + private val nextTripId: JsonField = JsonMissing.of(), + @JsonProperty("previousTripId") + @ExcludeMissing + private val previousTripId: JsonField = JsonMissing.of(), + @JsonProperty("stopTimes") + @ExcludeMissing + private val stopTimes: JsonField> = JsonMissing.of(), + @JsonProperty("timeZone") + @ExcludeMissing + private val timeZone: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun frequency(): String? = frequency.getNullable("frequency") @@ -485,16 +490,12 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } fun nextTripId(nextTripId: String) = nextTripId(JsonField.of(nextTripId)) - @JsonProperty("nextTripId") - @ExcludeMissing fun nextTripId(nextTripId: JsonField) = apply { this.nextTripId = nextTripId } @@ -502,24 +503,18 @@ private constructor( fun previousTripId(previousTripId: String) = previousTripId(JsonField.of(previousTripId)) - @JsonProperty("previousTripId") - @ExcludeMissing fun previousTripId(previousTripId: JsonField) = apply { this.previousTripId = previousTripId } fun stopTimes(stopTimes: List) = stopTimes(JsonField.of(stopTimes)) - @JsonProperty("stopTimes") - @ExcludeMissing fun stopTimes(stopTimes: JsonField>) = apply { this.stopTimes = stopTimes } fun timeZone(timeZone: String) = timeZone(JsonField.of(timeZone)) - @JsonProperty("timeZone") - @ExcludeMissing fun timeZone(timeZone: JsonField) = apply { this.timeZone = timeZone } fun additionalProperties(additionalProperties: Map) = apply { @@ -527,7 +522,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -556,17 +550,30 @@ private constructor( ) } - @JsonDeserialize(builder = StopTime.Builder::class) @NoAutoDetect class StopTime + @JsonCreator private constructor( - private val arrivalTime: JsonField, - private val departureTime: JsonField, - private val distanceAlongTrip: JsonField, - private val historicalOccupancy: JsonField, - private val stopHeadsign: JsonField, - private val stopId: JsonField, - private val additionalProperties: Map, + @JsonProperty("arrivalTime") + @ExcludeMissing + private val arrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("departureTime") + @ExcludeMissing + private val departureTime: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("historicalOccupancy") + @ExcludeMissing + private val historicalOccupancy: JsonField = JsonMissing.of(), + @JsonProperty("stopHeadsign") + @ExcludeMissing + private val stopHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("stopId") + @ExcludeMissing + private val stopId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun arrivalTime(): Long? = arrivalTime.getNullable("arrivalTime") @@ -649,8 +656,6 @@ private constructor( fun arrivalTime(arrivalTime: Long) = arrivalTime(JsonField.of(arrivalTime)) - @JsonProperty("arrivalTime") - @ExcludeMissing fun arrivalTime(arrivalTime: JsonField) = apply { this.arrivalTime = arrivalTime } @@ -658,8 +663,6 @@ private constructor( fun departureTime(departureTime: Long) = departureTime(JsonField.of(departureTime)) - @JsonProperty("departureTime") - @ExcludeMissing fun departureTime(departureTime: JsonField) = apply { this.departureTime = departureTime } @@ -667,8 +670,6 @@ private constructor( fun distanceAlongTrip(distanceAlongTrip: Double) = distanceAlongTrip(JsonField.of(distanceAlongTrip)) - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -676,8 +677,6 @@ private constructor( fun historicalOccupancy(historicalOccupancy: String) = historicalOccupancy(JsonField.of(historicalOccupancy)) - @JsonProperty("historicalOccupancy") - @ExcludeMissing fun historicalOccupancy(historicalOccupancy: JsonField) = apply { this.historicalOccupancy = historicalOccupancy } @@ -685,16 +684,12 @@ private constructor( fun stopHeadsign(stopHeadsign: String) = stopHeadsign(JsonField.of(stopHeadsign)) - @JsonProperty("stopHeadsign") - @ExcludeMissing fun stopHeadsign(stopHeadsign: JsonField) = apply { this.stopHeadsign = stopHeadsign } fun stopId(stopId: String) = stopId(JsonField.of(stopId)) - @JsonProperty("stopId") - @ExcludeMissing fun stopId(stopId: JsonField) = apply { this.stopId = stopId } fun additionalProperties(additionalProperties: Map) = @@ -703,7 +698,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -768,38 +762,93 @@ private constructor( "Schedule{frequency=$frequency, nextTripId=$nextTripId, previousTripId=$previousTripId, stopTimes=$stopTimes, timeZone=$timeZone, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Status.Builder::class) @NoAutoDetect class Status + @JsonCreator private constructor( - private val activeTripId: JsonField, - private val blockTripSequence: JsonField, - private val closestStop: JsonField, - private val closestStopTimeOffset: JsonField, - private val distanceAlongTrip: JsonField, - private val frequency: JsonField, - private val lastKnownDistanceAlongTrip: JsonField, - private val lastKnownLocation: JsonField, - private val lastKnownOrientation: JsonField, - private val lastLocationUpdateTime: JsonField, - private val lastUpdateTime: JsonField, - private val nextStop: JsonField, - private val nextStopTimeOffset: JsonField, - private val occupancyCapacity: JsonField, - private val occupancyCount: JsonField, - private val occupancyStatus: JsonField, - private val orientation: JsonField, - private val phase: JsonField, - private val position: JsonField, - private val predicted: JsonField, - private val scheduleDeviation: JsonField, - private val scheduledDistanceAlongTrip: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val status: JsonField, - private val totalDistanceAlongTrip: JsonField, - private val vehicleId: JsonField, - private val additionalProperties: Map, + @JsonProperty("activeTripId") + @ExcludeMissing + private val activeTripId: JsonField = JsonMissing.of(), + @JsonProperty("blockTripSequence") + @ExcludeMissing + private val blockTripSequence: JsonField = JsonMissing.of(), + @JsonProperty("closestStop") + @ExcludeMissing + private val closestStop: JsonField = JsonMissing.of(), + @JsonProperty("closestStopTimeOffset") + @ExcludeMissing + private val closestStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownDistanceAlongTrip") + @ExcludeMissing + private val lastKnownDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownLocation") + @ExcludeMissing + private val lastKnownLocation: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownOrientation") + @ExcludeMissing + private val lastKnownOrientation: JsonField = JsonMissing.of(), + @JsonProperty("lastLocationUpdateTime") + @ExcludeMissing + private val lastLocationUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("lastUpdateTime") + @ExcludeMissing + private val lastUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("nextStop") + @ExcludeMissing + private val nextStop: JsonField = JsonMissing.of(), + @JsonProperty("nextStopTimeOffset") + @ExcludeMissing + private val nextStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCapacity") + @ExcludeMissing + private val occupancyCapacity: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCount") + @ExcludeMissing + private val occupancyCount: JsonField = JsonMissing.of(), + @JsonProperty("occupancyStatus") + @ExcludeMissing + private val occupancyStatus: JsonField = JsonMissing.of(), + @JsonProperty("orientation") + @ExcludeMissing + private val orientation: JsonField = JsonMissing.of(), + @JsonProperty("phase") + @ExcludeMissing + private val phase: JsonField = JsonMissing.of(), + @JsonProperty("position") + @ExcludeMissing + private val position: JsonField = JsonMissing.of(), + @JsonProperty("predicted") + @ExcludeMissing + private val predicted: JsonField = JsonMissing.of(), + @JsonProperty("scheduleDeviation") + @ExcludeMissing + private val scheduleDeviation: JsonField = JsonMissing.of(), + @JsonProperty("scheduledDistanceAlongTrip") + @ExcludeMissing + private val scheduledDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonProperty("totalDistanceAlongTrip") + @ExcludeMissing + private val totalDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("vehicleId") + @ExcludeMissing + private val vehicleId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Trip ID of the trip the vehicle is actively serving. */ @@ -1157,8 +1206,6 @@ private constructor( activeTripId(JsonField.of(activeTripId)) /** Trip ID of the trip the vehicle is actively serving. */ - @JsonProperty("activeTripId") - @ExcludeMissing fun activeTripId(activeTripId: JsonField) = apply { this.activeTripId = activeTripId } @@ -1168,8 +1215,6 @@ private constructor( blockTripSequence(JsonField.of(blockTripSequence)) /** Index of the active trip into the sequence of trips for the active block. */ - @JsonProperty("blockTripSequence") - @ExcludeMissing fun blockTripSequence(blockTripSequence: JsonField) = apply { this.blockTripSequence = blockTripSequence } @@ -1178,8 +1223,6 @@ private constructor( fun closestStop(closestStop: String) = closestStop(JsonField.of(closestStop)) /** ID of the closest stop to the current location of the transit vehicle. */ - @JsonProperty("closestStop") - @ExcludeMissing fun closestStop(closestStop: JsonField) = apply { this.closestStop = closestStop } @@ -1195,8 +1238,6 @@ private constructor( * Time offset from the closest stop to the current position of the transit * vehicle (in seconds). */ - @JsonProperty("closestStopTimeOffset") - @ExcludeMissing fun closestStopTimeOffset(closestStopTimeOffset: JsonField) = apply { this.closestStopTimeOffset = closestStopTimeOffset } @@ -1212,8 +1253,6 @@ private constructor( * Distance, in meters, the transit vehicle has progressed along the active * trip. */ - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -1222,8 +1261,6 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) /** Information about frequency-based scheduling, if applicable to the trip. */ - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } @@ -1239,8 +1276,6 @@ private constructor( * Last known distance along the trip received in real-time from the transit * vehicle. */ - @JsonProperty("lastKnownDistanceAlongTrip") - @ExcludeMissing fun lastKnownDistanceAlongTrip(lastKnownDistanceAlongTrip: JsonField) = apply { this.lastKnownDistanceAlongTrip = lastKnownDistanceAlongTrip @@ -1251,8 +1286,6 @@ private constructor( lastKnownLocation(JsonField.of(lastKnownLocation)) /** Last known location of the transit vehicle. */ - @JsonProperty("lastKnownLocation") - @ExcludeMissing fun lastKnownLocation(lastKnownLocation: JsonField) = apply { this.lastKnownLocation = lastKnownLocation } @@ -1266,8 +1299,6 @@ private constructor( /** * Last known orientation value received in real-time from the transit vehicle. */ - @JsonProperty("lastKnownOrientation") - @ExcludeMissing fun lastKnownOrientation(lastKnownOrientation: JsonField) = apply { this.lastKnownOrientation = lastKnownOrientation } @@ -1283,8 +1314,6 @@ private constructor( * Timestamp of the last known real-time location update from the transit * vehicle. */ - @JsonProperty("lastLocationUpdateTime") - @ExcludeMissing fun lastLocationUpdateTime(lastLocationUpdateTime: JsonField) = apply { this.lastLocationUpdateTime = lastLocationUpdateTime } @@ -1294,8 +1323,6 @@ private constructor( lastUpdateTime(JsonField.of(lastUpdateTime)) /** Timestamp of the last known real-time update from the transit vehicle. */ - @JsonProperty("lastUpdateTime") - @ExcludeMissing fun lastUpdateTime(lastUpdateTime: JsonField) = apply { this.lastUpdateTime = lastUpdateTime } @@ -1304,8 +1331,6 @@ private constructor( fun nextStop(nextStop: String) = nextStop(JsonField.of(nextStop)) /** ID of the next stop the transit vehicle is scheduled to arrive at. */ - @JsonProperty("nextStop") - @ExcludeMissing fun nextStop(nextStop: JsonField) = apply { this.nextStop = nextStop } /** @@ -1319,8 +1344,6 @@ private constructor( * Time offset from the next stop to the current position of the transit vehicle * (in seconds). */ - @JsonProperty("nextStopTimeOffset") - @ExcludeMissing fun nextStopTimeOffset(nextStopTimeOffset: JsonField) = apply { this.nextStopTimeOffset = nextStopTimeOffset } @@ -1330,8 +1353,6 @@ private constructor( occupancyCapacity(JsonField.of(occupancyCapacity)) /** Capacity of the transit vehicle in terms of occupancy. */ - @JsonProperty("occupancyCapacity") - @ExcludeMissing fun occupancyCapacity(occupancyCapacity: JsonField) = apply { this.occupancyCapacity = occupancyCapacity } @@ -1341,8 +1362,6 @@ private constructor( occupancyCount(JsonField.of(occupancyCount)) /** Current count of occupants in the transit vehicle. */ - @JsonProperty("occupancyCount") - @ExcludeMissing fun occupancyCount(occupancyCount: JsonField) = apply { this.occupancyCount = occupancyCount } @@ -1352,8 +1371,6 @@ private constructor( occupancyStatus(JsonField.of(occupancyStatus)) /** Current occupancy status of the transit vehicle. */ - @JsonProperty("occupancyStatus") - @ExcludeMissing fun occupancyStatus(occupancyStatus: JsonField) = apply { this.occupancyStatus = occupancyStatus } @@ -1362,8 +1379,6 @@ private constructor( fun orientation(orientation: Double) = orientation(JsonField.of(orientation)) /** Orientation of the transit vehicle, represented as an angle in degrees. */ - @JsonProperty("orientation") - @ExcludeMissing fun orientation(orientation: JsonField) = apply { this.orientation = orientation } @@ -1372,24 +1387,18 @@ private constructor( fun phase(phase: String) = phase(JsonField.of(phase)) /** Current journey phase of the trip. */ - @JsonProperty("phase") - @ExcludeMissing fun phase(phase: JsonField) = apply { this.phase = phase } /** Current position of the transit vehicle. */ fun position(position: Position) = position(JsonField.of(position)) /** Current position of the transit vehicle. */ - @JsonProperty("position") - @ExcludeMissing fun position(position: JsonField) = apply { this.position = position } /** Indicates if real-time arrival info is available for this trip. */ fun predicted(predicted: Boolean) = predicted(JsonField.of(predicted)) /** Indicates if real-time arrival info is available for this trip. */ - @JsonProperty("predicted") - @ExcludeMissing fun predicted(predicted: JsonField) = apply { this.predicted = predicted } @@ -1405,8 +1414,6 @@ private constructor( * Deviation from the schedule in seconds (positive for late, negative for * early). */ - @JsonProperty("scheduleDeviation") - @ExcludeMissing fun scheduleDeviation(scheduleDeviation: JsonField) = apply { this.scheduleDeviation = scheduleDeviation } @@ -1422,8 +1429,6 @@ private constructor( * Distance, in meters, the transit vehicle is scheduled to have progressed * along the active trip. */ - @JsonProperty("scheduledDistanceAlongTrip") - @ExcludeMissing fun scheduledDistanceAlongTrip(scheduledDistanceAlongTrip: JsonField) = apply { this.scheduledDistanceAlongTrip = scheduledDistanceAlongTrip @@ -1439,8 +1444,6 @@ private constructor( * Time, in milliseconds since the Unix epoch, of midnight for the start of the * service date for the trip. */ - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -1450,8 +1453,6 @@ private constructor( situationIds(JsonField.of(situationIds)) /** References to situation elements (if any) applicable to this trip. */ - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds } @@ -1460,8 +1461,6 @@ private constructor( fun status(status: String) = status(JsonField.of(status)) /** Current status modifiers for the trip. */ - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } /** Total length of the trip, in meters. */ @@ -1469,8 +1468,6 @@ private constructor( totalDistanceAlongTrip(JsonField.of(totalDistanceAlongTrip)) /** Total length of the trip, in meters. */ - @JsonProperty("totalDistanceAlongTrip") - @ExcludeMissing fun totalDistanceAlongTrip(totalDistanceAlongTrip: JsonField) = apply { this.totalDistanceAlongTrip = totalDistanceAlongTrip } @@ -1479,8 +1476,6 @@ private constructor( fun vehicleId(vehicleId: String) = vehicleId(JsonField.of(vehicleId)) /** ID of the transit vehicle currently serving the trip. */ - @JsonProperty("vehicleId") - @ExcludeMissing fun vehicleId(vehicleId: JsonField) = apply { this.vehicleId = vehicleId } @@ -1490,7 +1485,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1542,13 +1536,18 @@ private constructor( } /** Last known location of the transit vehicle. */ - @JsonDeserialize(builder = LastKnownLocation.Builder::class) @NoAutoDetect class LastKnownLocation + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the last known location of the transit vehicle. */ @@ -1602,16 +1601,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the last known location of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the last known location of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the last known location of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -1620,7 +1615,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1664,13 +1658,18 @@ private constructor( } /** Current position of the transit vehicle. */ - @JsonDeserialize(builder = Position.Builder::class) @NoAutoDetect class Position + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the current position of the transit vehicle. */ @@ -1723,16 +1722,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the current position of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the current position of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the current position of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -1741,7 +1736,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripForVehicleRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripForVehicleRetrieveResponse.kt index 7ec5655..1522350 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripForVehicleRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripForVehicleRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = TripForVehicleRetrieveResponse.Builder::class) @NoAutoDetect class TripForVehicleRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -99,32 +104,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -132,7 +127,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -158,13 +152,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -210,14 +209,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -227,7 +222,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -250,17 +244,30 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val frequency: JsonField, - private val schedule: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val status: JsonField, - private val tripId: JsonField, - private val additionalProperties: Map, + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("schedule") + @ExcludeMissing + private val schedule: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun frequency(): String? = frequency.getNullable("frequency") @@ -334,20 +341,14 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } fun schedule(schedule: Schedule) = schedule(JsonField.of(schedule)) - @JsonProperty("schedule") - @ExcludeMissing fun schedule(schedule: JsonField) = apply { this.schedule = schedule } fun serviceDate(serviceDate: Long) = serviceDate(JsonField.of(serviceDate)) - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -355,22 +356,16 @@ private constructor( fun situationIds(situationIds: List) = situationIds(JsonField.of(situationIds)) - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds } fun status(status: Status) = status(JsonField.of(status)) - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } fun tripId(tripId: String) = tripId(JsonField.of(tripId)) - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } fun additionalProperties(additionalProperties: Map) = apply { @@ -378,7 +373,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -408,16 +402,27 @@ private constructor( ) } - @JsonDeserialize(builder = Schedule.Builder::class) @NoAutoDetect class Schedule + @JsonCreator private constructor( - private val frequency: JsonField, - private val nextTripId: JsonField, - private val previousTripId: JsonField, - private val stopTimes: JsonField>, - private val timeZone: JsonField, - private val additionalProperties: Map, + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("nextTripId") + @ExcludeMissing + private val nextTripId: JsonField = JsonMissing.of(), + @JsonProperty("previousTripId") + @ExcludeMissing + private val previousTripId: JsonField = JsonMissing.of(), + @JsonProperty("stopTimes") + @ExcludeMissing + private val stopTimes: JsonField> = JsonMissing.of(), + @JsonProperty("timeZone") + @ExcludeMissing + private val timeZone: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun frequency(): String? = frequency.getNullable("frequency") @@ -486,16 +491,12 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } fun nextTripId(nextTripId: String) = nextTripId(JsonField.of(nextTripId)) - @JsonProperty("nextTripId") - @ExcludeMissing fun nextTripId(nextTripId: JsonField) = apply { this.nextTripId = nextTripId } @@ -503,24 +504,18 @@ private constructor( fun previousTripId(previousTripId: String) = previousTripId(JsonField.of(previousTripId)) - @JsonProperty("previousTripId") - @ExcludeMissing fun previousTripId(previousTripId: JsonField) = apply { this.previousTripId = previousTripId } fun stopTimes(stopTimes: List) = stopTimes(JsonField.of(stopTimes)) - @JsonProperty("stopTimes") - @ExcludeMissing fun stopTimes(stopTimes: JsonField>) = apply { this.stopTimes = stopTimes } fun timeZone(timeZone: String) = timeZone(JsonField.of(timeZone)) - @JsonProperty("timeZone") - @ExcludeMissing fun timeZone(timeZone: JsonField) = apply { this.timeZone = timeZone } fun additionalProperties(additionalProperties: Map) = apply { @@ -528,7 +523,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -557,17 +551,30 @@ private constructor( ) } - @JsonDeserialize(builder = StopTime.Builder::class) @NoAutoDetect class StopTime + @JsonCreator private constructor( - private val arrivalTime: JsonField, - private val departureTime: JsonField, - private val distanceAlongTrip: JsonField, - private val historicalOccupancy: JsonField, - private val stopHeadsign: JsonField, - private val stopId: JsonField, - private val additionalProperties: Map, + @JsonProperty("arrivalTime") + @ExcludeMissing + private val arrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("departureTime") + @ExcludeMissing + private val departureTime: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("historicalOccupancy") + @ExcludeMissing + private val historicalOccupancy: JsonField = JsonMissing.of(), + @JsonProperty("stopHeadsign") + @ExcludeMissing + private val stopHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("stopId") + @ExcludeMissing + private val stopId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun arrivalTime(): Long? = arrivalTime.getNullable("arrivalTime") @@ -650,8 +657,6 @@ private constructor( fun arrivalTime(arrivalTime: Long) = arrivalTime(JsonField.of(arrivalTime)) - @JsonProperty("arrivalTime") - @ExcludeMissing fun arrivalTime(arrivalTime: JsonField) = apply { this.arrivalTime = arrivalTime } @@ -659,8 +664,6 @@ private constructor( fun departureTime(departureTime: Long) = departureTime(JsonField.of(departureTime)) - @JsonProperty("departureTime") - @ExcludeMissing fun departureTime(departureTime: JsonField) = apply { this.departureTime = departureTime } @@ -668,8 +671,6 @@ private constructor( fun distanceAlongTrip(distanceAlongTrip: Double) = distanceAlongTrip(JsonField.of(distanceAlongTrip)) - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -677,8 +678,6 @@ private constructor( fun historicalOccupancy(historicalOccupancy: String) = historicalOccupancy(JsonField.of(historicalOccupancy)) - @JsonProperty("historicalOccupancy") - @ExcludeMissing fun historicalOccupancy(historicalOccupancy: JsonField) = apply { this.historicalOccupancy = historicalOccupancy } @@ -686,16 +685,12 @@ private constructor( fun stopHeadsign(stopHeadsign: String) = stopHeadsign(JsonField.of(stopHeadsign)) - @JsonProperty("stopHeadsign") - @ExcludeMissing fun stopHeadsign(stopHeadsign: JsonField) = apply { this.stopHeadsign = stopHeadsign } fun stopId(stopId: String) = stopId(JsonField.of(stopId)) - @JsonProperty("stopId") - @ExcludeMissing fun stopId(stopId: JsonField) = apply { this.stopId = stopId } fun additionalProperties(additionalProperties: Map) = @@ -704,7 +699,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -769,38 +763,93 @@ private constructor( "Schedule{frequency=$frequency, nextTripId=$nextTripId, previousTripId=$previousTripId, stopTimes=$stopTimes, timeZone=$timeZone, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Status.Builder::class) @NoAutoDetect class Status + @JsonCreator private constructor( - private val activeTripId: JsonField, - private val blockTripSequence: JsonField, - private val closestStop: JsonField, - private val closestStopTimeOffset: JsonField, - private val distanceAlongTrip: JsonField, - private val frequency: JsonField, - private val lastKnownDistanceAlongTrip: JsonField, - private val lastKnownLocation: JsonField, - private val lastKnownOrientation: JsonField, - private val lastLocationUpdateTime: JsonField, - private val lastUpdateTime: JsonField, - private val nextStop: JsonField, - private val nextStopTimeOffset: JsonField, - private val occupancyCapacity: JsonField, - private val occupancyCount: JsonField, - private val occupancyStatus: JsonField, - private val orientation: JsonField, - private val phase: JsonField, - private val position: JsonField, - private val predicted: JsonField, - private val scheduleDeviation: JsonField, - private val scheduledDistanceAlongTrip: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val status: JsonField, - private val totalDistanceAlongTrip: JsonField, - private val vehicleId: JsonField, - private val additionalProperties: Map, + @JsonProperty("activeTripId") + @ExcludeMissing + private val activeTripId: JsonField = JsonMissing.of(), + @JsonProperty("blockTripSequence") + @ExcludeMissing + private val blockTripSequence: JsonField = JsonMissing.of(), + @JsonProperty("closestStop") + @ExcludeMissing + private val closestStop: JsonField = JsonMissing.of(), + @JsonProperty("closestStopTimeOffset") + @ExcludeMissing + private val closestStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownDistanceAlongTrip") + @ExcludeMissing + private val lastKnownDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownLocation") + @ExcludeMissing + private val lastKnownLocation: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownOrientation") + @ExcludeMissing + private val lastKnownOrientation: JsonField = JsonMissing.of(), + @JsonProperty("lastLocationUpdateTime") + @ExcludeMissing + private val lastLocationUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("lastUpdateTime") + @ExcludeMissing + private val lastUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("nextStop") + @ExcludeMissing + private val nextStop: JsonField = JsonMissing.of(), + @JsonProperty("nextStopTimeOffset") + @ExcludeMissing + private val nextStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCapacity") + @ExcludeMissing + private val occupancyCapacity: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCount") + @ExcludeMissing + private val occupancyCount: JsonField = JsonMissing.of(), + @JsonProperty("occupancyStatus") + @ExcludeMissing + private val occupancyStatus: JsonField = JsonMissing.of(), + @JsonProperty("orientation") + @ExcludeMissing + private val orientation: JsonField = JsonMissing.of(), + @JsonProperty("phase") + @ExcludeMissing + private val phase: JsonField = JsonMissing.of(), + @JsonProperty("position") + @ExcludeMissing + private val position: JsonField = JsonMissing.of(), + @JsonProperty("predicted") + @ExcludeMissing + private val predicted: JsonField = JsonMissing.of(), + @JsonProperty("scheduleDeviation") + @ExcludeMissing + private val scheduleDeviation: JsonField = JsonMissing.of(), + @JsonProperty("scheduledDistanceAlongTrip") + @ExcludeMissing + private val scheduledDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonProperty("totalDistanceAlongTrip") + @ExcludeMissing + private val totalDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("vehicleId") + @ExcludeMissing + private val vehicleId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Trip ID of the trip the vehicle is actively serving. */ @@ -1158,8 +1207,6 @@ private constructor( activeTripId(JsonField.of(activeTripId)) /** Trip ID of the trip the vehicle is actively serving. */ - @JsonProperty("activeTripId") - @ExcludeMissing fun activeTripId(activeTripId: JsonField) = apply { this.activeTripId = activeTripId } @@ -1169,8 +1216,6 @@ private constructor( blockTripSequence(JsonField.of(blockTripSequence)) /** Index of the active trip into the sequence of trips for the active block. */ - @JsonProperty("blockTripSequence") - @ExcludeMissing fun blockTripSequence(blockTripSequence: JsonField) = apply { this.blockTripSequence = blockTripSequence } @@ -1179,8 +1224,6 @@ private constructor( fun closestStop(closestStop: String) = closestStop(JsonField.of(closestStop)) /** ID of the closest stop to the current location of the transit vehicle. */ - @JsonProperty("closestStop") - @ExcludeMissing fun closestStop(closestStop: JsonField) = apply { this.closestStop = closestStop } @@ -1196,8 +1239,6 @@ private constructor( * Time offset from the closest stop to the current position of the transit * vehicle (in seconds). */ - @JsonProperty("closestStopTimeOffset") - @ExcludeMissing fun closestStopTimeOffset(closestStopTimeOffset: JsonField) = apply { this.closestStopTimeOffset = closestStopTimeOffset } @@ -1213,8 +1254,6 @@ private constructor( * Distance, in meters, the transit vehicle has progressed along the active * trip. */ - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -1223,8 +1262,6 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) /** Information about frequency-based scheduling, if applicable to the trip. */ - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } @@ -1240,8 +1277,6 @@ private constructor( * Last known distance along the trip received in real-time from the transit * vehicle. */ - @JsonProperty("lastKnownDistanceAlongTrip") - @ExcludeMissing fun lastKnownDistanceAlongTrip(lastKnownDistanceAlongTrip: JsonField) = apply { this.lastKnownDistanceAlongTrip = lastKnownDistanceAlongTrip @@ -1252,8 +1287,6 @@ private constructor( lastKnownLocation(JsonField.of(lastKnownLocation)) /** Last known location of the transit vehicle. */ - @JsonProperty("lastKnownLocation") - @ExcludeMissing fun lastKnownLocation(lastKnownLocation: JsonField) = apply { this.lastKnownLocation = lastKnownLocation } @@ -1267,8 +1300,6 @@ private constructor( /** * Last known orientation value received in real-time from the transit vehicle. */ - @JsonProperty("lastKnownOrientation") - @ExcludeMissing fun lastKnownOrientation(lastKnownOrientation: JsonField) = apply { this.lastKnownOrientation = lastKnownOrientation } @@ -1284,8 +1315,6 @@ private constructor( * Timestamp of the last known real-time location update from the transit * vehicle. */ - @JsonProperty("lastLocationUpdateTime") - @ExcludeMissing fun lastLocationUpdateTime(lastLocationUpdateTime: JsonField) = apply { this.lastLocationUpdateTime = lastLocationUpdateTime } @@ -1295,8 +1324,6 @@ private constructor( lastUpdateTime(JsonField.of(lastUpdateTime)) /** Timestamp of the last known real-time update from the transit vehicle. */ - @JsonProperty("lastUpdateTime") - @ExcludeMissing fun lastUpdateTime(lastUpdateTime: JsonField) = apply { this.lastUpdateTime = lastUpdateTime } @@ -1305,8 +1332,6 @@ private constructor( fun nextStop(nextStop: String) = nextStop(JsonField.of(nextStop)) /** ID of the next stop the transit vehicle is scheduled to arrive at. */ - @JsonProperty("nextStop") - @ExcludeMissing fun nextStop(nextStop: JsonField) = apply { this.nextStop = nextStop } /** @@ -1320,8 +1345,6 @@ private constructor( * Time offset from the next stop to the current position of the transit vehicle * (in seconds). */ - @JsonProperty("nextStopTimeOffset") - @ExcludeMissing fun nextStopTimeOffset(nextStopTimeOffset: JsonField) = apply { this.nextStopTimeOffset = nextStopTimeOffset } @@ -1331,8 +1354,6 @@ private constructor( occupancyCapacity(JsonField.of(occupancyCapacity)) /** Capacity of the transit vehicle in terms of occupancy. */ - @JsonProperty("occupancyCapacity") - @ExcludeMissing fun occupancyCapacity(occupancyCapacity: JsonField) = apply { this.occupancyCapacity = occupancyCapacity } @@ -1342,8 +1363,6 @@ private constructor( occupancyCount(JsonField.of(occupancyCount)) /** Current count of occupants in the transit vehicle. */ - @JsonProperty("occupancyCount") - @ExcludeMissing fun occupancyCount(occupancyCount: JsonField) = apply { this.occupancyCount = occupancyCount } @@ -1353,8 +1372,6 @@ private constructor( occupancyStatus(JsonField.of(occupancyStatus)) /** Current occupancy status of the transit vehicle. */ - @JsonProperty("occupancyStatus") - @ExcludeMissing fun occupancyStatus(occupancyStatus: JsonField) = apply { this.occupancyStatus = occupancyStatus } @@ -1363,8 +1380,6 @@ private constructor( fun orientation(orientation: Double) = orientation(JsonField.of(orientation)) /** Orientation of the transit vehicle, represented as an angle in degrees. */ - @JsonProperty("orientation") - @ExcludeMissing fun orientation(orientation: JsonField) = apply { this.orientation = orientation } @@ -1373,24 +1388,18 @@ private constructor( fun phase(phase: String) = phase(JsonField.of(phase)) /** Current journey phase of the trip. */ - @JsonProperty("phase") - @ExcludeMissing fun phase(phase: JsonField) = apply { this.phase = phase } /** Current position of the transit vehicle. */ fun position(position: Position) = position(JsonField.of(position)) /** Current position of the transit vehicle. */ - @JsonProperty("position") - @ExcludeMissing fun position(position: JsonField) = apply { this.position = position } /** Indicates if real-time arrival info is available for this trip. */ fun predicted(predicted: Boolean) = predicted(JsonField.of(predicted)) /** Indicates if real-time arrival info is available for this trip. */ - @JsonProperty("predicted") - @ExcludeMissing fun predicted(predicted: JsonField) = apply { this.predicted = predicted } @@ -1406,8 +1415,6 @@ private constructor( * Deviation from the schedule in seconds (positive for late, negative for * early). */ - @JsonProperty("scheduleDeviation") - @ExcludeMissing fun scheduleDeviation(scheduleDeviation: JsonField) = apply { this.scheduleDeviation = scheduleDeviation } @@ -1423,8 +1430,6 @@ private constructor( * Distance, in meters, the transit vehicle is scheduled to have progressed * along the active trip. */ - @JsonProperty("scheduledDistanceAlongTrip") - @ExcludeMissing fun scheduledDistanceAlongTrip(scheduledDistanceAlongTrip: JsonField) = apply { this.scheduledDistanceAlongTrip = scheduledDistanceAlongTrip @@ -1440,8 +1445,6 @@ private constructor( * Time, in milliseconds since the Unix epoch, of midnight for the start of the * service date for the trip. */ - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -1451,8 +1454,6 @@ private constructor( situationIds(JsonField.of(situationIds)) /** References to situation elements (if any) applicable to this trip. */ - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds } @@ -1461,8 +1462,6 @@ private constructor( fun status(status: String) = status(JsonField.of(status)) /** Current status modifiers for the trip. */ - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } /** Total length of the trip, in meters. */ @@ -1470,8 +1469,6 @@ private constructor( totalDistanceAlongTrip(JsonField.of(totalDistanceAlongTrip)) /** Total length of the trip, in meters. */ - @JsonProperty("totalDistanceAlongTrip") - @ExcludeMissing fun totalDistanceAlongTrip(totalDistanceAlongTrip: JsonField) = apply { this.totalDistanceAlongTrip = totalDistanceAlongTrip } @@ -1480,8 +1477,6 @@ private constructor( fun vehicleId(vehicleId: String) = vehicleId(JsonField.of(vehicleId)) /** ID of the transit vehicle currently serving the trip. */ - @JsonProperty("vehicleId") - @ExcludeMissing fun vehicleId(vehicleId: JsonField) = apply { this.vehicleId = vehicleId } @@ -1491,7 +1486,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1543,13 +1537,18 @@ private constructor( } /** Last known location of the transit vehicle. */ - @JsonDeserialize(builder = LastKnownLocation.Builder::class) @NoAutoDetect class LastKnownLocation + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the last known location of the transit vehicle. */ @@ -1603,16 +1602,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the last known location of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the last known location of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the last known location of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -1621,7 +1616,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1665,13 +1659,18 @@ private constructor( } /** Current position of the transit vehicle. */ - @JsonDeserialize(builder = Position.Builder::class) @NoAutoDetect class Position + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the current position of the transit vehicle. */ @@ -1724,16 +1723,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the current position of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the current position of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the current position of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -1742,7 +1737,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripRetrieveResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripRetrieveResponse.kt index 1cc64ec..181621a 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripRetrieveResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripRetrieveResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = TripRetrieveResponse.Builder::class) @NoAutoDetect class TripRetrieveResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,13 +151,18 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val entry: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("entry") + @ExcludeMissing + private val entry: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun entry(): Entry = entry.getRequired("entry") @@ -209,14 +208,10 @@ private constructor( fun entry(entry: Entry) = entry(JsonField.of(entry)) - @JsonProperty("entry") - @ExcludeMissing fun entry(entry: JsonField) = apply { this.entry = entry } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -226,7 +221,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -249,22 +243,45 @@ private constructor( ) } - @JsonDeserialize(builder = Entry.Builder::class) @NoAutoDetect class Entry + @JsonCreator private constructor( - private val blockId: JsonField, - private val directionId: JsonField, - private val id: JsonField, - private val peakOffpeak: JsonField, - private val routeId: JsonField, - private val routeShortName: JsonField, - private val serviceId: JsonField, - private val shapeId: JsonField, - private val timeZone: JsonField, - private val tripHeadsign: JsonField, - private val tripShortName: JsonField, - private val additionalProperties: Map, + @JsonProperty("blockId") + @ExcludeMissing + private val blockId: JsonField = JsonMissing.of(), + @JsonProperty("directionId") + @ExcludeMissing + private val directionId: JsonField = JsonMissing.of(), + @JsonProperty("id") + @ExcludeMissing + private val id: JsonField = JsonMissing.of(), + @JsonProperty("peakOffpeak") + @ExcludeMissing + private val peakOffpeak: JsonField = JsonMissing.of(), + @JsonProperty("routeId") + @ExcludeMissing + private val routeId: JsonField = JsonMissing.of(), + @JsonProperty("routeShortName") + @ExcludeMissing + private val routeShortName: JsonField = JsonMissing.of(), + @JsonProperty("serviceId") + @ExcludeMissing + private val serviceId: JsonField = JsonMissing.of(), + @JsonProperty("shapeId") + @ExcludeMissing + private val shapeId: JsonField = JsonMissing.of(), + @JsonProperty("timeZone") + @ExcludeMissing + private val timeZone: JsonField = JsonMissing.of(), + @JsonProperty("tripHeadsign") + @ExcludeMissing + private val tripHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("tripShortName") + @ExcludeMissing + private val tripShortName: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun blockId(): String? = blockId.getNullable("blockId") @@ -373,69 +390,49 @@ private constructor( fun blockId(blockId: String) = blockId(JsonField.of(blockId)) - @JsonProperty("blockId") - @ExcludeMissing fun blockId(blockId: JsonField) = apply { this.blockId = blockId } fun directionId(directionId: String) = directionId(JsonField.of(directionId)) - @JsonProperty("directionId") - @ExcludeMissing fun directionId(directionId: JsonField) = apply { this.directionId = directionId } fun id(id: String) = id(JsonField.of(id)) - @JsonProperty("id") - @ExcludeMissing fun id(id: JsonField) = apply { this.id = id } fun peakOffpeak(peakOffpeak: Long) = peakOffpeak(JsonField.of(peakOffpeak)) - @JsonProperty("peakOffpeak") - @ExcludeMissing fun peakOffpeak(peakOffpeak: JsonField) = apply { this.peakOffpeak = peakOffpeak } fun routeId(routeId: String) = routeId(JsonField.of(routeId)) - @JsonProperty("routeId") - @ExcludeMissing fun routeId(routeId: JsonField) = apply { this.routeId = routeId } fun routeShortName(routeShortName: String) = routeShortName(JsonField.of(routeShortName)) - @JsonProperty("routeShortName") - @ExcludeMissing fun routeShortName(routeShortName: JsonField) = apply { this.routeShortName = routeShortName } fun serviceId(serviceId: String) = serviceId(JsonField.of(serviceId)) - @JsonProperty("serviceId") - @ExcludeMissing fun serviceId(serviceId: JsonField) = apply { this.serviceId = serviceId } fun shapeId(shapeId: String) = shapeId(JsonField.of(shapeId)) - @JsonProperty("shapeId") - @ExcludeMissing fun shapeId(shapeId: JsonField) = apply { this.shapeId = shapeId } fun timeZone(timeZone: String) = timeZone(JsonField.of(timeZone)) - @JsonProperty("timeZone") - @ExcludeMissing fun timeZone(timeZone: JsonField) = apply { this.timeZone = timeZone } fun tripHeadsign(tripHeadsign: String) = tripHeadsign(JsonField.of(tripHeadsign)) - @JsonProperty("tripHeadsign") - @ExcludeMissing fun tripHeadsign(tripHeadsign: JsonField) = apply { this.tripHeadsign = tripHeadsign } @@ -443,8 +440,6 @@ private constructor( fun tripShortName(tripShortName: String) = tripShortName(JsonField.of(tripShortName)) - @JsonProperty("tripShortName") - @ExcludeMissing fun tripShortName(tripShortName: JsonField) = apply { this.tripShortName = tripShortName } @@ -454,7 +449,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripsForLocationListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripsForLocationListResponse.kt index 6933b16..6133ed2 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripsForLocationListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripsForLocationListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = TripsForLocationListResponse.Builder::class) @NoAutoDetect class TripsForLocationListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,15 +151,24 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val limitExceeded: JsonField, - private val list: JsonField>, - private val outOfRange: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("outOfRange") + @ExcludeMissing + private val outOfRange: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Indicates if the limit of trips has been exceeded */ @@ -231,30 +234,22 @@ private constructor( fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) /** Indicates if the limit of trips has been exceeded */ - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun list(list: kotlin.collections.List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } /** Indicates if the search location is out of range */ fun outOfRange(outOfRange: Boolean) = outOfRange(JsonField.of(outOfRange)) /** Indicates if the search location is out of range */ - @JsonProperty("outOfRange") - @ExcludeMissing fun outOfRange(outOfRange: JsonField) = apply { this.outOfRange = outOfRange } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -264,7 +259,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -289,17 +283,30 @@ private constructor( ) } - @JsonDeserialize(builder = List.Builder::class) @NoAutoDetect class List + @JsonCreator private constructor( - private val frequency: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val tripId: JsonField, - private val schedule: JsonField, - private val status: JsonField, - private val additionalProperties: Map, + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonProperty("schedule") + @ExcludeMissing + private val schedule: JsonField = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun frequency(): String? = frequency.getNullable("frequency") @@ -375,14 +382,10 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } fun serviceDate(serviceDate: Long) = serviceDate(JsonField.of(serviceDate)) - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -390,28 +393,20 @@ private constructor( fun situationIds(situationIds: kotlin.collections.List) = situationIds(JsonField.of(situationIds)) - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds } fun tripId(tripId: String) = tripId(JsonField.of(tripId)) - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } fun schedule(schedule: Schedule) = schedule(JsonField.of(schedule)) - @JsonProperty("schedule") - @ExcludeMissing fun schedule(schedule: JsonField) = apply { this.schedule = schedule } fun status(status: Status) = status(JsonField.of(status)) - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } fun additionalProperties(additionalProperties: Map) = apply { @@ -419,7 +414,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -449,16 +443,27 @@ private constructor( ) } - @JsonDeserialize(builder = Schedule.Builder::class) @NoAutoDetect class Schedule + @JsonCreator private constructor( - private val frequency: JsonField, - private val nextTripId: JsonField, - private val previousTripId: JsonField, - private val stopTimes: JsonField>, - private val timeZone: JsonField, - private val additionalProperties: Map, + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("nextTripId") + @ExcludeMissing + private val nextTripId: JsonField = JsonMissing.of(), + @JsonProperty("previousTripId") + @ExcludeMissing + private val previousTripId: JsonField = JsonMissing.of(), + @JsonProperty("stopTimes") + @ExcludeMissing + private val stopTimes: JsonField> = JsonMissing.of(), + @JsonProperty("timeZone") + @ExcludeMissing + private val timeZone: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun frequency(): String? = frequency.getNullable("frequency") @@ -529,16 +534,12 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } fun nextTripId(nextTripId: String) = nextTripId(JsonField.of(nextTripId)) - @JsonProperty("nextTripId") - @ExcludeMissing fun nextTripId(nextTripId: JsonField) = apply { this.nextTripId = nextTripId } @@ -546,8 +547,6 @@ private constructor( fun previousTripId(previousTripId: String) = previousTripId(JsonField.of(previousTripId)) - @JsonProperty("previousTripId") - @ExcludeMissing fun previousTripId(previousTripId: JsonField) = apply { this.previousTripId = previousTripId } @@ -555,16 +554,12 @@ private constructor( fun stopTimes(stopTimes: kotlin.collections.List) = stopTimes(JsonField.of(stopTimes)) - @JsonProperty("stopTimes") - @ExcludeMissing fun stopTimes(stopTimes: JsonField>) = apply { this.stopTimes = stopTimes } fun timeZone(timeZone: String) = timeZone(JsonField.of(timeZone)) - @JsonProperty("timeZone") - @ExcludeMissing fun timeZone(timeZone: JsonField) = apply { this.timeZone = timeZone } fun additionalProperties(additionalProperties: Map) = apply { @@ -572,7 +567,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -601,17 +595,30 @@ private constructor( ) } - @JsonDeserialize(builder = StopTime.Builder::class) @NoAutoDetect class StopTime + @JsonCreator private constructor( - private val arrivalTime: JsonField, - private val departureTime: JsonField, - private val distanceAlongTrip: JsonField, - private val historicalOccupancy: JsonField, - private val stopHeadsign: JsonField, - private val stopId: JsonField, - private val additionalProperties: Map, + @JsonProperty("arrivalTime") + @ExcludeMissing + private val arrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("departureTime") + @ExcludeMissing + private val departureTime: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("historicalOccupancy") + @ExcludeMissing + private val historicalOccupancy: JsonField = JsonMissing.of(), + @JsonProperty("stopHeadsign") + @ExcludeMissing + private val stopHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("stopId") + @ExcludeMissing + private val stopId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun arrivalTime(): Long? = arrivalTime.getNullable("arrivalTime") @@ -694,8 +701,6 @@ private constructor( fun arrivalTime(arrivalTime: Long) = arrivalTime(JsonField.of(arrivalTime)) - @JsonProperty("arrivalTime") - @ExcludeMissing fun arrivalTime(arrivalTime: JsonField) = apply { this.arrivalTime = arrivalTime } @@ -703,8 +708,6 @@ private constructor( fun departureTime(departureTime: Long) = departureTime(JsonField.of(departureTime)) - @JsonProperty("departureTime") - @ExcludeMissing fun departureTime(departureTime: JsonField) = apply { this.departureTime = departureTime } @@ -712,8 +715,6 @@ private constructor( fun distanceAlongTrip(distanceAlongTrip: Double) = distanceAlongTrip(JsonField.of(distanceAlongTrip)) - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -721,8 +722,6 @@ private constructor( fun historicalOccupancy(historicalOccupancy: String) = historicalOccupancy(JsonField.of(historicalOccupancy)) - @JsonProperty("historicalOccupancy") - @ExcludeMissing fun historicalOccupancy(historicalOccupancy: JsonField) = apply { this.historicalOccupancy = historicalOccupancy } @@ -730,16 +729,12 @@ private constructor( fun stopHeadsign(stopHeadsign: String) = stopHeadsign(JsonField.of(stopHeadsign)) - @JsonProperty("stopHeadsign") - @ExcludeMissing fun stopHeadsign(stopHeadsign: JsonField) = apply { this.stopHeadsign = stopHeadsign } fun stopId(stopId: String) = stopId(JsonField.of(stopId)) - @JsonProperty("stopId") - @ExcludeMissing fun stopId(stopId: JsonField) = apply { this.stopId = stopId } fun additionalProperties(additionalProperties: Map) = @@ -748,7 +743,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -813,38 +807,93 @@ private constructor( "Schedule{frequency=$frequency, nextTripId=$nextTripId, previousTripId=$previousTripId, stopTimes=$stopTimes, timeZone=$timeZone, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Status.Builder::class) @NoAutoDetect class Status + @JsonCreator private constructor( - private val activeTripId: JsonField, - private val blockTripSequence: JsonField, - private val closestStop: JsonField, - private val closestStopTimeOffset: JsonField, - private val distanceAlongTrip: JsonField, - private val frequency: JsonField, - private val lastKnownDistanceAlongTrip: JsonField, - private val lastKnownLocation: JsonField, - private val lastKnownOrientation: JsonField, - private val lastLocationUpdateTime: JsonField, - private val lastUpdateTime: JsonField, - private val nextStop: JsonField, - private val nextStopTimeOffset: JsonField, - private val occupancyCapacity: JsonField, - private val occupancyCount: JsonField, - private val occupancyStatus: JsonField, - private val orientation: JsonField, - private val phase: JsonField, - private val position: JsonField, - private val predicted: JsonField, - private val scheduleDeviation: JsonField, - private val scheduledDistanceAlongTrip: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val status: JsonField, - private val totalDistanceAlongTrip: JsonField, - private val vehicleId: JsonField, - private val additionalProperties: Map, + @JsonProperty("activeTripId") + @ExcludeMissing + private val activeTripId: JsonField = JsonMissing.of(), + @JsonProperty("blockTripSequence") + @ExcludeMissing + private val blockTripSequence: JsonField = JsonMissing.of(), + @JsonProperty("closestStop") + @ExcludeMissing + private val closestStop: JsonField = JsonMissing.of(), + @JsonProperty("closestStopTimeOffset") + @ExcludeMissing + private val closestStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownDistanceAlongTrip") + @ExcludeMissing + private val lastKnownDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownLocation") + @ExcludeMissing + private val lastKnownLocation: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownOrientation") + @ExcludeMissing + private val lastKnownOrientation: JsonField = JsonMissing.of(), + @JsonProperty("lastLocationUpdateTime") + @ExcludeMissing + private val lastLocationUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("lastUpdateTime") + @ExcludeMissing + private val lastUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("nextStop") + @ExcludeMissing + private val nextStop: JsonField = JsonMissing.of(), + @JsonProperty("nextStopTimeOffset") + @ExcludeMissing + private val nextStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCapacity") + @ExcludeMissing + private val occupancyCapacity: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCount") + @ExcludeMissing + private val occupancyCount: JsonField = JsonMissing.of(), + @JsonProperty("occupancyStatus") + @ExcludeMissing + private val occupancyStatus: JsonField = JsonMissing.of(), + @JsonProperty("orientation") + @ExcludeMissing + private val orientation: JsonField = JsonMissing.of(), + @JsonProperty("phase") + @ExcludeMissing + private val phase: JsonField = JsonMissing.of(), + @JsonProperty("position") + @ExcludeMissing + private val position: JsonField = JsonMissing.of(), + @JsonProperty("predicted") + @ExcludeMissing + private val predicted: JsonField = JsonMissing.of(), + @JsonProperty("scheduleDeviation") + @ExcludeMissing + private val scheduleDeviation: JsonField = JsonMissing.of(), + @JsonProperty("scheduledDistanceAlongTrip") + @ExcludeMissing + private val scheduledDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonProperty("totalDistanceAlongTrip") + @ExcludeMissing + private val totalDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("vehicleId") + @ExcludeMissing + private val vehicleId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Trip ID of the trip the vehicle is actively serving. */ @@ -1204,8 +1253,6 @@ private constructor( activeTripId(JsonField.of(activeTripId)) /** Trip ID of the trip the vehicle is actively serving. */ - @JsonProperty("activeTripId") - @ExcludeMissing fun activeTripId(activeTripId: JsonField) = apply { this.activeTripId = activeTripId } @@ -1215,8 +1262,6 @@ private constructor( blockTripSequence(JsonField.of(blockTripSequence)) /** Index of the active trip into the sequence of trips for the active block. */ - @JsonProperty("blockTripSequence") - @ExcludeMissing fun blockTripSequence(blockTripSequence: JsonField) = apply { this.blockTripSequence = blockTripSequence } @@ -1225,8 +1270,6 @@ private constructor( fun closestStop(closestStop: String) = closestStop(JsonField.of(closestStop)) /** ID of the closest stop to the current location of the transit vehicle. */ - @JsonProperty("closestStop") - @ExcludeMissing fun closestStop(closestStop: JsonField) = apply { this.closestStop = closestStop } @@ -1242,8 +1285,6 @@ private constructor( * Time offset from the closest stop to the current position of the transit * vehicle (in seconds). */ - @JsonProperty("closestStopTimeOffset") - @ExcludeMissing fun closestStopTimeOffset(closestStopTimeOffset: JsonField) = apply { this.closestStopTimeOffset = closestStopTimeOffset } @@ -1259,8 +1300,6 @@ private constructor( * Distance, in meters, the transit vehicle has progressed along the active * trip. */ - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -1269,8 +1308,6 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) /** Information about frequency-based scheduling, if applicable to the trip. */ - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } @@ -1286,8 +1323,6 @@ private constructor( * Last known distance along the trip received in real-time from the transit * vehicle. */ - @JsonProperty("lastKnownDistanceAlongTrip") - @ExcludeMissing fun lastKnownDistanceAlongTrip(lastKnownDistanceAlongTrip: JsonField) = apply { this.lastKnownDistanceAlongTrip = lastKnownDistanceAlongTrip @@ -1298,8 +1333,6 @@ private constructor( lastKnownLocation(JsonField.of(lastKnownLocation)) /** Last known location of the transit vehicle. */ - @JsonProperty("lastKnownLocation") - @ExcludeMissing fun lastKnownLocation(lastKnownLocation: JsonField) = apply { this.lastKnownLocation = lastKnownLocation } @@ -1313,8 +1346,6 @@ private constructor( /** * Last known orientation value received in real-time from the transit vehicle. */ - @JsonProperty("lastKnownOrientation") - @ExcludeMissing fun lastKnownOrientation(lastKnownOrientation: JsonField) = apply { this.lastKnownOrientation = lastKnownOrientation } @@ -1330,8 +1361,6 @@ private constructor( * Timestamp of the last known real-time location update from the transit * vehicle. */ - @JsonProperty("lastLocationUpdateTime") - @ExcludeMissing fun lastLocationUpdateTime(lastLocationUpdateTime: JsonField) = apply { this.lastLocationUpdateTime = lastLocationUpdateTime } @@ -1341,8 +1370,6 @@ private constructor( lastUpdateTime(JsonField.of(lastUpdateTime)) /** Timestamp of the last known real-time update from the transit vehicle. */ - @JsonProperty("lastUpdateTime") - @ExcludeMissing fun lastUpdateTime(lastUpdateTime: JsonField) = apply { this.lastUpdateTime = lastUpdateTime } @@ -1351,8 +1378,6 @@ private constructor( fun nextStop(nextStop: String) = nextStop(JsonField.of(nextStop)) /** ID of the next stop the transit vehicle is scheduled to arrive at. */ - @JsonProperty("nextStop") - @ExcludeMissing fun nextStop(nextStop: JsonField) = apply { this.nextStop = nextStop } /** @@ -1366,8 +1391,6 @@ private constructor( * Time offset from the next stop to the current position of the transit vehicle * (in seconds). */ - @JsonProperty("nextStopTimeOffset") - @ExcludeMissing fun nextStopTimeOffset(nextStopTimeOffset: JsonField) = apply { this.nextStopTimeOffset = nextStopTimeOffset } @@ -1377,8 +1400,6 @@ private constructor( occupancyCapacity(JsonField.of(occupancyCapacity)) /** Capacity of the transit vehicle in terms of occupancy. */ - @JsonProperty("occupancyCapacity") - @ExcludeMissing fun occupancyCapacity(occupancyCapacity: JsonField) = apply { this.occupancyCapacity = occupancyCapacity } @@ -1388,8 +1409,6 @@ private constructor( occupancyCount(JsonField.of(occupancyCount)) /** Current count of occupants in the transit vehicle. */ - @JsonProperty("occupancyCount") - @ExcludeMissing fun occupancyCount(occupancyCount: JsonField) = apply { this.occupancyCount = occupancyCount } @@ -1399,8 +1418,6 @@ private constructor( occupancyStatus(JsonField.of(occupancyStatus)) /** Current occupancy status of the transit vehicle. */ - @JsonProperty("occupancyStatus") - @ExcludeMissing fun occupancyStatus(occupancyStatus: JsonField) = apply { this.occupancyStatus = occupancyStatus } @@ -1409,8 +1426,6 @@ private constructor( fun orientation(orientation: Double) = orientation(JsonField.of(orientation)) /** Orientation of the transit vehicle, represented as an angle in degrees. */ - @JsonProperty("orientation") - @ExcludeMissing fun orientation(orientation: JsonField) = apply { this.orientation = orientation } @@ -1419,24 +1434,18 @@ private constructor( fun phase(phase: String) = phase(JsonField.of(phase)) /** Current journey phase of the trip. */ - @JsonProperty("phase") - @ExcludeMissing fun phase(phase: JsonField) = apply { this.phase = phase } /** Current position of the transit vehicle. */ fun position(position: Position) = position(JsonField.of(position)) /** Current position of the transit vehicle. */ - @JsonProperty("position") - @ExcludeMissing fun position(position: JsonField) = apply { this.position = position } /** Indicates if real-time arrival info is available for this trip. */ fun predicted(predicted: Boolean) = predicted(JsonField.of(predicted)) /** Indicates if real-time arrival info is available for this trip. */ - @JsonProperty("predicted") - @ExcludeMissing fun predicted(predicted: JsonField) = apply { this.predicted = predicted } @@ -1452,8 +1461,6 @@ private constructor( * Deviation from the schedule in seconds (positive for late, negative for * early). */ - @JsonProperty("scheduleDeviation") - @ExcludeMissing fun scheduleDeviation(scheduleDeviation: JsonField) = apply { this.scheduleDeviation = scheduleDeviation } @@ -1469,8 +1476,6 @@ private constructor( * Distance, in meters, the transit vehicle is scheduled to have progressed * along the active trip. */ - @JsonProperty("scheduledDistanceAlongTrip") - @ExcludeMissing fun scheduledDistanceAlongTrip(scheduledDistanceAlongTrip: JsonField) = apply { this.scheduledDistanceAlongTrip = scheduledDistanceAlongTrip @@ -1486,8 +1491,6 @@ private constructor( * Time, in milliseconds since the Unix epoch, of midnight for the start of the * service date for the trip. */ - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -1497,8 +1500,6 @@ private constructor( situationIds(JsonField.of(situationIds)) /** References to situation elements (if any) applicable to this trip. */ - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds @@ -1508,8 +1509,6 @@ private constructor( fun status(status: String) = status(JsonField.of(status)) /** Current status modifiers for the trip. */ - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } /** Total length of the trip, in meters. */ @@ -1517,8 +1516,6 @@ private constructor( totalDistanceAlongTrip(JsonField.of(totalDistanceAlongTrip)) /** Total length of the trip, in meters. */ - @JsonProperty("totalDistanceAlongTrip") - @ExcludeMissing fun totalDistanceAlongTrip(totalDistanceAlongTrip: JsonField) = apply { this.totalDistanceAlongTrip = totalDistanceAlongTrip } @@ -1527,8 +1524,6 @@ private constructor( fun vehicleId(vehicleId: String) = vehicleId(JsonField.of(vehicleId)) /** ID of the transit vehicle currently serving the trip. */ - @JsonProperty("vehicleId") - @ExcludeMissing fun vehicleId(vehicleId: JsonField) = apply { this.vehicleId = vehicleId } @@ -1538,7 +1533,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1590,13 +1584,18 @@ private constructor( } /** Last known location of the transit vehicle. */ - @JsonDeserialize(builder = LastKnownLocation.Builder::class) @NoAutoDetect class LastKnownLocation + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the last known location of the transit vehicle. */ @@ -1650,16 +1649,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the last known location of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the last known location of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the last known location of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -1668,7 +1663,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1712,13 +1706,18 @@ private constructor( } /** Current position of the transit vehicle. */ - @JsonDeserialize(builder = Position.Builder::class) @NoAutoDetect class Position + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the current position of the transit vehicle. */ @@ -1771,16 +1770,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the current position of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the current position of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the current position of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -1789,7 +1784,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripsForRouteListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripsForRouteListResponse.kt index 3061a75..2b0bcfb 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripsForRouteListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/TripsForRouteListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = TripsForRouteListResponse.Builder::class) @NoAutoDetect class TripsForRouteListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,14 +151,21 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val limitExceeded: JsonField, - private val list: JsonField>, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun limitExceeded(): Boolean = limitExceeded.getRequired("limitExceeded") @@ -217,22 +218,16 @@ private constructor( fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun list(list: kotlin.collections.List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -242,7 +237,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -266,17 +260,30 @@ private constructor( ) } - @JsonDeserialize(builder = List.Builder::class) @NoAutoDetect class List + @JsonCreator private constructor( - private val frequency: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val tripId: JsonField, - private val schedule: JsonField, - private val status: JsonField, - private val additionalProperties: Map, + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonProperty("schedule") + @ExcludeMissing + private val schedule: JsonField = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun frequency(): String? = frequency.getNullable("frequency") @@ -352,14 +359,10 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } fun serviceDate(serviceDate: Long) = serviceDate(JsonField.of(serviceDate)) - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -367,28 +370,20 @@ private constructor( fun situationIds(situationIds: kotlin.collections.List) = situationIds(JsonField.of(situationIds)) - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds } fun tripId(tripId: String) = tripId(JsonField.of(tripId)) - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } fun schedule(schedule: Schedule) = schedule(JsonField.of(schedule)) - @JsonProperty("schedule") - @ExcludeMissing fun schedule(schedule: JsonField) = apply { this.schedule = schedule } fun status(status: Status) = status(JsonField.of(status)) - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } fun additionalProperties(additionalProperties: Map) = apply { @@ -396,7 +391,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -426,16 +420,27 @@ private constructor( ) } - @JsonDeserialize(builder = Schedule.Builder::class) @NoAutoDetect class Schedule + @JsonCreator private constructor( - private val frequency: JsonField, - private val nextTripId: JsonField, - private val previousTripId: JsonField, - private val stopTimes: JsonField>, - private val timeZone: JsonField, - private val additionalProperties: Map, + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("nextTripId") + @ExcludeMissing + private val nextTripId: JsonField = JsonMissing.of(), + @JsonProperty("previousTripId") + @ExcludeMissing + private val previousTripId: JsonField = JsonMissing.of(), + @JsonProperty("stopTimes") + @ExcludeMissing + private val stopTimes: JsonField> = JsonMissing.of(), + @JsonProperty("timeZone") + @ExcludeMissing + private val timeZone: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun frequency(): String? = frequency.getNullable("frequency") @@ -506,16 +511,12 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } fun nextTripId(nextTripId: String) = nextTripId(JsonField.of(nextTripId)) - @JsonProperty("nextTripId") - @ExcludeMissing fun nextTripId(nextTripId: JsonField) = apply { this.nextTripId = nextTripId } @@ -523,8 +524,6 @@ private constructor( fun previousTripId(previousTripId: String) = previousTripId(JsonField.of(previousTripId)) - @JsonProperty("previousTripId") - @ExcludeMissing fun previousTripId(previousTripId: JsonField) = apply { this.previousTripId = previousTripId } @@ -532,16 +531,12 @@ private constructor( fun stopTimes(stopTimes: kotlin.collections.List) = stopTimes(JsonField.of(stopTimes)) - @JsonProperty("stopTimes") - @ExcludeMissing fun stopTimes(stopTimes: JsonField>) = apply { this.stopTimes = stopTimes } fun timeZone(timeZone: String) = timeZone(JsonField.of(timeZone)) - @JsonProperty("timeZone") - @ExcludeMissing fun timeZone(timeZone: JsonField) = apply { this.timeZone = timeZone } fun additionalProperties(additionalProperties: Map) = apply { @@ -549,7 +544,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -578,17 +572,30 @@ private constructor( ) } - @JsonDeserialize(builder = StopTime.Builder::class) @NoAutoDetect class StopTime + @JsonCreator private constructor( - private val arrivalTime: JsonField, - private val departureTime: JsonField, - private val distanceAlongTrip: JsonField, - private val historicalOccupancy: JsonField, - private val stopHeadsign: JsonField, - private val stopId: JsonField, - private val additionalProperties: Map, + @JsonProperty("arrivalTime") + @ExcludeMissing + private val arrivalTime: JsonField = JsonMissing.of(), + @JsonProperty("departureTime") + @ExcludeMissing + private val departureTime: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("historicalOccupancy") + @ExcludeMissing + private val historicalOccupancy: JsonField = JsonMissing.of(), + @JsonProperty("stopHeadsign") + @ExcludeMissing + private val stopHeadsign: JsonField = JsonMissing.of(), + @JsonProperty("stopId") + @ExcludeMissing + private val stopId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun arrivalTime(): Long? = arrivalTime.getNullable("arrivalTime") @@ -671,8 +678,6 @@ private constructor( fun arrivalTime(arrivalTime: Long) = arrivalTime(JsonField.of(arrivalTime)) - @JsonProperty("arrivalTime") - @ExcludeMissing fun arrivalTime(arrivalTime: JsonField) = apply { this.arrivalTime = arrivalTime } @@ -680,8 +685,6 @@ private constructor( fun departureTime(departureTime: Long) = departureTime(JsonField.of(departureTime)) - @JsonProperty("departureTime") - @ExcludeMissing fun departureTime(departureTime: JsonField) = apply { this.departureTime = departureTime } @@ -689,8 +692,6 @@ private constructor( fun distanceAlongTrip(distanceAlongTrip: Double) = distanceAlongTrip(JsonField.of(distanceAlongTrip)) - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -698,8 +699,6 @@ private constructor( fun historicalOccupancy(historicalOccupancy: String) = historicalOccupancy(JsonField.of(historicalOccupancy)) - @JsonProperty("historicalOccupancy") - @ExcludeMissing fun historicalOccupancy(historicalOccupancy: JsonField) = apply { this.historicalOccupancy = historicalOccupancy } @@ -707,16 +706,12 @@ private constructor( fun stopHeadsign(stopHeadsign: String) = stopHeadsign(JsonField.of(stopHeadsign)) - @JsonProperty("stopHeadsign") - @ExcludeMissing fun stopHeadsign(stopHeadsign: JsonField) = apply { this.stopHeadsign = stopHeadsign } fun stopId(stopId: String) = stopId(JsonField.of(stopId)) - @JsonProperty("stopId") - @ExcludeMissing fun stopId(stopId: JsonField) = apply { this.stopId = stopId } fun additionalProperties(additionalProperties: Map) = @@ -725,7 +720,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -790,38 +784,93 @@ private constructor( "Schedule{frequency=$frequency, nextTripId=$nextTripId, previousTripId=$previousTripId, stopTimes=$stopTimes, timeZone=$timeZone, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = Status.Builder::class) @NoAutoDetect class Status + @JsonCreator private constructor( - private val activeTripId: JsonField, - private val blockTripSequence: JsonField, - private val closestStop: JsonField, - private val closestStopTimeOffset: JsonField, - private val distanceAlongTrip: JsonField, - private val frequency: JsonField, - private val lastKnownDistanceAlongTrip: JsonField, - private val lastKnownLocation: JsonField, - private val lastKnownOrientation: JsonField, - private val lastLocationUpdateTime: JsonField, - private val lastUpdateTime: JsonField, - private val nextStop: JsonField, - private val nextStopTimeOffset: JsonField, - private val occupancyCapacity: JsonField, - private val occupancyCount: JsonField, - private val occupancyStatus: JsonField, - private val orientation: JsonField, - private val phase: JsonField, - private val position: JsonField, - private val predicted: JsonField, - private val scheduleDeviation: JsonField, - private val scheduledDistanceAlongTrip: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val status: JsonField, - private val totalDistanceAlongTrip: JsonField, - private val vehicleId: JsonField, - private val additionalProperties: Map, + @JsonProperty("activeTripId") + @ExcludeMissing + private val activeTripId: JsonField = JsonMissing.of(), + @JsonProperty("blockTripSequence") + @ExcludeMissing + private val blockTripSequence: JsonField = JsonMissing.of(), + @JsonProperty("closestStop") + @ExcludeMissing + private val closestStop: JsonField = JsonMissing.of(), + @JsonProperty("closestStopTimeOffset") + @ExcludeMissing + private val closestStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownDistanceAlongTrip") + @ExcludeMissing + private val lastKnownDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownLocation") + @ExcludeMissing + private val lastKnownLocation: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownOrientation") + @ExcludeMissing + private val lastKnownOrientation: JsonField = JsonMissing.of(), + @JsonProperty("lastLocationUpdateTime") + @ExcludeMissing + private val lastLocationUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("lastUpdateTime") + @ExcludeMissing + private val lastUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("nextStop") + @ExcludeMissing + private val nextStop: JsonField = JsonMissing.of(), + @JsonProperty("nextStopTimeOffset") + @ExcludeMissing + private val nextStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCapacity") + @ExcludeMissing + private val occupancyCapacity: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCount") + @ExcludeMissing + private val occupancyCount: JsonField = JsonMissing.of(), + @JsonProperty("occupancyStatus") + @ExcludeMissing + private val occupancyStatus: JsonField = JsonMissing.of(), + @JsonProperty("orientation") + @ExcludeMissing + private val orientation: JsonField = JsonMissing.of(), + @JsonProperty("phase") + @ExcludeMissing + private val phase: JsonField = JsonMissing.of(), + @JsonProperty("position") + @ExcludeMissing + private val position: JsonField = JsonMissing.of(), + @JsonProperty("predicted") + @ExcludeMissing + private val predicted: JsonField = JsonMissing.of(), + @JsonProperty("scheduleDeviation") + @ExcludeMissing + private val scheduleDeviation: JsonField = JsonMissing.of(), + @JsonProperty("scheduledDistanceAlongTrip") + @ExcludeMissing + private val scheduledDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonProperty("totalDistanceAlongTrip") + @ExcludeMissing + private val totalDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("vehicleId") + @ExcludeMissing + private val vehicleId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Trip ID of the trip the vehicle is actively serving. */ @@ -1181,8 +1230,6 @@ private constructor( activeTripId(JsonField.of(activeTripId)) /** Trip ID of the trip the vehicle is actively serving. */ - @JsonProperty("activeTripId") - @ExcludeMissing fun activeTripId(activeTripId: JsonField) = apply { this.activeTripId = activeTripId } @@ -1192,8 +1239,6 @@ private constructor( blockTripSequence(JsonField.of(blockTripSequence)) /** Index of the active trip into the sequence of trips for the active block. */ - @JsonProperty("blockTripSequence") - @ExcludeMissing fun blockTripSequence(blockTripSequence: JsonField) = apply { this.blockTripSequence = blockTripSequence } @@ -1202,8 +1247,6 @@ private constructor( fun closestStop(closestStop: String) = closestStop(JsonField.of(closestStop)) /** ID of the closest stop to the current location of the transit vehicle. */ - @JsonProperty("closestStop") - @ExcludeMissing fun closestStop(closestStop: JsonField) = apply { this.closestStop = closestStop } @@ -1219,8 +1262,6 @@ private constructor( * Time offset from the closest stop to the current position of the transit * vehicle (in seconds). */ - @JsonProperty("closestStopTimeOffset") - @ExcludeMissing fun closestStopTimeOffset(closestStopTimeOffset: JsonField) = apply { this.closestStopTimeOffset = closestStopTimeOffset } @@ -1236,8 +1277,6 @@ private constructor( * Distance, in meters, the transit vehicle has progressed along the active * trip. */ - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -1246,8 +1285,6 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) /** Information about frequency-based scheduling, if applicable to the trip. */ - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } @@ -1263,8 +1300,6 @@ private constructor( * Last known distance along the trip received in real-time from the transit * vehicle. */ - @JsonProperty("lastKnownDistanceAlongTrip") - @ExcludeMissing fun lastKnownDistanceAlongTrip(lastKnownDistanceAlongTrip: JsonField) = apply { this.lastKnownDistanceAlongTrip = lastKnownDistanceAlongTrip @@ -1275,8 +1310,6 @@ private constructor( lastKnownLocation(JsonField.of(lastKnownLocation)) /** Last known location of the transit vehicle. */ - @JsonProperty("lastKnownLocation") - @ExcludeMissing fun lastKnownLocation(lastKnownLocation: JsonField) = apply { this.lastKnownLocation = lastKnownLocation } @@ -1290,8 +1323,6 @@ private constructor( /** * Last known orientation value received in real-time from the transit vehicle. */ - @JsonProperty("lastKnownOrientation") - @ExcludeMissing fun lastKnownOrientation(lastKnownOrientation: JsonField) = apply { this.lastKnownOrientation = lastKnownOrientation } @@ -1307,8 +1338,6 @@ private constructor( * Timestamp of the last known real-time location update from the transit * vehicle. */ - @JsonProperty("lastLocationUpdateTime") - @ExcludeMissing fun lastLocationUpdateTime(lastLocationUpdateTime: JsonField) = apply { this.lastLocationUpdateTime = lastLocationUpdateTime } @@ -1318,8 +1347,6 @@ private constructor( lastUpdateTime(JsonField.of(lastUpdateTime)) /** Timestamp of the last known real-time update from the transit vehicle. */ - @JsonProperty("lastUpdateTime") - @ExcludeMissing fun lastUpdateTime(lastUpdateTime: JsonField) = apply { this.lastUpdateTime = lastUpdateTime } @@ -1328,8 +1355,6 @@ private constructor( fun nextStop(nextStop: String) = nextStop(JsonField.of(nextStop)) /** ID of the next stop the transit vehicle is scheduled to arrive at. */ - @JsonProperty("nextStop") - @ExcludeMissing fun nextStop(nextStop: JsonField) = apply { this.nextStop = nextStop } /** @@ -1343,8 +1368,6 @@ private constructor( * Time offset from the next stop to the current position of the transit vehicle * (in seconds). */ - @JsonProperty("nextStopTimeOffset") - @ExcludeMissing fun nextStopTimeOffset(nextStopTimeOffset: JsonField) = apply { this.nextStopTimeOffset = nextStopTimeOffset } @@ -1354,8 +1377,6 @@ private constructor( occupancyCapacity(JsonField.of(occupancyCapacity)) /** Capacity of the transit vehicle in terms of occupancy. */ - @JsonProperty("occupancyCapacity") - @ExcludeMissing fun occupancyCapacity(occupancyCapacity: JsonField) = apply { this.occupancyCapacity = occupancyCapacity } @@ -1365,8 +1386,6 @@ private constructor( occupancyCount(JsonField.of(occupancyCount)) /** Current count of occupants in the transit vehicle. */ - @JsonProperty("occupancyCount") - @ExcludeMissing fun occupancyCount(occupancyCount: JsonField) = apply { this.occupancyCount = occupancyCount } @@ -1376,8 +1395,6 @@ private constructor( occupancyStatus(JsonField.of(occupancyStatus)) /** Current occupancy status of the transit vehicle. */ - @JsonProperty("occupancyStatus") - @ExcludeMissing fun occupancyStatus(occupancyStatus: JsonField) = apply { this.occupancyStatus = occupancyStatus } @@ -1386,8 +1403,6 @@ private constructor( fun orientation(orientation: Double) = orientation(JsonField.of(orientation)) /** Orientation of the transit vehicle, represented as an angle in degrees. */ - @JsonProperty("orientation") - @ExcludeMissing fun orientation(orientation: JsonField) = apply { this.orientation = orientation } @@ -1396,24 +1411,18 @@ private constructor( fun phase(phase: String) = phase(JsonField.of(phase)) /** Current journey phase of the trip. */ - @JsonProperty("phase") - @ExcludeMissing fun phase(phase: JsonField) = apply { this.phase = phase } /** Current position of the transit vehicle. */ fun position(position: Position) = position(JsonField.of(position)) /** Current position of the transit vehicle. */ - @JsonProperty("position") - @ExcludeMissing fun position(position: JsonField) = apply { this.position = position } /** Indicates if real-time arrival info is available for this trip. */ fun predicted(predicted: Boolean) = predicted(JsonField.of(predicted)) /** Indicates if real-time arrival info is available for this trip. */ - @JsonProperty("predicted") - @ExcludeMissing fun predicted(predicted: JsonField) = apply { this.predicted = predicted } @@ -1429,8 +1438,6 @@ private constructor( * Deviation from the schedule in seconds (positive for late, negative for * early). */ - @JsonProperty("scheduleDeviation") - @ExcludeMissing fun scheduleDeviation(scheduleDeviation: JsonField) = apply { this.scheduleDeviation = scheduleDeviation } @@ -1446,8 +1453,6 @@ private constructor( * Distance, in meters, the transit vehicle is scheduled to have progressed * along the active trip. */ - @JsonProperty("scheduledDistanceAlongTrip") - @ExcludeMissing fun scheduledDistanceAlongTrip(scheduledDistanceAlongTrip: JsonField) = apply { this.scheduledDistanceAlongTrip = scheduledDistanceAlongTrip @@ -1463,8 +1468,6 @@ private constructor( * Time, in milliseconds since the Unix epoch, of midnight for the start of the * service date for the trip. */ - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -1474,8 +1477,6 @@ private constructor( situationIds(JsonField.of(situationIds)) /** References to situation elements (if any) applicable to this trip. */ - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds @@ -1485,8 +1486,6 @@ private constructor( fun status(status: String) = status(JsonField.of(status)) /** Current status modifiers for the trip. */ - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } /** Total length of the trip, in meters. */ @@ -1494,8 +1493,6 @@ private constructor( totalDistanceAlongTrip(JsonField.of(totalDistanceAlongTrip)) /** Total length of the trip, in meters. */ - @JsonProperty("totalDistanceAlongTrip") - @ExcludeMissing fun totalDistanceAlongTrip(totalDistanceAlongTrip: JsonField) = apply { this.totalDistanceAlongTrip = totalDistanceAlongTrip } @@ -1504,8 +1501,6 @@ private constructor( fun vehicleId(vehicleId: String) = vehicleId(JsonField.of(vehicleId)) /** ID of the transit vehicle currently serving the trip. */ - @JsonProperty("vehicleId") - @ExcludeMissing fun vehicleId(vehicleId: JsonField) = apply { this.vehicleId = vehicleId } @@ -1515,7 +1510,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1567,13 +1561,18 @@ private constructor( } /** Last known location of the transit vehicle. */ - @JsonDeserialize(builder = LastKnownLocation.Builder::class) @NoAutoDetect class LastKnownLocation + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the last known location of the transit vehicle. */ @@ -1627,16 +1626,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the last known location of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the last known location of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the last known location of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -1645,7 +1640,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1689,13 +1683,18 @@ private constructor( } /** Current position of the transit vehicle. */ - @JsonDeserialize(builder = Position.Builder::class) @NoAutoDetect class Position + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the current position of the transit vehicle. */ @@ -1748,16 +1747,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the current position of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the current position of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the current position of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -1766,7 +1761,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/VehiclesForAgencyListResponse.kt b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/VehiclesForAgencyListResponse.kt index fba3632..22e33a6 100644 --- a/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/VehiclesForAgencyListResponse.kt +++ b/onebusaway-sdk-kotlin-core/src/main/kotlin/org/onebusaway/models/VehiclesForAgencyListResponse.kt @@ -4,26 +4,31 @@ package org.onebusaway.models import com.fasterxml.jackson.annotation.JsonAnyGetter import com.fasterxml.jackson.annotation.JsonAnySetter +import com.fasterxml.jackson.annotation.JsonCreator import com.fasterxml.jackson.annotation.JsonProperty -import com.fasterxml.jackson.databind.annotation.JsonDeserialize import java.util.Objects import org.onebusaway.core.ExcludeMissing import org.onebusaway.core.JsonField import org.onebusaway.core.JsonMissing import org.onebusaway.core.JsonValue import org.onebusaway.core.NoAutoDetect +import org.onebusaway.core.immutableEmptyMap import org.onebusaway.core.toImmutable -@JsonDeserialize(builder = VehiclesForAgencyListResponse.Builder::class) @NoAutoDetect class VehiclesForAgencyListResponse +@JsonCreator private constructor( - private val code: JsonField, - private val currentTime: JsonField, - private val text: JsonField, - private val version: JsonField, - private val data: JsonField, - private val additionalProperties: Map, + @JsonProperty("code") @ExcludeMissing private val code: JsonField = JsonMissing.of(), + @JsonProperty("currentTime") + @ExcludeMissing + private val currentTime: JsonField = JsonMissing.of(), + @JsonProperty("text") @ExcludeMissing private val text: JsonField = JsonMissing.of(), + @JsonProperty("version") + @ExcludeMissing + private val version: JsonField = JsonMissing.of(), + @JsonProperty("data") @ExcludeMissing private val data: JsonField = JsonMissing.of(), + @JsonAnySetter private val additionalProperties: Map = immutableEmptyMap(), ) { fun code(): Long = code.getRequired("code") @@ -98,32 +103,22 @@ private constructor( fun code(code: Long) = code(JsonField.of(code)) - @JsonProperty("code") - @ExcludeMissing fun code(code: JsonField) = apply { this.code = code } fun currentTime(currentTime: Long) = currentTime(JsonField.of(currentTime)) - @JsonProperty("currentTime") - @ExcludeMissing fun currentTime(currentTime: JsonField) = apply { this.currentTime = currentTime } fun text(text: String) = text(JsonField.of(text)) - @JsonProperty("text") - @ExcludeMissing fun text(text: JsonField) = apply { this.text = text } fun version(version: Long) = version(JsonField.of(version)) - @JsonProperty("version") - @ExcludeMissing fun version(version: JsonField) = apply { this.version = version } fun data(data: Data) = data(JsonField.of(data)) - @JsonProperty("data") - @ExcludeMissing fun data(data: JsonField) = apply { this.data = data } fun additionalProperties(additionalProperties: Map) = apply { @@ -131,7 +126,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -157,14 +151,21 @@ private constructor( ) } - @JsonDeserialize(builder = Data.Builder::class) @NoAutoDetect class Data + @JsonCreator private constructor( - private val list: JsonField>, - private val limitExceeded: JsonField, - private val references: JsonField, - private val additionalProperties: Map, + @JsonProperty("list") + @ExcludeMissing + private val list: JsonField> = JsonMissing.of(), + @JsonProperty("limitExceeded") + @ExcludeMissing + private val limitExceeded: JsonField = JsonMissing.of(), + @JsonProperty("references") + @ExcludeMissing + private val references: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun list(): kotlin.collections.List = list.getRequired("list") @@ -217,22 +218,16 @@ private constructor( fun list(list: kotlin.collections.List) = list(JsonField.of(list)) - @JsonProperty("list") - @ExcludeMissing fun list(list: JsonField>) = apply { this.list = list } fun limitExceeded(limitExceeded: Boolean) = limitExceeded(JsonField.of(limitExceeded)) - @JsonProperty("limitExceeded") - @ExcludeMissing fun limitExceeded(limitExceeded: JsonField) = apply { this.limitExceeded = limitExceeded } fun references(references: References) = references(JsonField.of(references)) - @JsonProperty("references") - @ExcludeMissing fun references(references: JsonField) = apply { this.references = references } @@ -242,7 +237,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -266,22 +260,45 @@ private constructor( ) } - @JsonDeserialize(builder = List.Builder::class) @NoAutoDetect class List + @JsonCreator private constructor( - private val vehicleId: JsonField, - private val lastUpdateTime: JsonField, - private val lastLocationUpdateTime: JsonField, - private val location: JsonField, - private val tripId: JsonField, - private val tripStatus: JsonField, - private val occupancyCapacity: JsonField, - private val occupancyCount: JsonField, - private val occupancyStatus: JsonField, - private val phase: JsonField, - private val status: JsonField, - private val additionalProperties: Map, + @JsonProperty("vehicleId") + @ExcludeMissing + private val vehicleId: JsonField = JsonMissing.of(), + @JsonProperty("lastUpdateTime") + @ExcludeMissing + private val lastUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("lastLocationUpdateTime") + @ExcludeMissing + private val lastLocationUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("location") + @ExcludeMissing + private val location: JsonField = JsonMissing.of(), + @JsonProperty("tripId") + @ExcludeMissing + private val tripId: JsonField = JsonMissing.of(), + @JsonProperty("tripStatus") + @ExcludeMissing + private val tripStatus: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCapacity") + @ExcludeMissing + private val occupancyCapacity: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCount") + @ExcludeMissing + private val occupancyCount: JsonField = JsonMissing.of(), + @JsonProperty("occupancyStatus") + @ExcludeMissing + private val occupancyStatus: JsonField = JsonMissing.of(), + @JsonProperty("phase") + @ExcludeMissing + private val phase: JsonField = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun vehicleId(): String = vehicleId.getRequired("vehicleId") @@ -397,15 +414,11 @@ private constructor( fun vehicleId(vehicleId: String) = vehicleId(JsonField.of(vehicleId)) - @JsonProperty("vehicleId") - @ExcludeMissing fun vehicleId(vehicleId: JsonField) = apply { this.vehicleId = vehicleId } fun lastUpdateTime(lastUpdateTime: Long) = lastUpdateTime(JsonField.of(lastUpdateTime)) - @JsonProperty("lastUpdateTime") - @ExcludeMissing fun lastUpdateTime(lastUpdateTime: JsonField) = apply { this.lastUpdateTime = lastUpdateTime } @@ -413,28 +426,20 @@ private constructor( fun lastLocationUpdateTime(lastLocationUpdateTime: Long) = lastLocationUpdateTime(JsonField.of(lastLocationUpdateTime)) - @JsonProperty("lastLocationUpdateTime") - @ExcludeMissing fun lastLocationUpdateTime(lastLocationUpdateTime: JsonField) = apply { this.lastLocationUpdateTime = lastLocationUpdateTime } fun location(location: Location) = location(JsonField.of(location)) - @JsonProperty("location") - @ExcludeMissing fun location(location: JsonField) = apply { this.location = location } fun tripId(tripId: String) = tripId(JsonField.of(tripId)) - @JsonProperty("tripId") - @ExcludeMissing fun tripId(tripId: JsonField) = apply { this.tripId = tripId } fun tripStatus(tripStatus: TripStatus) = tripStatus(JsonField.of(tripStatus)) - @JsonProperty("tripStatus") - @ExcludeMissing fun tripStatus(tripStatus: JsonField) = apply { this.tripStatus = tripStatus } @@ -442,8 +447,6 @@ private constructor( fun occupancyCapacity(occupancyCapacity: Long) = occupancyCapacity(JsonField.of(occupancyCapacity)) - @JsonProperty("occupancyCapacity") - @ExcludeMissing fun occupancyCapacity(occupancyCapacity: JsonField) = apply { this.occupancyCapacity = occupancyCapacity } @@ -451,8 +454,6 @@ private constructor( fun occupancyCount(occupancyCount: Long) = occupancyCount(JsonField.of(occupancyCount)) - @JsonProperty("occupancyCount") - @ExcludeMissing fun occupancyCount(occupancyCount: JsonField) = apply { this.occupancyCount = occupancyCount } @@ -460,22 +461,16 @@ private constructor( fun occupancyStatus(occupancyStatus: String) = occupancyStatus(JsonField.of(occupancyStatus)) - @JsonProperty("occupancyStatus") - @ExcludeMissing fun occupancyStatus(occupancyStatus: JsonField) = apply { this.occupancyStatus = occupancyStatus } fun phase(phase: String) = phase(JsonField.of(phase)) - @JsonProperty("phase") - @ExcludeMissing fun phase(phase: JsonField) = apply { this.phase = phase } fun status(status: String) = status(JsonField.of(status)) - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } fun additionalProperties(additionalProperties: Map) = apply { @@ -483,7 +478,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -518,13 +512,18 @@ private constructor( ) } - @JsonDeserialize(builder = Location.Builder::class) @NoAutoDetect class Location + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { fun lat(): Double? = lat.getNullable("lat") @@ -570,14 +569,10 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } fun lon(lon: Double) = lon(JsonField.of(lon)) - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = apply { @@ -585,7 +580,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -629,38 +623,93 @@ private constructor( "Location{lat=$lat, lon=$lon, additionalProperties=$additionalProperties}" } - @JsonDeserialize(builder = TripStatus.Builder::class) @NoAutoDetect class TripStatus + @JsonCreator private constructor( - private val activeTripId: JsonField, - private val blockTripSequence: JsonField, - private val closestStop: JsonField, - private val closestStopTimeOffset: JsonField, - private val distanceAlongTrip: JsonField, - private val frequency: JsonField, - private val lastKnownDistanceAlongTrip: JsonField, - private val lastKnownLocation: JsonField, - private val lastKnownOrientation: JsonField, - private val lastLocationUpdateTime: JsonField, - private val lastUpdateTime: JsonField, - private val nextStop: JsonField, - private val nextStopTimeOffset: JsonField, - private val occupancyCapacity: JsonField, - private val occupancyCount: JsonField, - private val occupancyStatus: JsonField, - private val orientation: JsonField, - private val phase: JsonField, - private val position: JsonField, - private val predicted: JsonField, - private val scheduleDeviation: JsonField, - private val scheduledDistanceAlongTrip: JsonField, - private val serviceDate: JsonField, - private val situationIds: JsonField>, - private val status: JsonField, - private val totalDistanceAlongTrip: JsonField, - private val vehicleId: JsonField, - private val additionalProperties: Map, + @JsonProperty("activeTripId") + @ExcludeMissing + private val activeTripId: JsonField = JsonMissing.of(), + @JsonProperty("blockTripSequence") + @ExcludeMissing + private val blockTripSequence: JsonField = JsonMissing.of(), + @JsonProperty("closestStop") + @ExcludeMissing + private val closestStop: JsonField = JsonMissing.of(), + @JsonProperty("closestStopTimeOffset") + @ExcludeMissing + private val closestStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("distanceAlongTrip") + @ExcludeMissing + private val distanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("frequency") + @ExcludeMissing + private val frequency: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownDistanceAlongTrip") + @ExcludeMissing + private val lastKnownDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownLocation") + @ExcludeMissing + private val lastKnownLocation: JsonField = JsonMissing.of(), + @JsonProperty("lastKnownOrientation") + @ExcludeMissing + private val lastKnownOrientation: JsonField = JsonMissing.of(), + @JsonProperty("lastLocationUpdateTime") + @ExcludeMissing + private val lastLocationUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("lastUpdateTime") + @ExcludeMissing + private val lastUpdateTime: JsonField = JsonMissing.of(), + @JsonProperty("nextStop") + @ExcludeMissing + private val nextStop: JsonField = JsonMissing.of(), + @JsonProperty("nextStopTimeOffset") + @ExcludeMissing + private val nextStopTimeOffset: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCapacity") + @ExcludeMissing + private val occupancyCapacity: JsonField = JsonMissing.of(), + @JsonProperty("occupancyCount") + @ExcludeMissing + private val occupancyCount: JsonField = JsonMissing.of(), + @JsonProperty("occupancyStatus") + @ExcludeMissing + private val occupancyStatus: JsonField = JsonMissing.of(), + @JsonProperty("orientation") + @ExcludeMissing + private val orientation: JsonField = JsonMissing.of(), + @JsonProperty("phase") + @ExcludeMissing + private val phase: JsonField = JsonMissing.of(), + @JsonProperty("position") + @ExcludeMissing + private val position: JsonField = JsonMissing.of(), + @JsonProperty("predicted") + @ExcludeMissing + private val predicted: JsonField = JsonMissing.of(), + @JsonProperty("scheduleDeviation") + @ExcludeMissing + private val scheduleDeviation: JsonField = JsonMissing.of(), + @JsonProperty("scheduledDistanceAlongTrip") + @ExcludeMissing + private val scheduledDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("serviceDate") + @ExcludeMissing + private val serviceDate: JsonField = JsonMissing.of(), + @JsonProperty("situationIds") + @ExcludeMissing + private val situationIds: JsonField> = JsonMissing.of(), + @JsonProperty("status") + @ExcludeMissing + private val status: JsonField = JsonMissing.of(), + @JsonProperty("totalDistanceAlongTrip") + @ExcludeMissing + private val totalDistanceAlongTrip: JsonField = JsonMissing.of(), + @JsonProperty("vehicleId") + @ExcludeMissing + private val vehicleId: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Trip ID of the trip the vehicle is actively serving. */ @@ -1020,8 +1069,6 @@ private constructor( activeTripId(JsonField.of(activeTripId)) /** Trip ID of the trip the vehicle is actively serving. */ - @JsonProperty("activeTripId") - @ExcludeMissing fun activeTripId(activeTripId: JsonField) = apply { this.activeTripId = activeTripId } @@ -1031,8 +1078,6 @@ private constructor( blockTripSequence(JsonField.of(blockTripSequence)) /** Index of the active trip into the sequence of trips for the active block. */ - @JsonProperty("blockTripSequence") - @ExcludeMissing fun blockTripSequence(blockTripSequence: JsonField) = apply { this.blockTripSequence = blockTripSequence } @@ -1041,8 +1086,6 @@ private constructor( fun closestStop(closestStop: String) = closestStop(JsonField.of(closestStop)) /** ID of the closest stop to the current location of the transit vehicle. */ - @JsonProperty("closestStop") - @ExcludeMissing fun closestStop(closestStop: JsonField) = apply { this.closestStop = closestStop } @@ -1058,8 +1101,6 @@ private constructor( * Time offset from the closest stop to the current position of the transit * vehicle (in seconds). */ - @JsonProperty("closestStopTimeOffset") - @ExcludeMissing fun closestStopTimeOffset(closestStopTimeOffset: JsonField) = apply { this.closestStopTimeOffset = closestStopTimeOffset } @@ -1075,8 +1116,6 @@ private constructor( * Distance, in meters, the transit vehicle has progressed along the active * trip. */ - @JsonProperty("distanceAlongTrip") - @ExcludeMissing fun distanceAlongTrip(distanceAlongTrip: JsonField) = apply { this.distanceAlongTrip = distanceAlongTrip } @@ -1085,8 +1124,6 @@ private constructor( fun frequency(frequency: String) = frequency(JsonField.of(frequency)) /** Information about frequency-based scheduling, if applicable to the trip. */ - @JsonProperty("frequency") - @ExcludeMissing fun frequency(frequency: JsonField) = apply { this.frequency = frequency } @@ -1102,8 +1139,6 @@ private constructor( * Last known distance along the trip received in real-time from the transit * vehicle. */ - @JsonProperty("lastKnownDistanceAlongTrip") - @ExcludeMissing fun lastKnownDistanceAlongTrip(lastKnownDistanceAlongTrip: JsonField) = apply { this.lastKnownDistanceAlongTrip = lastKnownDistanceAlongTrip @@ -1114,8 +1149,6 @@ private constructor( lastKnownLocation(JsonField.of(lastKnownLocation)) /** Last known location of the transit vehicle. */ - @JsonProperty("lastKnownLocation") - @ExcludeMissing fun lastKnownLocation(lastKnownLocation: JsonField) = apply { this.lastKnownLocation = lastKnownLocation } @@ -1129,8 +1162,6 @@ private constructor( /** * Last known orientation value received in real-time from the transit vehicle. */ - @JsonProperty("lastKnownOrientation") - @ExcludeMissing fun lastKnownOrientation(lastKnownOrientation: JsonField) = apply { this.lastKnownOrientation = lastKnownOrientation } @@ -1146,8 +1177,6 @@ private constructor( * Timestamp of the last known real-time location update from the transit * vehicle. */ - @JsonProperty("lastLocationUpdateTime") - @ExcludeMissing fun lastLocationUpdateTime(lastLocationUpdateTime: JsonField) = apply { this.lastLocationUpdateTime = lastLocationUpdateTime } @@ -1157,8 +1186,6 @@ private constructor( lastUpdateTime(JsonField.of(lastUpdateTime)) /** Timestamp of the last known real-time update from the transit vehicle. */ - @JsonProperty("lastUpdateTime") - @ExcludeMissing fun lastUpdateTime(lastUpdateTime: JsonField) = apply { this.lastUpdateTime = lastUpdateTime } @@ -1167,8 +1194,6 @@ private constructor( fun nextStop(nextStop: String) = nextStop(JsonField.of(nextStop)) /** ID of the next stop the transit vehicle is scheduled to arrive at. */ - @JsonProperty("nextStop") - @ExcludeMissing fun nextStop(nextStop: JsonField) = apply { this.nextStop = nextStop } /** @@ -1182,8 +1207,6 @@ private constructor( * Time offset from the next stop to the current position of the transit vehicle * (in seconds). */ - @JsonProperty("nextStopTimeOffset") - @ExcludeMissing fun nextStopTimeOffset(nextStopTimeOffset: JsonField) = apply { this.nextStopTimeOffset = nextStopTimeOffset } @@ -1193,8 +1216,6 @@ private constructor( occupancyCapacity(JsonField.of(occupancyCapacity)) /** Capacity of the transit vehicle in terms of occupancy. */ - @JsonProperty("occupancyCapacity") - @ExcludeMissing fun occupancyCapacity(occupancyCapacity: JsonField) = apply { this.occupancyCapacity = occupancyCapacity } @@ -1204,8 +1225,6 @@ private constructor( occupancyCount(JsonField.of(occupancyCount)) /** Current count of occupants in the transit vehicle. */ - @JsonProperty("occupancyCount") - @ExcludeMissing fun occupancyCount(occupancyCount: JsonField) = apply { this.occupancyCount = occupancyCount } @@ -1215,8 +1234,6 @@ private constructor( occupancyStatus(JsonField.of(occupancyStatus)) /** Current occupancy status of the transit vehicle. */ - @JsonProperty("occupancyStatus") - @ExcludeMissing fun occupancyStatus(occupancyStatus: JsonField) = apply { this.occupancyStatus = occupancyStatus } @@ -1225,8 +1242,6 @@ private constructor( fun orientation(orientation: Double) = orientation(JsonField.of(orientation)) /** Orientation of the transit vehicle, represented as an angle in degrees. */ - @JsonProperty("orientation") - @ExcludeMissing fun orientation(orientation: JsonField) = apply { this.orientation = orientation } @@ -1235,24 +1250,18 @@ private constructor( fun phase(phase: String) = phase(JsonField.of(phase)) /** Current journey phase of the trip. */ - @JsonProperty("phase") - @ExcludeMissing fun phase(phase: JsonField) = apply { this.phase = phase } /** Current position of the transit vehicle. */ fun position(position: Position) = position(JsonField.of(position)) /** Current position of the transit vehicle. */ - @JsonProperty("position") - @ExcludeMissing fun position(position: JsonField) = apply { this.position = position } /** Indicates if real-time arrival info is available for this trip. */ fun predicted(predicted: Boolean) = predicted(JsonField.of(predicted)) /** Indicates if real-time arrival info is available for this trip. */ - @JsonProperty("predicted") - @ExcludeMissing fun predicted(predicted: JsonField) = apply { this.predicted = predicted } @@ -1268,8 +1277,6 @@ private constructor( * Deviation from the schedule in seconds (positive for late, negative for * early). */ - @JsonProperty("scheduleDeviation") - @ExcludeMissing fun scheduleDeviation(scheduleDeviation: JsonField) = apply { this.scheduleDeviation = scheduleDeviation } @@ -1285,8 +1292,6 @@ private constructor( * Distance, in meters, the transit vehicle is scheduled to have progressed * along the active trip. */ - @JsonProperty("scheduledDistanceAlongTrip") - @ExcludeMissing fun scheduledDistanceAlongTrip(scheduledDistanceAlongTrip: JsonField) = apply { this.scheduledDistanceAlongTrip = scheduledDistanceAlongTrip @@ -1302,8 +1307,6 @@ private constructor( * Time, in milliseconds since the Unix epoch, of midnight for the start of the * service date for the trip. */ - @JsonProperty("serviceDate") - @ExcludeMissing fun serviceDate(serviceDate: JsonField) = apply { this.serviceDate = serviceDate } @@ -1313,8 +1316,6 @@ private constructor( situationIds(JsonField.of(situationIds)) /** References to situation elements (if any) applicable to this trip. */ - @JsonProperty("situationIds") - @ExcludeMissing fun situationIds(situationIds: JsonField>) = apply { this.situationIds = situationIds @@ -1324,8 +1325,6 @@ private constructor( fun status(status: String) = status(JsonField.of(status)) /** Current status modifiers for the trip. */ - @JsonProperty("status") - @ExcludeMissing fun status(status: JsonField) = apply { this.status = status } /** Total length of the trip, in meters. */ @@ -1333,8 +1332,6 @@ private constructor( totalDistanceAlongTrip(JsonField.of(totalDistanceAlongTrip)) /** Total length of the trip, in meters. */ - @JsonProperty("totalDistanceAlongTrip") - @ExcludeMissing fun totalDistanceAlongTrip(totalDistanceAlongTrip: JsonField) = apply { this.totalDistanceAlongTrip = totalDistanceAlongTrip } @@ -1343,8 +1340,6 @@ private constructor( fun vehicleId(vehicleId: String) = vehicleId(JsonField.of(vehicleId)) /** ID of the transit vehicle currently serving the trip. */ - @JsonProperty("vehicleId") - @ExcludeMissing fun vehicleId(vehicleId: JsonField) = apply { this.vehicleId = vehicleId } @@ -1354,7 +1349,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1406,13 +1400,18 @@ private constructor( } /** Last known location of the transit vehicle. */ - @JsonDeserialize(builder = LastKnownLocation.Builder::class) @NoAutoDetect class LastKnownLocation + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the last known location of the transit vehicle. */ @@ -1466,16 +1465,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the last known location of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the last known location of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the last known location of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -1484,7 +1479,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } @@ -1528,13 +1522,18 @@ private constructor( } /** Current position of the transit vehicle. */ - @JsonDeserialize(builder = Position.Builder::class) @NoAutoDetect class Position + @JsonCreator private constructor( - private val lat: JsonField, - private val lon: JsonField, - private val additionalProperties: Map, + @JsonProperty("lat") + @ExcludeMissing + private val lat: JsonField = JsonMissing.of(), + @JsonProperty("lon") + @ExcludeMissing + private val lon: JsonField = JsonMissing.of(), + @JsonAnySetter + private val additionalProperties: Map = immutableEmptyMap(), ) { /** Latitude of the current position of the transit vehicle. */ @@ -1587,16 +1586,12 @@ private constructor( fun lat(lat: Double) = lat(JsonField.of(lat)) /** Latitude of the current position of the transit vehicle. */ - @JsonProperty("lat") - @ExcludeMissing fun lat(lat: JsonField) = apply { this.lat = lat } /** Longitude of the current position of the transit vehicle. */ fun lon(lon: Double) = lon(JsonField.of(lon)) /** Longitude of the current position of the transit vehicle. */ - @JsonProperty("lon") - @ExcludeMissing fun lon(lon: JsonField) = apply { this.lon = lon } fun additionalProperties(additionalProperties: Map) = @@ -1605,7 +1600,6 @@ private constructor( putAllAdditionalProperties(additionalProperties) } - @JsonAnySetter fun putAdditionalProperty(key: String, value: JsonValue) = apply { additionalProperties.put(key, value) } diff --git a/onebusaway-sdk-kotlin-core/src/test/kotlin/org/onebusaway/services/ErrorHandlingTest.kt b/onebusaway-sdk-kotlin-core/src/test/kotlin/org/onebusaway/services/ErrorHandlingTest.kt index cd80fbb..1162b3b 100644 --- a/onebusaway-sdk-kotlin-core/src/test/kotlin/org/onebusaway/services/ErrorHandlingTest.kt +++ b/onebusaway-sdk-kotlin-core/src/test/kotlin/org/onebusaway/services/ErrorHandlingTest.kt @@ -32,6 +32,7 @@ import org.onebusaway.errors.UnexpectedStatusCodeException import org.onebusaway.errors.UnprocessableEntityException import org.onebusaway.models.CurrentTimeRetrieveParams import org.onebusaway.models.CurrentTimeRetrieveResponse +import org.onebusaway.models.References @WireMockTest class ErrorHandlingTest { @@ -58,141 +59,182 @@ class ErrorHandlingTest { val expected = CurrentTimeRetrieveResponse.builder() - .putAdditionalProperty("code", JsonValue.from(0)) - .putAdditionalProperty("currentTime", JsonValue.from(0)) - .putAdditionalProperty("text", JsonValue.from("text")) - .putAdditionalProperty("version", JsonValue.from(0)) - .putAdditionalProperty( - "data", - JsonValue.from( - mapOf( - "entry" to mapOf("readableTime" to "readableTime", "time" to 0), - "references" to - mapOf( - "agencies" to - listOf( - mapOf( - "id" to "id", - "name" to "name", - "timezone" to "timezone", - "url" to "url", - "disclaimer" to "disclaimer", - "email" to "email", - "fareUrl" to "fareUrl", - "lang" to "lang", - "phone" to "phone", - "privateService" to true, + .code(0L) + .currentTime(0L) + .text("text") + .version(0L) + .data( + CurrentTimeRetrieveResponse.Data.builder() + .entry( + CurrentTimeRetrieveResponse.Data.Entry.builder() + .readableTime("readableTime") + .time(0L) + .build() + ) + .references( + References.builder() + .agencies( + listOf( + References.Agency.builder() + .id("id") + .name("name") + .timezone("timezone") + .url("url") + .disclaimer("disclaimer") + .email("email") + .fareUrl("fareUrl") + .lang("lang") + .phone("phone") + .privateService(true) + .build() + ) + ) + .routes( + listOf( + References.Route.builder() + .id("id") + .agencyId("agencyId") + .type(0L) + .color("color") + .description("description") + .longName("longName") + .nullSafeShortName("nullSafeShortName") + .shortName("shortName") + .textColor("textColor") + .url("url") + .build() + ) + ) + .situations( + listOf( + References.Situation.builder() + .id("id") + .creationTime(0L) + .activeWindows( + listOf( + References.Situation.ActiveWindow.builder() + .from(0L) + .to(0L) + .build() + ) ) - ), - "routes" to - listOf( - mapOf( - "id" to "id", - "agencyId" to "agencyId", - "type" to 0, - "color" to "color", - "description" to "description", - "longName" to "longName", - "nullSafeShortName" to "nullSafeShortName", - "shortName" to "shortName", - "textColor" to "textColor", - "url" to "url", + .allAffects( + listOf( + References.Situation.AllAffect.builder() + .agencyId("agencyId") + .applicationId("applicationId") + .directionId("directionId") + .routeId("routeId") + .stopId("stopId") + .tripId("tripId") + .build() + ) ) - ), - "situations" to - listOf( - mapOf( - "id" to "id", - "creationTime" to 0, - "activeWindows" to - listOf(mapOf("from" to 0, "to" to 0)), - "allAffects" to - listOf( - mapOf( - "agencyId" to "agencyId", - "applicationId" to "applicationId", - "directionId" to "directionId", - "routeId" to "routeId", - "stopId" to "stopId", - "tripId" to "tripId", - ) - ), - "consequenceMessage" to "consequenceMessage", - "consequences" to - listOf( - mapOf( - "condition" to "condition", - "conditionDetails" to - mapOf( - "diversionPath" to - mapOf( - "length" to 0, - "levels" to "levels", - "points" to "points", - ), - "diversionStopIds" to - listOf("string") + .consequenceMessage("consequenceMessage") + .consequences( + listOf( + References.Situation.Consequence.builder() + .condition("condition") + .conditionDetails( + References.Situation.Consequence + .ConditionDetails + .builder() + .diversionPath( + References.Situation.Consequence + .ConditionDetails + .DiversionPath + .builder() + .length(0L) + .levels("levels") + .points("points") + .build() ) + .diversionStopIds(listOf("string")) + .build() ) - ), - "description" to - mapOf("lang" to "lang", "value" to "value"), - "publicationWindows" to - listOf(mapOf("from" to 0, "to" to 0)), - "reason" to "equipmentReason", - "severity" to "severity", - "summary" to - mapOf("lang" to "lang", "value" to "value"), - "url" to - mapOf("lang" to "lang", "value" to "value"), + .build() + ) ) - ), - "stops" to - listOf( - mapOf( - "id" to "id", - "lat" to 0, - "lon" to 0, - "name" to "name", - "parent" to "parent", - "routeIds" to listOf("string"), - "staticRouteIds" to listOf("string"), - "code" to "code", - "direction" to "direction", - "locationType" to 0, - "wheelchairBoarding" to "wheelchairBoarding", + .description( + References.Situation.Description.builder() + .lang("lang") + .value("value") + .build() ) - ), - "stopTimes" to - listOf( - mapOf( - "arrivalTime" to 0, - "departureTime" to 0, - "distanceAlongTrip" to 0, - "historicalOccupancy" to "historicalOccupancy", - "stopHeadsign" to "stopHeadsign", - "stopId" to "stopId", + .publicationWindows( + listOf( + References.Situation.PublicationWindow.builder() + .from(0L) + .to(0L) + .build() + ) ) - ), - "trips" to - listOf( - mapOf( - "id" to "id", - "routeId" to "routeId", - "serviceId" to "serviceId", - "blockId" to "blockId", - "directionId" to "directionId", - "peakOffpeak" to 0, - "routeShortName" to "routeShortName", - "shapeId" to "shapeId", - "timeZone" to "timeZone", - "tripHeadsign" to "tripHeadsign", - "tripShortName" to "tripShortName", + .reason(References.Situation.Reason.EQUIPMENT_REASON) + .severity("severity") + .summary( + References.Situation.Summary.builder() + .lang("lang") + .value("value") + .build() ) - ), + .url( + References.Situation.Url.builder() + .lang("lang") + .value("value") + .build() + ) + .build() + ) + ) + .stops( + listOf( + References.Stop.builder() + .id("id") + .lat(0.0) + .lon(0.0) + .name("name") + .parent("parent") + .routeIds(listOf("string")) + .staticRouteIds(listOf("string")) + .code("code") + .direction("direction") + .locationType(0L) + .wheelchairBoarding("wheelchairBoarding") + .build() + ) + ) + .stopTimes( + listOf( + References.StopTime.builder() + .arrivalTime(0L) + .departureTime(0L) + .distanceAlongTrip(0.0) + .historicalOccupancy("historicalOccupancy") + .stopHeadsign("stopHeadsign") + .stopId("stopId") + .build() + ) + ) + .trips( + listOf( + References.Trip.builder() + .id("id") + .routeId("routeId") + .serviceId("serviceId") + .blockId("blockId") + .directionId("directionId") + .peakOffpeak(0L) + .routeShortName("routeShortName") + .shapeId("shapeId") + .timeZone("timeZone") + .tripHeadsign("tripHeadsign") + .tripShortName("tripShortName") + .build() + ) ) + .build() ) - ) + .build() ) .build() diff --git a/onebusaway-sdk-kotlin-core/src/test/kotlin/org/onebusaway/services/ServiceParamsTest.kt b/onebusaway-sdk-kotlin-core/src/test/kotlin/org/onebusaway/services/ServiceParamsTest.kt index 5d0e53f..34c128c 100644 --- a/onebusaway-sdk-kotlin-core/src/test/kotlin/org/onebusaway/services/ServiceParamsTest.kt +++ b/onebusaway-sdk-kotlin-core/src/test/kotlin/org/onebusaway/services/ServiceParamsTest.kt @@ -16,10 +16,10 @@ import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.onebusaway.client.OnebusawaySdkClient import org.onebusaway.client.okhttp.OnebusawaySdkOkHttpClient -import org.onebusaway.core.JsonValue import org.onebusaway.core.jsonMapper import org.onebusaway.models.CurrentTimeRetrieveParams import org.onebusaway.models.CurrentTimeRetrieveResponse +import org.onebusaway.models.References @WireMockTest class ServiceParamsTest { @@ -55,141 +55,182 @@ class ServiceParamsTest { val apiResponse = CurrentTimeRetrieveResponse.builder() - .putAdditionalProperty("code", JsonValue.from(0)) - .putAdditionalProperty("currentTime", JsonValue.from(0)) - .putAdditionalProperty("text", JsonValue.from("text")) - .putAdditionalProperty("version", JsonValue.from(0)) - .putAdditionalProperty( - "data", - JsonValue.from( - mapOf( - "entry" to mapOf("readableTime" to "readableTime", "time" to 0), - "references" to - mapOf( - "agencies" to - listOf( - mapOf( - "id" to "id", - "name" to "name", - "timezone" to "timezone", - "url" to "url", - "disclaimer" to "disclaimer", - "email" to "email", - "fareUrl" to "fareUrl", - "lang" to "lang", - "phone" to "phone", - "privateService" to true, + .code(0L) + .currentTime(0L) + .text("text") + .version(0L) + .data( + CurrentTimeRetrieveResponse.Data.builder() + .entry( + CurrentTimeRetrieveResponse.Data.Entry.builder() + .readableTime("readableTime") + .time(0L) + .build() + ) + .references( + References.builder() + .agencies( + listOf( + References.Agency.builder() + .id("id") + .name("name") + .timezone("timezone") + .url("url") + .disclaimer("disclaimer") + .email("email") + .fareUrl("fareUrl") + .lang("lang") + .phone("phone") + .privateService(true) + .build() + ) + ) + .routes( + listOf( + References.Route.builder() + .id("id") + .agencyId("agencyId") + .type(0L) + .color("color") + .description("description") + .longName("longName") + .nullSafeShortName("nullSafeShortName") + .shortName("shortName") + .textColor("textColor") + .url("url") + .build() + ) + ) + .situations( + listOf( + References.Situation.builder() + .id("id") + .creationTime(0L) + .activeWindows( + listOf( + References.Situation.ActiveWindow.builder() + .from(0L) + .to(0L) + .build() + ) ) - ), - "routes" to - listOf( - mapOf( - "id" to "id", - "agencyId" to "agencyId", - "type" to 0, - "color" to "color", - "description" to "description", - "longName" to "longName", - "nullSafeShortName" to "nullSafeShortName", - "shortName" to "shortName", - "textColor" to "textColor", - "url" to "url", + .allAffects( + listOf( + References.Situation.AllAffect.builder() + .agencyId("agencyId") + .applicationId("applicationId") + .directionId("directionId") + .routeId("routeId") + .stopId("stopId") + .tripId("tripId") + .build() + ) ) - ), - "situations" to - listOf( - mapOf( - "id" to "id", - "creationTime" to 0, - "activeWindows" to - listOf(mapOf("from" to 0, "to" to 0)), - "allAffects" to - listOf( - mapOf( - "agencyId" to "agencyId", - "applicationId" to "applicationId", - "directionId" to "directionId", - "routeId" to "routeId", - "stopId" to "stopId", - "tripId" to "tripId", - ) - ), - "consequenceMessage" to "consequenceMessage", - "consequences" to - listOf( - mapOf( - "condition" to "condition", - "conditionDetails" to - mapOf( - "diversionPath" to - mapOf( - "length" to 0, - "levels" to "levels", - "points" to "points", - ), - "diversionStopIds" to - listOf("string") + .consequenceMessage("consequenceMessage") + .consequences( + listOf( + References.Situation.Consequence.builder() + .condition("condition") + .conditionDetails( + References.Situation.Consequence + .ConditionDetails + .builder() + .diversionPath( + References.Situation.Consequence + .ConditionDetails + .DiversionPath + .builder() + .length(0L) + .levels("levels") + .points("points") + .build() ) + .diversionStopIds(listOf("string")) + .build() ) - ), - "description" to - mapOf("lang" to "lang", "value" to "value"), - "publicationWindows" to - listOf(mapOf("from" to 0, "to" to 0)), - "reason" to "equipmentReason", - "severity" to "severity", - "summary" to - mapOf("lang" to "lang", "value" to "value"), - "url" to - mapOf("lang" to "lang", "value" to "value"), + .build() + ) ) - ), - "stops" to - listOf( - mapOf( - "id" to "id", - "lat" to 0, - "lon" to 0, - "name" to "name", - "parent" to "parent", - "routeIds" to listOf("string"), - "staticRouteIds" to listOf("string"), - "code" to "code", - "direction" to "direction", - "locationType" to 0, - "wheelchairBoarding" to "wheelchairBoarding", + .description( + References.Situation.Description.builder() + .lang("lang") + .value("value") + .build() ) - ), - "stopTimes" to - listOf( - mapOf( - "arrivalTime" to 0, - "departureTime" to 0, - "distanceAlongTrip" to 0, - "historicalOccupancy" to "historicalOccupancy", - "stopHeadsign" to "stopHeadsign", - "stopId" to "stopId", + .publicationWindows( + listOf( + References.Situation.PublicationWindow.builder() + .from(0L) + .to(0L) + .build() + ) ) - ), - "trips" to - listOf( - mapOf( - "id" to "id", - "routeId" to "routeId", - "serviceId" to "serviceId", - "blockId" to "blockId", - "directionId" to "directionId", - "peakOffpeak" to 0, - "routeShortName" to "routeShortName", - "shapeId" to "shapeId", - "timeZone" to "timeZone", - "tripHeadsign" to "tripHeadsign", - "tripShortName" to "tripShortName", + .reason(References.Situation.Reason.EQUIPMENT_REASON) + .severity("severity") + .summary( + References.Situation.Summary.builder() + .lang("lang") + .value("value") + .build() ) - ), + .url( + References.Situation.Url.builder() + .lang("lang") + .value("value") + .build() + ) + .build() + ) + ) + .stops( + listOf( + References.Stop.builder() + .id("id") + .lat(0.0) + .lon(0.0) + .name("name") + .parent("parent") + .routeIds(listOf("string")) + .staticRouteIds(listOf("string")) + .code("code") + .direction("direction") + .locationType(0L) + .wheelchairBoarding("wheelchairBoarding") + .build() + ) + ) + .stopTimes( + listOf( + References.StopTime.builder() + .arrivalTime(0L) + .departureTime(0L) + .distanceAlongTrip(0.0) + .historicalOccupancy("historicalOccupancy") + .stopHeadsign("stopHeadsign") + .stopId("stopId") + .build() + ) + ) + .trips( + listOf( + References.Trip.builder() + .id("id") + .routeId("routeId") + .serviceId("serviceId") + .blockId("blockId") + .directionId("directionId") + .peakOffpeak(0L) + .routeShortName("routeShortName") + .shapeId("shapeId") + .timeZone("timeZone") + .tripHeadsign("tripHeadsign") + .tripShortName("tripShortName") + .build() + ) ) + .build() ) - ) + .build() ) .build()