From 39eac341473071dfa331f359730f0371df3ba71e Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 22 Oct 2024 21:52:19 +0000 Subject: [PATCH] feat(api): api update (#19) --- .../onebusaway/client/okhttp/OkHttpClient.kt | 44 ++---- .../okhttp/OnebusawaySdkOkHttpClient.kt | 7 +- .../okhttp/OnebusawaySdkOkHttpClientAsync.kt | 7 +- .../onebusaway/client/OnebusawaySdkClient.kt | 2 - .../client/OnebusawaySdkClientAsync.kt | 2 - .../client/OnebusawaySdkClientAsyncImpl.kt | 5 - .../client/OnebusawaySdkClientImpl.kt | 5 - .../org/onebusaway/core/HttpRequestBodies.kt | 111 +++++++++++++++ .../kotlin/org/onebusaway/core/Properties.kt | 13 +- .../main/kotlin/org/onebusaway/core/Values.kt | 5 +- .../onebusaway/core/handlers/ErrorHandler.kt | 127 ++++++++++++++++++ .../onebusaway/core/handlers/JsonHandler.kt | 21 +++ .../onebusaway/core/handlers/StringHandler.kt | 13 ++ .../org/onebusaway/core/http/HttpClient.kt | 4 + .../org/onebusaway/core/http/HttpRequest.kt | 2 +- .../core/http/RetryingHttpClient.kt | 2 - .../AgenciesWithCoverageServiceAsyncImpl.kt | 6 +- .../services/async/AgencyServiceAsyncImpl.kt | 6 +- .../ArrivalAndDepartureServiceAsyncImpl.kt | 6 +- .../services/async/BlockServiceAsyncImpl.kt | 6 +- .../services/async/ConfigServiceAsyncImpl.kt | 6 +- .../async/CurrentTimeServiceAsyncImpl.kt | 6 +- .../ReportProblemWithStopServiceAsyncImpl.kt | 6 +- .../ReportProblemWithTripServiceAsyncImpl.kt | 6 +- .../RouteIdsForAgencyServiceAsyncImpl.kt | 6 +- .../services/async/RouteServiceAsyncImpl.kt | 6 +- .../async/RoutesForAgencyServiceAsyncImpl.kt | 6 +- .../RoutesForLocationServiceAsyncImpl.kt | 6 +- .../async/ScheduleForRouteServiceAsyncImpl.kt | 6 +- .../async/ScheduleForStopServiceAsyncImpl.kt | 6 +- .../async/SearchForRouteServiceAsyncImpl.kt | 6 +- .../async/SearchForStopServiceAsyncImpl.kt | 6 +- .../services/async/ShapeServiceAsyncImpl.kt | 6 +- .../async/StopIdsForAgencyServiceAsyncImpl.kt | 6 +- .../services/async/StopServiceAsyncImpl.kt | 6 +- .../async/StopsForLocationServiceAsyncImpl.kt | 6 +- .../async/StopsForRouteServiceAsyncImpl.kt | 6 +- .../async/TripDetailServiceAsyncImpl.kt | 6 +- .../async/TripForVehicleServiceAsyncImpl.kt | 6 +- .../services/async/TripServiceAsyncImpl.kt | 6 +- .../async/TripsForLocationServiceAsyncImpl.kt | 6 +- .../async/TripsForRouteServiceAsyncImpl.kt | 6 +- .../VehiclesForAgencyServiceAsyncImpl.kt | 6 +- .../AgenciesWithCoverageServiceImpl.kt | 6 +- .../services/blocking/AgencyServiceImpl.kt | 6 +- .../ArrivalAndDepartureServiceImpl.kt | 6 +- .../services/blocking/BlockServiceImpl.kt | 6 +- .../services/blocking/ConfigServiceImpl.kt | 6 +- .../blocking/CurrentTimeServiceImpl.kt | 6 +- .../ReportProblemWithStopServiceImpl.kt | 6 +- .../ReportProblemWithTripServiceImpl.kt | 6 +- .../blocking/RouteIdsForAgencyServiceImpl.kt | 6 +- .../services/blocking/RouteServiceImpl.kt | 6 +- .../blocking/RoutesForAgencyServiceImpl.kt | 6 +- .../blocking/RoutesForLocationServiceImpl.kt | 6 +- .../blocking/ScheduleForRouteServiceImpl.kt | 6 +- .../blocking/ScheduleForStopServiceImpl.kt | 6 +- .../blocking/SearchForRouteServiceImpl.kt | 6 +- .../blocking/SearchForStopServiceImpl.kt | 6 +- .../services/blocking/ShapeServiceImpl.kt | 6 +- .../blocking/StopIdsForAgencyServiceImpl.kt | 6 +- .../services/blocking/StopServiceImpl.kt | 6 +- .../blocking/StopsForLocationServiceImpl.kt | 6 +- .../blocking/StopsForRouteServiceImpl.kt | 6 +- .../blocking/TripDetailServiceImpl.kt | 6 +- .../blocking/TripForVehicleServiceImpl.kt | 6 +- .../services/blocking/TripServiceImpl.kt | 6 +- .../blocking/TripsForLocationServiceImpl.kt | 6 +- .../blocking/TripsForRouteServiceImpl.kt | 6 +- .../blocking/VehiclesForAgencyServiceImpl.kt | 6 +- 70 files changed, 463 insertions(+), 231 deletions(-) create mode 100644 onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/HttpRequestBodies.kt create mode 100644 onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/ErrorHandler.kt create mode 100644 onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/JsonHandler.kt create mode 100644 onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/StringHandler.kt diff --git a/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OkHttpClient.kt b/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OkHttpClient.kt index cb77944..427df17 100644 --- a/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OkHttpClient.kt +++ b/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OkHttpClient.kt @@ -66,7 +66,6 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val request.body?.run { future.whenComplete { _, _ -> close() } } val call = getClient(requestOptions).newCall(request.toRequest()) - call.enqueue( object : Callback { override fun onResponse(call: Call, response: Response) { @@ -90,7 +89,7 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val private fun HttpRequest.toRequest(): Request { var body: RequestBody? = body?.toRequestBody() - // OkHttpClient always requires a request body for PUT and POST methods + // OkHttpClient always requires a request body for PUT and POST methods. if (body == null && (method == HttpMethod.PUT || method == HttpMethod.POST)) { body = "".toRequestBody() } @@ -118,21 +117,13 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val val length = contentLength() return object : RequestBody() { - override fun contentType(): MediaType? { - return mediaType - } + override fun contentType(): MediaType? = mediaType - override fun contentLength(): Long { - return length - } + override fun contentLength(): Long = length - override fun isOneShot(): Boolean { - return !repeatable() - } + override fun isOneShot(): Boolean = !repeatable() - override fun writeTo(sink: BufferedSink) { - writeTo(sink.outputStream()) - } + override fun writeTo(sink: BufferedSink) = writeTo(sink.outputStream()) } } @@ -140,21 +131,13 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val val headers = headers.toHeaders() return object : HttpResponse { - override fun statusCode(): Int { - return code - } + override fun statusCode(): Int = code - override fun headers(): ListMultimap { - return headers - } + override fun headers(): ListMultimap = headers - override fun body(): InputStream { - return body!!.byteStream() - } + override fun body(): InputStream = body!!.byteStream() - override fun close() { - body!!.close() - } + override fun close() = body!!.close() } } @@ -163,9 +146,7 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val MultimapBuilder.treeKeys(String.CASE_INSENSITIVE_ORDER) .arrayListValues() .build() - forEach { pair -> headers.put(pair.first, pair.second) } - return headers } @@ -176,7 +157,7 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val class Builder { private var baseUrl: HttpUrl? = null - // default timeout is 1 minute + // The default timeout is 1 minute. private var timeout: Duration = Duration.ofSeconds(60) private var proxy: Proxy? = null @@ -186,8 +167,8 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val fun proxy(proxy: Proxy?) = apply { this.proxy = proxy } - fun build(): OkHttpClient { - return OkHttpClient( + fun build(): OkHttpClient = + OkHttpClient( okhttp3.OkHttpClient.Builder() .connectTimeout(timeout) .readTimeout(timeout) @@ -197,6 +178,5 @@ private constructor(private val okHttpClient: okhttp3.OkHttpClient, private val .build(), checkNotNull(baseUrl) { "`baseUrl` is required but was not set" }, ) - } } } diff --git a/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OnebusawaySdkOkHttpClient.kt b/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OnebusawaySdkOkHttpClient.kt index 23df947..fd30fd4 100644 --- a/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OnebusawaySdkOkHttpClient.kt +++ b/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OnebusawaySdkOkHttpClient.kt @@ -23,7 +23,7 @@ class OnebusawaySdkOkHttpClient private constructor() { private var clientOptions: ClientOptions.Builder = ClientOptions.builder() private var baseUrl: String = ClientOptions.PRODUCTION_URL - // default timeout for client is 1 minute + // The default timeout for the client is 1 minute. private var timeout: Duration = Duration.ofSeconds(60) private var proxy: Proxy? = null @@ -66,8 +66,8 @@ class OnebusawaySdkOkHttpClient private constructor() { fun fromEnv() = apply { clientOptions.fromEnv() } - fun build(): OnebusawaySdkClient { - return OnebusawaySdkClientImpl( + fun build(): OnebusawaySdkClient = + OnebusawaySdkClientImpl( clientOptions .httpClient( OkHttpClient.builder() @@ -78,6 +78,5 @@ class OnebusawaySdkOkHttpClient private constructor() { ) .build() ) - } } } diff --git a/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OnebusawaySdkOkHttpClientAsync.kt b/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OnebusawaySdkOkHttpClientAsync.kt index 9ab220e..1611a81 100644 --- a/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OnebusawaySdkOkHttpClientAsync.kt +++ b/onebusaway-sdk-java-client-okhttp/src/main/kotlin/org/onebusaway/client/okhttp/OnebusawaySdkOkHttpClientAsync.kt @@ -23,7 +23,7 @@ class OnebusawaySdkOkHttpClientAsync private constructor() { private var clientOptions: ClientOptions.Builder = ClientOptions.builder() private var baseUrl: String = ClientOptions.PRODUCTION_URL - // default timeout for client is 1 minute + // The default timeout for the client is 1 minute. private var timeout: Duration = Duration.ofSeconds(60) private var proxy: Proxy? = null @@ -66,8 +66,8 @@ class OnebusawaySdkOkHttpClientAsync private constructor() { fun fromEnv() = apply { clientOptions.fromEnv() } - fun build(): OnebusawaySdkClientAsync { - return OnebusawaySdkClientAsyncImpl( + fun build(): OnebusawaySdkClientAsync = + OnebusawaySdkClientAsyncImpl( clientOptions .httpClient( OkHttpClient.builder() @@ -78,6 +78,5 @@ class OnebusawaySdkOkHttpClientAsync private constructor() { ) .build() ) - } } } diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClient.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClient.kt index cc47378..1c53a82 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClient.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClient.kt @@ -1,7 +1,5 @@ // File generated from our OpenAPI spec by Stainless. -@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102 - package org.onebusaway.client import org.onebusaway.models.* diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientAsync.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientAsync.kt index 173a99b..d257b1c 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientAsync.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientAsync.kt @@ -1,7 +1,5 @@ // File generated from our OpenAPI spec by Stainless. -@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102 - package org.onebusaway.client import org.onebusaway.models.* diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientAsyncImpl.kt index bb2e134..2c36662 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientAsyncImpl.kt @@ -3,19 +3,14 @@ package org.onebusaway.client import org.onebusaway.core.ClientOptions -import org.onebusaway.core.http.HttpResponse.Handler -import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.* import org.onebusaway.services.async.* -import org.onebusaway.services.errorHandler class OnebusawaySdkClientAsyncImpl constructor( private val clientOptions: ClientOptions, ) : OnebusawaySdkClientAsync { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) - private val sync: OnebusawaySdkClient by lazy { OnebusawaySdkClientImpl(clientOptions) } private val agenciesWithCoverage: AgenciesWithCoverageServiceAsync by lazy { diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientImpl.kt index a763cbc..7bf3ce1 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/client/OnebusawaySdkClientImpl.kt @@ -3,19 +3,14 @@ package org.onebusaway.client import org.onebusaway.core.ClientOptions -import org.onebusaway.core.http.HttpResponse.Handler -import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.* import org.onebusaway.services.blocking.* -import org.onebusaway.services.errorHandler class OnebusawaySdkClientImpl constructor( private val clientOptions: ClientOptions, ) : OnebusawaySdkClient { - private val errorHandler: Handler = errorHandler(clientOptions.jsonMapper) - private val async: OnebusawaySdkClientAsync by lazy { OnebusawaySdkClientAsyncImpl(clientOptions) } diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/HttpRequestBodies.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/HttpRequestBodies.kt new file mode 100644 index 0000000..6794cf7 --- /dev/null +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/HttpRequestBodies.kt @@ -0,0 +1,111 @@ +@file:JvmName("HttpRequestBodies") + +package org.onebusaway.core + +import com.fasterxml.jackson.databind.json.JsonMapper +import java.io.ByteArrayOutputStream +import java.io.OutputStream +import org.apache.hc.client5.http.entity.mime.MultipartEntityBuilder +import org.onebusaway.core.http.HttpRequestBody +import org.onebusaway.errors.OnebusawaySdkException + +@JvmSynthetic +internal inline fun json( + jsonMapper: JsonMapper, + value: T, +): HttpRequestBody { + return object : HttpRequestBody { + private var cachedBytes: ByteArray? = null + + private fun serialize(): ByteArray { + if (cachedBytes != null) return cachedBytes!! + + val buffer = ByteArrayOutputStream() + try { + jsonMapper.writeValue(buffer, value) + cachedBytes = buffer.toByteArray() + return cachedBytes!! + } catch (e: Exception) { + throw OnebusawaySdkException("Error writing request", e) + } + } + + override fun writeTo(outputStream: OutputStream) { + outputStream.write(serialize()) + } + + override fun contentType(): String = "application/json" + + override fun contentLength(): Long { + return serialize().size.toLong() + } + + override fun repeatable(): Boolean = true + + override fun close() {} + } +} + +@JvmSynthetic +internal fun multipartFormData( + jsonMapper: JsonMapper, + parts: Array?> +): HttpRequestBody { + val builder = MultipartEntityBuilder.create() + parts.forEach { part -> + if (part?.value != null) { + when (part.value) { + is JsonValue -> { + val buffer = ByteArrayOutputStream() + try { + jsonMapper.writeValue(buffer, part.value) + } catch (e: Exception) { + throw OnebusawaySdkException("Error serializing value to json", e) + } + builder.addBinaryBody( + part.name, + buffer.toByteArray(), + part.contentType, + part.filename + ) + } + is Boolean -> + builder.addTextBody( + part.name, + if (part.value) "true" else "false", + part.contentType + ) + is Int -> builder.addTextBody(part.name, part.value.toString(), part.contentType) + is Long -> builder.addTextBody(part.name, part.value.toString(), part.contentType) + is Double -> builder.addTextBody(part.name, part.value.toString(), part.contentType) + is ByteArray -> + builder.addBinaryBody(part.name, part.value, part.contentType, part.filename) + is String -> builder.addTextBody(part.name, part.value, part.contentType) + is Enum -> builder.addTextBody(part.name, part.value.toString(), part.contentType) + else -> + throw IllegalArgumentException( + "Unsupported content type: ${part.value::class.java.simpleName}" + ) + } + } + } + val entity = builder.build() + + return object : HttpRequestBody { + override fun writeTo(outputStream: OutputStream) { + try { + return entity.writeTo(outputStream) + } catch (e: Exception) { + throw OnebusawaySdkException("Error writing request", e) + } + } + + override fun contentType(): String = entity.contentType + + override fun contentLength(): Long = -1 + + override fun repeatable(): Boolean = entity.isRepeatable + + override fun close() = entity.close() + } +} diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/Properties.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/Properties.kt index 2841e17..423b4ab 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/Properties.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/Properties.kt @@ -34,14 +34,9 @@ fun getOsName(): String { } } -fun getOsVersion(): String { - return System.getProperty("os.version", "unknown") -} +fun getOsVersion(): String = System.getProperty("os.version", "unknown") -fun getPackageVersion(): String { - return Properties::class.java.`package`.implementationVersion ?: "unknown" -} +fun getPackageVersion(): String = + Properties::class.java.`package`.implementationVersion ?: "unknown" -fun getJavaVersion(): String { - return System.getProperty("java.version", "unknown") -} +fun getJavaVersion(): String = System.getProperty("java.version", "unknown") diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/Values.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/Values.kt index c7fcb7e..a84c96b 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/Values.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/Values.kt @@ -481,9 +481,8 @@ internal constructor( } } - override fun toString(): String { - return "MultipartFormValue(name='$name', contentType=$contentType, filename=$filename, value=${valueToString()})" - } + override fun toString(): String = + "MultipartFormValue{name=$name, contentType=$contentType, filename=$filename, value=${valueToString()}}" private fun valueToString(): String = when (value) { diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/ErrorHandler.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/ErrorHandler.kt new file mode 100644 index 0000000..f7938ba --- /dev/null +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/ErrorHandler.kt @@ -0,0 +1,127 @@ +@file:JvmName("ErrorHandler") + +package org.onebusaway.core.handlers + +import com.fasterxml.jackson.databind.json.JsonMapper +import com.google.common.collect.ListMultimap +import java.io.ByteArrayInputStream +import java.io.InputStream +import org.onebusaway.core.http.HttpResponse +import org.onebusaway.core.http.HttpResponse.Handler +import org.onebusaway.errors.BadRequestException +import org.onebusaway.errors.InternalServerException +import org.onebusaway.errors.NotFoundException +import org.onebusaway.errors.OnebusawaySdkError +import org.onebusaway.errors.PermissionDeniedException +import org.onebusaway.errors.RateLimitException +import org.onebusaway.errors.UnauthorizedException +import org.onebusaway.errors.UnexpectedStatusCodeException +import org.onebusaway.errors.UnprocessableEntityException + +@JvmSynthetic +internal fun errorHandler(jsonMapper: JsonMapper): Handler { + val handler = jsonHandler(jsonMapper) + + return object : Handler { + override fun handle(response: HttpResponse): OnebusawaySdkError = + try { + handler.handle(response) + } catch (e: Exception) { + OnebusawaySdkError.builder().build() + } + } +} + +@JvmSynthetic +internal fun Handler.withErrorHandler( + errorHandler: Handler +): Handler = + object : Handler { + override fun handle(response: HttpResponse): T { + when (val statusCode = response.statusCode()) { + in 200..299 -> { + return this@withErrorHandler.handle(response) + } + 400 -> { + val buffered = response.buffered() + throw BadRequestException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + 401 -> { + val buffered = response.buffered() + throw UnauthorizedException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + 403 -> { + val buffered = response.buffered() + throw PermissionDeniedException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + 404 -> { + val buffered = response.buffered() + throw NotFoundException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + 422 -> { + val buffered = response.buffered() + throw UnprocessableEntityException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + 429 -> { + val buffered = response.buffered() + throw RateLimitException( + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + in 500..599 -> { + val buffered = response.buffered() + throw InternalServerException( + statusCode, + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + else -> { + val buffered = response.buffered() + throw UnexpectedStatusCodeException( + statusCode, + buffered.headers(), + stringHandler().handle(buffered), + errorHandler.handle(buffered), + ) + } + } + } + } + +private fun HttpResponse.buffered(): HttpResponse { + val body = body().readBytes() + + return object : HttpResponse { + override fun statusCode(): Int = this@buffered.statusCode() + + override fun headers(): ListMultimap = this@buffered.headers() + + override fun body(): InputStream = ByteArrayInputStream(body) + + override fun close() = this@buffered.close() + } +} diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/JsonHandler.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/JsonHandler.kt new file mode 100644 index 0000000..6ae84af --- /dev/null +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/JsonHandler.kt @@ -0,0 +1,21 @@ +@file:JvmName("JsonHandler") + +package org.onebusaway.core.handlers + +import com.fasterxml.jackson.databind.json.JsonMapper +import com.fasterxml.jackson.module.kotlin.jacksonTypeRef +import org.onebusaway.core.http.HttpResponse +import org.onebusaway.core.http.HttpResponse.Handler +import org.onebusaway.errors.OnebusawaySdkException + +@JvmSynthetic +internal inline fun jsonHandler(jsonMapper: JsonMapper): Handler = + object : Handler { + override fun handle(response: HttpResponse): T { + try { + return jsonMapper.readValue(response.body(), jacksonTypeRef()) + } catch (e: Exception) { + throw OnebusawaySdkException("Error reading response", e) + } + } + } diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/StringHandler.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/StringHandler.kt new file mode 100644 index 0000000..ede64e9 --- /dev/null +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/handlers/StringHandler.kt @@ -0,0 +1,13 @@ +@file:JvmName("StringHandler") + +package org.onebusaway.core.handlers + +import org.onebusaway.core.http.HttpResponse +import org.onebusaway.core.http.HttpResponse.Handler + +@JvmSynthetic internal fun stringHandler(): Handler = StringHandlerInternal + +private object StringHandlerInternal : Handler { + override fun handle(response: HttpResponse): String = + response.body().readBytes().toString(Charsets.UTF_8) +} diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/HttpClient.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/HttpClient.kt index 81f4ab3..bb0f294 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/HttpClient.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/HttpClient.kt @@ -1,3 +1,5 @@ +@file:Suppress("OVERLOADS_INTERFACE") // See https://youtrack.jetbrains.com/issue/KT-36102 + package org.onebusaway.core.http import java.lang.AutoCloseable @@ -6,11 +8,13 @@ import org.onebusaway.core.RequestOptions interface HttpClient : AutoCloseable { + @JvmOverloads fun execute( request: HttpRequest, requestOptions: RequestOptions = RequestOptions.none(), ): HttpResponse + @JvmOverloads fun executeAsync( request: HttpRequest, requestOptions: RequestOptions = RequestOptions.none(), diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/HttpRequest.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/HttpRequest.kt index 1c907cb..55d20cc 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/HttpRequest.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/HttpRequest.kt @@ -17,7 +17,7 @@ private constructor( ) { override fun toString(): String = - "HttpRequest {method=$method, pathSegments=$pathSegments, queryParams=$queryParams, headers=$headers, body=$body}" + "HttpRequest{method=$method, pathSegments=$pathSegments, queryParams=$queryParams, headers=$headers, body=$body}" companion object { @JvmStatic fun builder() = Builder() diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/RetryingHttpClient.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/RetryingHttpClient.kt index f2f8118..327eaaf 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/RetryingHttpClient.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/RetryingHttpClient.kt @@ -1,5 +1,3 @@ -@file:JvmSynthetic - package org.onebusaway.core.http import com.google.common.util.concurrent.MoreExecutors diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/AgenciesWithCoverageServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/AgenciesWithCoverageServiceAsyncImpl.kt index 2446a0d..1523b51 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/AgenciesWithCoverageServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/AgenciesWithCoverageServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.AgenciesWithCoverageListParams import org.onebusaway.models.AgenciesWithCoverageListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class AgenciesWithCoverageServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/AgencyServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/AgencyServiceAsyncImpl.kt index bb4f178..c396fdb 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/AgencyServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/AgencyServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.AgencyRetrieveParams import org.onebusaway.models.AgencyRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class AgencyServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ArrivalAndDepartureServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ArrivalAndDepartureServiceAsyncImpl.kt index be09800..2ede1c3 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ArrivalAndDepartureServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ArrivalAndDepartureServiceAsyncImpl.kt @@ -5,6 +5,9 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler @@ -13,9 +16,6 @@ import org.onebusaway.models.ArrivalAndDepartureListParams import org.onebusaway.models.ArrivalAndDepartureListResponse import org.onebusaway.models.ArrivalAndDepartureRetrieveParams import org.onebusaway.models.ArrivalAndDepartureRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ArrivalAndDepartureServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/BlockServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/BlockServiceAsyncImpl.kt index 3b8a3fd..69ef051 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/BlockServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/BlockServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.BlockRetrieveParams import org.onebusaway.models.BlockRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class BlockServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ConfigServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ConfigServiceAsyncImpl.kt index 5178a39..111b321 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ConfigServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ConfigServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ConfigRetrieveParams import org.onebusaway.models.ConfigRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ConfigServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/CurrentTimeServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/CurrentTimeServiceAsyncImpl.kt index 8ac708d..a120a36 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/CurrentTimeServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/CurrentTimeServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.CurrentTimeRetrieveParams import org.onebusaway.models.CurrentTimeRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class CurrentTimeServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ReportProblemWithStopServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ReportProblemWithStopServiceAsyncImpl.kt index 728ecf6..7ace209 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ReportProblemWithStopServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ReportProblemWithStopServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ReportProblemWithStopRetrieveParams import org.onebusaway.models.ResponseWrapper -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ReportProblemWithStopServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ReportProblemWithTripServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ReportProblemWithTripServiceAsyncImpl.kt index 6287758..59f2d1a 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ReportProblemWithTripServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ReportProblemWithTripServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ReportProblemWithTripRetrieveParams import org.onebusaway.models.ResponseWrapper -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ReportProblemWithTripServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RouteIdsForAgencyServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RouteIdsForAgencyServiceAsyncImpl.kt index 7bdf0ce..026243d 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RouteIdsForAgencyServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RouteIdsForAgencyServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.RouteIdsForAgencyListParams import org.onebusaway.models.RouteIdsForAgencyListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class RouteIdsForAgencyServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RouteServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RouteServiceAsyncImpl.kt index fc0c38b..4837283 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RouteServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RouteServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.RouteRetrieveParams import org.onebusaway.models.RouteRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class RouteServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RoutesForAgencyServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RoutesForAgencyServiceAsyncImpl.kt index 9f99faa..8f5276c 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RoutesForAgencyServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RoutesForAgencyServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.RoutesForAgencyListParams import org.onebusaway.models.RoutesForAgencyListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class RoutesForAgencyServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RoutesForLocationServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RoutesForLocationServiceAsyncImpl.kt index b736020..c398b8d 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RoutesForLocationServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/RoutesForLocationServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.RoutesForLocationListParams import org.onebusaway.models.RoutesForLocationListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class RoutesForLocationServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ScheduleForRouteServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ScheduleForRouteServiceAsyncImpl.kt index 287d0de..b4f9c20 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ScheduleForRouteServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ScheduleForRouteServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ScheduleForRouteRetrieveParams import org.onebusaway.models.ScheduleForRouteRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ScheduleForRouteServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ScheduleForStopServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ScheduleForStopServiceAsyncImpl.kt index b1548e6..4110bb6 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ScheduleForStopServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ScheduleForStopServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ScheduleForStopRetrieveParams import org.onebusaway.models.ScheduleForStopRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ScheduleForStopServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/SearchForRouteServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/SearchForRouteServiceAsyncImpl.kt index 5ef1339..195ac7b 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/SearchForRouteServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/SearchForRouteServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.SearchForRouteListParams import org.onebusaway.models.SearchForRouteListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class SearchForRouteServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/SearchForStopServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/SearchForStopServiceAsyncImpl.kt index 2512ff2..6258c81 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/SearchForStopServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/SearchForStopServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.SearchForStopListParams import org.onebusaway.models.SearchForStopListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class SearchForStopServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ShapeServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ShapeServiceAsyncImpl.kt index 73e0dca..c72ff95 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ShapeServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/ShapeServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ShapeRetrieveParams import org.onebusaway.models.ShapeRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ShapeServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopIdsForAgencyServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopIdsForAgencyServiceAsyncImpl.kt index b13ec88..c1453a3 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopIdsForAgencyServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopIdsForAgencyServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.StopIdsForAgencyListParams import org.onebusaway.models.StopIdsForAgencyListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class StopIdsForAgencyServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopServiceAsyncImpl.kt index 6cc9f17..139276d 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.StopRetrieveParams import org.onebusaway.models.StopRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class StopServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopsForLocationServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopsForLocationServiceAsyncImpl.kt index bcf7e51..324796b 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopsForLocationServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopsForLocationServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.StopsForLocationListParams import org.onebusaway.models.StopsForLocationListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class StopsForLocationServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopsForRouteServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopsForRouteServiceAsyncImpl.kt index fa32255..03ce4fc 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopsForRouteServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/StopsForRouteServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.StopsForRouteListParams import org.onebusaway.models.StopsForRouteListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class StopsForRouteServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripDetailServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripDetailServiceAsyncImpl.kt index c39917d..eaf8302 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripDetailServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripDetailServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.TripDetailRetrieveParams import org.onebusaway.models.TripDetailRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class TripDetailServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripForVehicleServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripForVehicleServiceAsyncImpl.kt index 930c2cd..5967310 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripForVehicleServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripForVehicleServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.TripForVehicleRetrieveParams import org.onebusaway.models.TripForVehicleRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class TripForVehicleServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripServiceAsyncImpl.kt index 98d0d6e..9f2f094 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.TripRetrieveParams import org.onebusaway.models.TripRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class TripServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripsForLocationServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripsForLocationServiceAsyncImpl.kt index 9867e2f..71968a7 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripsForLocationServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripsForLocationServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.TripsForLocationListParams import org.onebusaway.models.TripsForLocationListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class TripsForLocationServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripsForRouteServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripsForRouteServiceAsyncImpl.kt index aa15065..97d462a 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripsForRouteServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/TripsForRouteServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.TripsForRouteListParams import org.onebusaway.models.TripsForRouteListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class TripsForRouteServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/VehiclesForAgencyServiceAsyncImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/VehiclesForAgencyServiceAsyncImpl.kt index 4ff4337..022f1c9 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/VehiclesForAgencyServiceAsyncImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/async/VehiclesForAgencyServiceAsyncImpl.kt @@ -5,15 +5,15 @@ package org.onebusaway.services.async import java.util.concurrent.CompletableFuture import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.VehiclesForAgencyListParams import org.onebusaway.models.VehiclesForAgencyListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class VehiclesForAgencyServiceAsyncImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/AgenciesWithCoverageServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/AgenciesWithCoverageServiceImpl.kt index 6949e30..ffd81b0 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/AgenciesWithCoverageServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/AgenciesWithCoverageServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.AgenciesWithCoverageListParams import org.onebusaway.models.AgenciesWithCoverageListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class AgenciesWithCoverageServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/AgencyServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/AgencyServiceImpl.kt index 34581bf..ab2ebe2 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/AgencyServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/AgencyServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.AgencyRetrieveParams import org.onebusaway.models.AgencyRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class AgencyServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ArrivalAndDepartureServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ArrivalAndDepartureServiceImpl.kt index f9e1d83..b577e3f 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ArrivalAndDepartureServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ArrivalAndDepartureServiceImpl.kt @@ -4,6 +4,9 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler @@ -12,9 +15,6 @@ import org.onebusaway.models.ArrivalAndDepartureListParams import org.onebusaway.models.ArrivalAndDepartureListResponse import org.onebusaway.models.ArrivalAndDepartureRetrieveParams import org.onebusaway.models.ArrivalAndDepartureRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ArrivalAndDepartureServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/BlockServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/BlockServiceImpl.kt index c7f6035..2099f23 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/BlockServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/BlockServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.BlockRetrieveParams import org.onebusaway.models.BlockRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class BlockServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ConfigServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ConfigServiceImpl.kt index 11bf1de..08b8083 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ConfigServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ConfigServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ConfigRetrieveParams import org.onebusaway.models.ConfigRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ConfigServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/CurrentTimeServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/CurrentTimeServiceImpl.kt index c815b68..48be195 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/CurrentTimeServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/CurrentTimeServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.CurrentTimeRetrieveParams import org.onebusaway.models.CurrentTimeRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class CurrentTimeServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ReportProblemWithStopServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ReportProblemWithStopServiceImpl.kt index 30f58b0..feb5d4e 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ReportProblemWithStopServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ReportProblemWithStopServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ReportProblemWithStopRetrieveParams import org.onebusaway.models.ResponseWrapper -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ReportProblemWithStopServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ReportProblemWithTripServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ReportProblemWithTripServiceImpl.kt index ca39d2e..a8b27ed 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ReportProblemWithTripServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ReportProblemWithTripServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ReportProblemWithTripRetrieveParams import org.onebusaway.models.ResponseWrapper -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ReportProblemWithTripServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RouteIdsForAgencyServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RouteIdsForAgencyServiceImpl.kt index 9556e41..4b5acf3 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RouteIdsForAgencyServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RouteIdsForAgencyServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.RouteIdsForAgencyListParams import org.onebusaway.models.RouteIdsForAgencyListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class RouteIdsForAgencyServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RouteServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RouteServiceImpl.kt index f5299a4..9a0ff82 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RouteServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RouteServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.RouteRetrieveParams import org.onebusaway.models.RouteRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class RouteServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RoutesForAgencyServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RoutesForAgencyServiceImpl.kt index db16274..7992887 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RoutesForAgencyServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RoutesForAgencyServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.RoutesForAgencyListParams import org.onebusaway.models.RoutesForAgencyListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class RoutesForAgencyServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RoutesForLocationServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RoutesForLocationServiceImpl.kt index 37761a2..e03e208 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RoutesForLocationServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/RoutesForLocationServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.RoutesForLocationListParams import org.onebusaway.models.RoutesForLocationListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class RoutesForLocationServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ScheduleForRouteServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ScheduleForRouteServiceImpl.kt index b06afd4..d089118 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ScheduleForRouteServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ScheduleForRouteServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ScheduleForRouteRetrieveParams import org.onebusaway.models.ScheduleForRouteRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ScheduleForRouteServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ScheduleForStopServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ScheduleForStopServiceImpl.kt index b840548..ec60322 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ScheduleForStopServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ScheduleForStopServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ScheduleForStopRetrieveParams import org.onebusaway.models.ScheduleForStopRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ScheduleForStopServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/SearchForRouteServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/SearchForRouteServiceImpl.kt index 3783fc6..0d90681 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/SearchForRouteServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/SearchForRouteServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.SearchForRouteListParams import org.onebusaway.models.SearchForRouteListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class SearchForRouteServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/SearchForStopServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/SearchForStopServiceImpl.kt index 4f95484..782c9a7 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/SearchForStopServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/SearchForStopServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.SearchForStopListParams import org.onebusaway.models.SearchForStopListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class SearchForStopServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ShapeServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ShapeServiceImpl.kt index c1882f1..15f5f99 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ShapeServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/ShapeServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.ShapeRetrieveParams import org.onebusaway.models.ShapeRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class ShapeServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopIdsForAgencyServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopIdsForAgencyServiceImpl.kt index 1f3558e..1426b44 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopIdsForAgencyServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopIdsForAgencyServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.StopIdsForAgencyListParams import org.onebusaway.models.StopIdsForAgencyListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class StopIdsForAgencyServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopServiceImpl.kt index 21df9f5..d8adf59 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.StopRetrieveParams import org.onebusaway.models.StopRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class StopServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopsForLocationServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopsForLocationServiceImpl.kt index 5bc05b0..1b352b1 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopsForLocationServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopsForLocationServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.StopsForLocationListParams import org.onebusaway.models.StopsForLocationListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class StopsForLocationServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopsForRouteServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopsForRouteServiceImpl.kt index 3b494c5..51d8893 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopsForRouteServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/StopsForRouteServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.StopsForRouteListParams import org.onebusaway.models.StopsForRouteListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class StopsForRouteServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripDetailServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripDetailServiceImpl.kt index 0e4b259..f7f9133 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripDetailServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripDetailServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.TripDetailRetrieveParams import org.onebusaway.models.TripDetailRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class TripDetailServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripForVehicleServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripForVehicleServiceImpl.kt index 6526847..2dfca17 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripForVehicleServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripForVehicleServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.TripForVehicleRetrieveParams import org.onebusaway.models.TripForVehicleRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class TripForVehicleServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripServiceImpl.kt index 0de4918..4fcda2b 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.TripRetrieveParams import org.onebusaway.models.TripRetrieveResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class TripServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripsForLocationServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripsForLocationServiceImpl.kt index 758f9cf..e9cd5bc 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripsForLocationServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripsForLocationServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.TripsForLocationListParams import org.onebusaway.models.TripsForLocationListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class TripsForLocationServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripsForRouteServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripsForRouteServiceImpl.kt index a4bb8a6..b9735e2 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripsForRouteServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/TripsForRouteServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.TripsForRouteListParams import org.onebusaway.models.TripsForRouteListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class TripsForRouteServiceImpl constructor( diff --git a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/VehiclesForAgencyServiceImpl.kt b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/VehiclesForAgencyServiceImpl.kt index 0649135..47f1c87 100644 --- a/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/VehiclesForAgencyServiceImpl.kt +++ b/onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/services/blocking/VehiclesForAgencyServiceImpl.kt @@ -4,15 +4,15 @@ package org.onebusaway.services.blocking import org.onebusaway.core.ClientOptions import org.onebusaway.core.RequestOptions +import org.onebusaway.core.handlers.errorHandler +import org.onebusaway.core.handlers.jsonHandler +import org.onebusaway.core.handlers.withErrorHandler import org.onebusaway.core.http.HttpMethod import org.onebusaway.core.http.HttpRequest import org.onebusaway.core.http.HttpResponse.Handler import org.onebusaway.errors.OnebusawaySdkError import org.onebusaway.models.VehiclesForAgencyListParams import org.onebusaway.models.VehiclesForAgencyListResponse -import org.onebusaway.services.errorHandler -import org.onebusaway.services.jsonHandler -import org.onebusaway.services.withErrorHandler class VehiclesForAgencyServiceImpl constructor(