Try to use java 9 Cleaner

build-logic/build-parameters/build.gradle.kts

@@ -17,7 +17,7 @@ buildParameters {
         description.set("Collect test coverage")
     }
     integer("targetJavaVersion") {
-        defaultValue.set(8)
+        defaultValue.set(9)
         mandatory.set(true)
         description.set("Java version for source and target compatibility")
     }

pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java

@@ -41,7 +41,6 @@
 import org.postgresql.util.DriverInfo;
 import org.postgresql.util.GT;
 import org.postgresql.util.HostSpec;
-import org.postgresql.util.LazyCleaner;
 import org.postgresql.util.LruCache;
 import org.postgresql.util.PGBinaryObject;
 import org.postgresql.util.PGInterval;
@@ -61,6 +60,7 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
+import java.lang.ref.Cleaner;
 import java.security.Permission;
 import java.sql.Array;
 import java.sql.Blob;
@@ -105,7 +105,7 @@ public class PgConnection implements BaseConnection {
   private static final Set<Integer> SUPPORTED_BINARY_OIDS = getSupportedBinaryOids();
   private static final SQLPermission SQL_PERMISSION_ABORT = new SQLPermission("callAbort");
   private static final SQLPermission SQL_PERMISSION_NETWORK_TIMEOUT = new SQLPermission("setNetworkTimeout");
-
+  private static final Cleaner cleaner = Cleaner.create();
   private static final @Nullable MethodHandle SYSTEM_GET_SECURITY_MANAGER;
   private static final @Nullable MethodHandle SECURITY_MANAGER_CHECK_PERMISSION;
 
@@ -217,7 +217,7 @@ private enum ReadOnlyBehavior {
 
   private final @Nullable String xmlFactoryFactoryClass;
   private @Nullable PGXmlFactoryFactory xmlFactoryFactory;
-  private final LazyCleaner.Cleanable<IOException> cleanable;
+  private final Cleaner.Cleanable cleanable;
 
   final CachedQuery borrowQuery(String sql) throws SQLException {
     return queryExecutor.borrowQuery(sql);
@@ -251,6 +251,7 @@ public void setFlushCacheOnDeallocate(boolean flushCacheOnDeallocate) {
 
   //
   // Ctor.
+  // Ctor.
   //
   @SuppressWarnings({"method.invocation"})
   public PgConnection(HostSpec[] hostSpecs,
@@ -383,7 +384,7 @@ public PgConnection(HostSpec[] hostSpecs,
     replicationConnection = PGProperty.REPLICATION.getOrDefault(info) != null;
 
     xmlFactoryFactoryClass = PGProperty.XML_FACTORY_FACTORY.getOrDefault(info);
-    cleanable = LazyCleaner.getInstance().register(leakHandle, finalizeAction);
+    cleanable = cleaner.register(leakHandle, finalizeAction);
   }
 
   private static ReadOnlyBehavior getReadOnlyBehavior(@Nullable String property) {
@@ -864,13 +865,7 @@ public void close() throws SQLException {
       return;
     }
     openStackTrace = null;
-    try {
-      cleanable.clean();
-    } catch (IOException e) {
-      throw new PSQLException(
-          GT.tr("Unable to close connection properly"),
-          PSQLState.UNKNOWN_STATE, e);
-    }
+    cleanable.clean();
   }
 
   @Override

pgjdbc/src/main/java/org/postgresql/jdbc/PgConnectionCleaningAction.java

@@ -6,15 +6,11 @@
 package org.postgresql.jdbc;
 
 import org.postgresql.Driver;
-import org.postgresql.util.GT;
-import org.postgresql.util.LazyCleaner;
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
 import java.io.Closeable;
-import java.io.IOException;
 import java.util.Timer;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -26,7 +22,7 @@
  *   <li>Release shared timer registration</li>
  * </ul>
  */
-class PgConnectionCleaningAction implements LazyCleaner.CleaningAction<IOException> {
+class PgConnectionCleaningAction implements Runnable {
   private static final Logger LOGGER = Logger.getLogger(PgConnection.class.getName());
 
   private final ResourceLock lock;
@@ -80,12 +76,13 @@ public void purgeTimerTasks() {
   }
 
   @Override
-  public void onClean(boolean leak) throws IOException {
-    if (leak && openStackTrace != null) {
-      LOGGER.log(Level.WARNING, GT.tr("Leak detected: Connection.close() was not called"), openStackTrace);
-    }
+  public void run() {
     openStackTrace = null;
     releaseTimer();
-    queryExecutorCloseAction.close();
+    try {
+      queryExecutorCloseAction.close();
+    } catch ( Exception ex ) {
+      //ignore
+    }
   }
 }

pgjdbc/src/main/java/org/postgresql/util/SharedTimer.java

@@ -9,35 +9,37 @@
 
 import org.checkerframework.checker.nullness.qual.Nullable;
 
+import java.lang.ref.Cleaner;
 import java.util.Timer;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
 public class SharedTimer {
-  static class TimerCleanup implements LazyCleaner.CleaningAction<RuntimeException> {
+  static class TimerCleanup implements Runnable {
     private final Timer timer;
 
     TimerCleanup(Timer timer) {
       this.timer = timer;
     }
 
     @Override
-    public void onClean(boolean leak) throws RuntimeException {
+    public void run() {
       timer.cancel();
     }
   }
 
   // Incremented for each Timer created, this allows each to have a unique Timer name
   private static final AtomicInteger timerCount = new AtomicInteger(0);
+  private static final Cleaner cleaner = Cleaner.create();
 
   private static final Logger LOGGER = Logger.getLogger(SharedTimer.class.getName());
   private volatile @Nullable Timer timer;
   private final AtomicInteger refCount = new AtomicInteger(0);
   private final ResourceLock lock = new ResourceLock();
-  private LazyCleaner.@Nullable Cleanable<RuntimeException> timerCleanup;
+  private Cleaner.Cleanable cleanable;
 
   public SharedTimer() {
   }
 
   public int getRefCount() {
@@ -62,7 +64,8 @@
           Thread.currentThread().setContextClassLoader(null);
 
           this.timer = timer = new Timer("PostgreSQL-JDBC-SharedTimer-" + index, true);
-          this.timerCleanup = LazyCleaner.getInstance().register(refCount, new TimerCleanup(timer));
+          cleanable = cleaner.register(refCount, new TimerCleanup(timer));
+
         } finally {
           Thread.currentThread().setContextClassLoader(prevContextCL);
         }
@@ -81,10 +84,10 @@
       } else if (count == 0) {
         // This is the last usage of the Timer so cancel it so it's resources can be release.
         LOGGER.log(Level.FINEST, "No outstanding references to shared Timer, will cancel and close it");
-        if (timerCleanup != null) {
-          timerCleanup.clean();
+        if (cleanable != null) {
+          cleanable.clean();
           timer = null;
-          timerCleanup = null;
+          cleanable = null;
         }
       } else {
         // Should not get here under normal circumstance, probably a bug in app code.

pgjdbc/src/main/java/org/postgresql/util/StreamWrapper.java

@@ -16,6 +16,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.lang.ref.Cleaner;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
@@ -26,9 +27,12 @@
  */
 public final class StreamWrapper implements Closeable {
 
+  private static final Cleaner cleaner = Cleaner.create();
+
   private static final int MAX_MEMORY_BUFFER_BYTES = 51200;
 
   private static final String TEMP_FILE_PREFIX = "postgres-pgjdbc-stream";
+  private Cleaner.Cleanable cleanable;
 
   public StreamWrapper(byte[] data, int offset, int length) {
     this.stream = null;
@@ -74,7 +78,7 @@ public StreamWrapper(InputStream stream) throws PSQLException {
         this.stream = null; // The stream is opened on demand
         TempFileHolder tempFileHolder = new TempFileHolder(tempFile);
         this.tempFileHolder = tempFileHolder;
-        cleaner = LazyCleaner.getInstance().register(leakHandle, tempFileHolder);
+        cleanable = cleaner.register(leakHandle, tempFileHolder);
       } else {
         this.rawData = rawData;
         this.stream = null;
@@ -101,8 +105,8 @@ public InputStream getStream() throws IOException {
 
   @Override
   public void close() throws IOException {
-    if (cleaner != null) {
-      cleaner.clean();
+    if (cleanable != null) {
+      cleanable.clean();
     }
   }
 
@@ -142,7 +146,6 @@ private static int copyStream(InputStream inputStream, OutputStream outputStream
   private final @Nullable InputStream stream;
   private @Nullable TempFileHolder tempFileHolder;
   private final Object leakHandle = new Object();
-  private LazyCleaner.@Nullable Cleanable<IOException> cleaner;
   private final byte @Nullable [] rawData;
   private final int offset;
   private final int length;

pgjdbc/src/main/java/org/postgresql/util/TempFileHolder.java

@@ -13,14 +13,13 @@
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
  * The action deletes temporary file in case the user submits a large input stream,
  * and then abandons the statement.
  */
-class TempFileHolder implements LazyCleaner.CleaningAction<IOException> {
+class TempFileHolder implements Runnable {
 
   private static final Logger LOGGER = Logger.getLogger(StreamWrapper.class.getName());
   private @Nullable InputStream stream;
@@ -40,18 +39,19 @@ public InputStream getStream() throws IOException {
   }
 
   @Override
-  public void onClean(boolean leak) throws IOException {
-    if (leak) {
-      LOGGER.log(Level.WARNING, GT.tr("StreamWrapper leak detected StreamWrapper.close() was not called. "));
-    }
+  public void run() {
     Path tempFile = this.tempFile;
     if (tempFile != null) {
       tempFile.toFile().delete();
       this.tempFile = null;
     }
     InputStream stream = this.stream;
     if (stream != null) {
-      stream.close();
+      try {
+        stream.close();
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
       this.stream = null;
     }
   }