release: 0.1.0-alpha.13

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.1.0-alpha.12"
+  ".": "0.1.0-alpha.13"
 }

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.1.0-alpha.13 (2024-10-28)
+
+Full Changelog: [v0.1.0-alpha.12...v0.1.0-alpha.13](https://github.com/OneBusAway/java-sdk/compare/v0.1.0-alpha.12...v0.1.0-alpha.13)
+
+### Chores
+
+* rebuild project due to codegen change ([#37](https://github.com/OneBusAway/java-sdk/issues/37)) ([cadf9d3](https://github.com/OneBusAway/java-sdk/commit/cadf9d3c803c89e67896bd8aaf38e13b6f4c0664))
+
 ## 0.1.0-alpha.12 (2024-10-25)
 
 Full Changelog: [v0.1.0-alpha.11...v0.1.0-alpha.12](https://github.com/OneBusAway/java-sdk/compare/v0.1.0-alpha.11...v0.1.0-alpha.12)

README.md

@@ -2,7 +2,7 @@
 
 <!-- x-release-please-start-version -->
 
-[![Maven Central](https://img.shields.io/maven-central/v/org.onebusaway/onebusaway-sdk-java)](https://central.sonatype.com/artifact/org.onebusaway/onebusaway-sdk-java/0.1.0-alpha.12)
+[![Maven Central](https://img.shields.io/maven-central/v/org.onebusaway/onebusaway-sdk-java)](https://central.sonatype.com/artifact/org.onebusaway/onebusaway-sdk-java/0.1.0-alpha.13)
 
 <!-- x-release-please-end -->
 
@@ -27,7 +27,7 @@ The REST API documentation can be found on [developer.onebusaway.org](https://d
 <!-- x-release-please-start-version -->
 
 ```kotlin
-implementation("org.onebusaway:onebusaway-sdk-java:0.1.0-alpha.12")
+implementation("org.onebusaway:onebusaway-sdk-java:0.1.0-alpha.13")
 ```
 
 #### Maven
@@ -36,7 +36,7 @@ implementation("org.onebusaway:onebusaway-sdk-java:0.1.0-alpha.12")
 <dependency>
     <groupId>org.onebusaway</groupId>
     <artifactId>onebusaway-sdk-java</artifactId>
-    <version>0.1.0-alpha.12</version>
+    <version>0.1.0-alpha.13</version>
 </dependency>
 ```
 

build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
 
 allprojects {
     group = "org.onebusaway"
-    version = "0.1.0-alpha.12" // x-release-please-version
+    version = "0.1.0-alpha.13" // x-release-please-version
 }
 
 

onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/ClientOptions.kt

@@ -7,6 +7,7 @@ import com.google.common.collect.ArrayListMultimap
 import com.google.common.collect.ListMultimap
 import java.time.Clock
 import org.onebusaway.core.http.HttpClient
+import org.onebusaway.core.http.PhantomReachableClosingHttpClient
 import org.onebusaway.core.http.RetryingHttpClient
 
 class ClientOptions
@@ -142,11 +143,13 @@ private constructor(
 
             return ClientOptions(
                 httpClient!!,
-                RetryingHttpClient.builder()
-                    .httpClient(httpClient!!)
-                    .clock(clock)
-                    .maxRetries(maxRetries)
-                    .build(),
+                PhantomReachableClosingHttpClient(
+                    RetryingHttpClient.builder()
+                        .httpClient(httpClient!!)
+                        .clock(clock)
+                        .maxRetries(maxRetries)
+                        .build()
+                ),
                 jsonMapper ?: jsonMapper(),
                 clock,
                 baseUrl,

onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/PhantomReachable.kt

@@ -0,0 +1,46 @@
+@file:JvmName("PhantomReachable")
+
+package org.onebusaway.core
+
+import java.lang.reflect.InvocationTargetException
+import org.onebusaway.errors.OnebusawaySdkException
+
+/**
+ * Closes [closeable] when [observed] becomes only phantom reachable.
+ *
+ * This is a wrapper around a Java 9+ [java.lang.ref.Cleaner], or a no-op in older Java versions.
+ */
+@JvmSynthetic
+internal fun closeWhenPhantomReachable(observed: Any, closeable: AutoCloseable) {
+    check(observed !== closeable) {
+        "`observed` cannot be the same object as `closeable` because it would never become phantom reachable"
+    }
+    closeWhenPhantomReachable?.let { it(observed, closeable::close) }
+}
+
+private val closeWhenPhantomReachable: ((Any, AutoCloseable) -> Unit)? by lazy {
+    try {
+        val cleanerClass = Class.forName("java.lang.ref.Cleaner")
+        val cleanerCreate = cleanerClass.getMethod("create")
+        val cleanerRegister =
+            cleanerClass.getMethod("register", Any::class.java, Runnable::class.java)
+        val cleanerObject = cleanerCreate.invoke(null);
+
+        { observed, closeable ->
+            try {
+                cleanerRegister.invoke(cleanerObject, observed, Runnable { closeable.close() })
+            } catch (e: ReflectiveOperationException) {
+                if (e is InvocationTargetException) {
+                    when (val cause = e.cause) {
+                        is RuntimeException,
+                        is Error -> throw cause
+                    }
+                }
+                throw OnebusawaySdkException("Unexpected reflective invocation failure", e)
+            }
+        }
+    } catch (e: ReflectiveOperationException) {
+        // We're running Java 8, which has no Cleaner.
+        null
+    }
+}

onebusaway-sdk-java-core/src/main/kotlin/org/onebusaway/core/http/PhantomReachableClosingHttpClient.kt

@@ -0,0 +1,21 @@
+package org.onebusaway.core.http
+
+import java.util.concurrent.CompletableFuture
+import org.onebusaway.core.RequestOptions
+import org.onebusaway.core.closeWhenPhantomReachable
+
+internal class PhantomReachableClosingHttpClient(private val httpClient: HttpClient) : HttpClient {
+    init {
+        closeWhenPhantomReachable(this, httpClient)
+    }
+
+    override fun execute(request: HttpRequest, requestOptions: RequestOptions): HttpResponse =
+        httpClient.execute(request, requestOptions)
+
+    override fun executeAsync(
+        request: HttpRequest,
+        requestOptions: RequestOptions
+    ): CompletableFuture<HttpResponse> = httpClient.executeAsync(request, requestOptions)
+
+    override fun close() = httpClient.close()
+}

onebusaway-sdk-java-core/src/test/kotlin/org/onebusaway/core/PhantomReachableTest.kt

@@ -0,0 +1,27 @@
+package org.onebusaway.core
+
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.jupiter.api.Test
+
+internal class PhantomReachableTest {
+
+    @Test
+    fun closeWhenPhantomReachable_whenObservedIsGarbageCollected_closesCloseable() {
+        var closed = false
+        val closeable = AutoCloseable { closed = true }
+
+        closeWhenPhantomReachable(
+            // Pass an inline object for the object to observe so that it becomes immediately
+            // unreachable.
+            Any(),
+            closeable
+        )
+
+        assertThat(closed).isFalse()
+
+        System.gc()
+        Thread.sleep(3000)
+
+        assertThat(closed).isTrue()
+    }
+}