#117 - java.lang.AutoClosable automatically gets a PreDestroy hook

Author: rbygrave

inject-generator/src/main/java/io/avaje/inject/generator/BeanReader.java

@@ -121,7 +121,7 @@ String getMetaKey() {
    * Return true if lifecycle via annotated methods is required.
    */
   boolean hasLifecycleMethods() {
-    return !requestScopedBean && (postConstructMethod != null || preDestroyMethod != null);
+    return !requestScopedBean && (postConstructMethod != null || preDestroyMethod != null || typeReader.isClosable());
   }
 
   List<MetaData> createFactoryMethodMeta() {
@@ -170,7 +170,7 @@ void addLifecycleCallbacks(Append writer) {
     if (preDestroyMethod != null) {
       writer.append("      builder.addPreDestroy($bean::%s);", preDestroyMethod.getSimpleName()).eol();
     } else if (typeReader.isClosable()) {
-      writer.append("      builder.addPreDestroy(bean);").eol();
+      writer.append("      builder.addPreDestroy($bean);").eol();
     }
   }
 

inject-generator/src/main/java/io/avaje/inject/generator/Constants.java

@@ -3,6 +3,7 @@
 class Constants {
 
   static final String IO_CLOSEABLE = "java.io.Closeable";
+  static final String AUTO_CLOSEABLE = "java.lang.AutoCloseable";
   static final String OPTIONAL = "java.util.Optional";
   static final String KOTLIN_METADATA = "kotlin.Metadata";
 

inject-generator/src/main/java/io/avaje/inject/generator/MethodReader.java

@@ -143,6 +143,8 @@ void builderBuildAddBean(Append writer) {
       }
       if (notEmpty(destroyMethod)) {
         writer.append(indent).append("builder.addPreDestroy($bean::%s);", destroyMethod).eol();
+      } else if (typeReader.isClosable()) {
+        writer.append(indent).append("builder.addPreDestroy($bean::close);", destroyMethod).eol();
       }
       if (optionalType) {
         writer.append("      }").eol();
@@ -151,7 +153,7 @@ void builderBuildAddBean(Append writer) {
   }
 
   private boolean hasLifecycleMethods() {
-    return notEmpty(initMethod) || notEmpty(destroyMethod);
+    return notEmpty(initMethod) || notEmpty(destroyMethod) || typeReader.isClosable();
   }
 
   private boolean notEmpty(String value) {

inject-generator/src/main/java/io/avaje/inject/generator/TypeInterfaceReader.java

@@ -50,7 +50,7 @@ void process() {
       String type = Util.unwrapProvider(anInterface.toString());
       if (type.indexOf('.') == -1) {
         context.logWarn("skip when no package on interface " + type);
-      } else if (Constants.IO_CLOSEABLE.equals(type)) {
+      } else if (Constants.AUTO_CLOSEABLE.equals(type) || Constants.IO_CLOSEABLE.equals(type)) {
         closeable = true;
       } else {
         final String iShortName = Util.shortName(type);

inject-test/src/test/java/org/example/closable/ShouldCloseAuto2.java

@@ -0,0 +1,18 @@
+package org.example.closable;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class ShouldCloseAuto2 implements AutoCloseable {
+
+  private boolean closed;
+
+  @Override
+  public void close() throws Exception {
+    closed = true;
+  }
+
+  boolean isClosed() {
+    return closed;
+  }
+}

inject-test/src/test/java/org/example/closable/ShouldCloseAutoTest.java

@@ -8,7 +8,7 @@
 class ShouldCloseAutoTest {
 
   @Test
-  void test() {
+  void test_closable() {
 
     ShouldCloseAuto shouldCloseAuto;
     try (final BeanScope scope = BeanScope.newBuilder().build()) {
@@ -17,4 +17,15 @@ void test() {
 
     assertThat(shouldCloseAuto.isClosed()).isTrue();
   }
+
+  @Test
+  void test_autoCloseable() {
+
+    ShouldCloseAuto2 shouldCloseAuto;
+    try (final BeanScope scope = BeanScope.newBuilder().build()) {
+      shouldCloseAuto = scope.get(ShouldCloseAuto2.class);
+    }
+
+    assertThat(shouldCloseAuto.isClosed()).isTrue();
+  }
 }

inject-test/src/test/java/org/example/coffee/factory/MyFactory.java

@@ -2,11 +2,13 @@
 
 import io.avaje.inject.Bean;
 import io.avaje.inject.Factory;
-import org.example.coffee.factory.other.Something;
-
 import jakarta.inject.Named;
+import org.example.coffee.factory.other.Something;
 import org.example.coffee.parent.DesEngi;
 
+import java.io.Closeable;
+import java.io.IOException;
+
 @Factory
 public class MyFactory {
 
@@ -53,7 +55,7 @@ void anotherCFact(CFact cfact) {
   @Named("BuildDesi1")
   DesEngi buildEngi() {
     methods += "|buildEngi1";
-    return new DesEngi(){
+    return new DesEngi() {
       @Override
       public String ignite() {
         return "buildEngi1";
@@ -68,6 +70,16 @@ DesEngi buildEngi2() {
     return new MyEngi();
   }
 
+  @Bean
+  MyAutoClose buildAutoClose() {
+    return new MyAutoClose();
+  }
+
+  @Bean
+  MyClose buildMyCloseable() {
+    return new MyClose();
+  }
+
   String methodsCalled() {
     return methods;
   }
@@ -78,4 +90,32 @@ public String ignite() {
       return "MyEngi";
     }
   }
+
+  public static class MyAutoClose implements AutoCloseable {
+
+    boolean closed;
+
+    public boolean isClosed() {
+      return closed;
+    }
+
+    @Override
+    public void close() throws Exception {
+      closed = true;
+    }
+  }
+
+  public static class MyClose implements Closeable {
+
+    boolean closed;
+
+    public boolean isClosed() {
+      return closed;
+    }
+
+    @Override
+    public void close() throws IOException {
+      closed = true;
+    }
+  }
 }

inject-test/src/test/java/org/example/coffee/factory/MyFactoryTest.java

@@ -17,6 +17,19 @@ public void methodsCalled() {
     }
   }
 
+  @Test
+  public void closableBeans_expect_closedViaPreDestroy() {
+
+    final MyFactory.MyClose myClose;
+    final MyFactory.MyAutoClose myAutoClose;
+    try (BeanScope context = BeanScope.newBuilder().build()) {
+      myClose = context.get(MyFactory.MyClose.class);
+      myAutoClose = context.get(MyFactory.MyAutoClose.class);
+    }
+    assertThat(myClose.isClosed()).isTrue();
+    assertThat(myAutoClose.isClosed()).isTrue();
+  }
+
   @Test
   public void factoryMethod_createsConcreteImplementation() {
     DesEngi buildDesi = ApplicationScope.get(DesEngi.class, "BuildDesi1");

inject/src/main/java/io/avaje/inject/spi/Builder.java

@@ -4,7 +4,6 @@
 import io.avaje.inject.RequestScopeProvider;
 import jakarta.inject.Provider;
 
-import java.io.Closeable;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
@@ -93,7 +92,7 @@ static Builder newBuilder(List<SuppliedBean> suppliedBeans, List<EnrichBean> enr
   /**
    * Add lifecycle PreDestroy method.
    */
-  void addPreDestroy(Closeable closeable);
+  void addPreDestroy(AutoCloseable closeable);
 
   /**
    * Add field and method injection.

inject/src/main/java/io/avaje/inject/spi/DBeanScope.java

@@ -4,8 +4,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.Closeable;
-import java.io.IOException;
 import java.lang.annotation.Annotation;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -21,14 +19,14 @@ class DBeanScope implements BeanScope {
 
   private final ReentrantLock lock = new ReentrantLock();
   private final List<Runnable> postConstruct;
-  private final List<Closeable> preDestroy;
+  private final List<AutoCloseable> preDestroy;
   private final DBeanMap beans;
   private final Map<String, RequestScopeMatch<?>> reqScopeProviders;
   private final ShutdownHook shutdownHook;
   private boolean shutdown;
   private boolean closed;
 
-  DBeanScope(boolean withShutdownHook, List<Closeable> preDestroy, List<Runnable> postConstruct, DBeanMap beans, Map<String, RequestScopeMatch<?>> reqScopeProviders) {
+  DBeanScope(boolean withShutdownHook, List<AutoCloseable> preDestroy, List<Runnable> postConstruct, DBeanMap beans, Map<String, RequestScopeMatch<?>> reqScopeProviders) {
     this.preDestroy = preDestroy;
     this.postConstruct = postConstruct;
     this.beans = beans;
@@ -131,10 +129,10 @@ public void close() {
         // we only allow one call to preDestroy
         closed = true;
         log.trace("firing preDestroy");
-        for (Closeable closeable : preDestroy) {
+        for (AutoCloseable closeable : preDestroy) {
           try {
             closeable.close();
-          } catch (IOException e) {
+          } catch (Exception e) {
             log.error("Error during PreDestroy lifecycle method", e);
           }
         }

inject/src/main/java/io/avaje/inject/spi/DBuilder.java

@@ -1,12 +1,11 @@
 package io.avaje.inject.spi;
 
-import io.avaje.inject.BeanScope;
 import io.avaje.inject.BeanEntry;
+import io.avaje.inject.BeanScope;
 import io.avaje.inject.RequestScopeMatch;
 import io.avaje.inject.RequestScopeProvider;
 import jakarta.inject.Provider;
 
-import java.io.Closeable;
 import java.util.*;
 import java.util.function.Consumer;
 
@@ -16,7 +15,7 @@ class DBuilder implements Builder {
    * List of Lifecycle methods.
    */
   private final List<Runnable> postConstruct = new ArrayList<>();
-  private final List<Closeable> preDestroy = new ArrayList<>();
+  private final List<AutoCloseable> preDestroy = new ArrayList<>();
 
   /**
    * List of field injection closures.
@@ -126,7 +125,7 @@ public void addPostConstruct(Runnable invoke) {
   }
 
   @Override
-  public void addPreDestroy(Closeable invoke) {
+  public void addPreDestroy(AutoCloseable invoke) {
     preDestroy.add(invoke);
   }