Use AutoCloseableDestroyer for the standalone search mapping bean

marko-bekhta · Jun 20, 2024 · ab47d55 · ab47d55
1 parent ed77ee2
commit ab47d55
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 26 deletions.
diff --git a/...ernate/search/standalone/elasticsearch/deployment/HibernateSearchStandaloneProcessor.java b/...ernate/search/standalone/elasticsearch/deployment/HibernateSearchStandaloneProcessor.java
@@ -277,7 +277,7 @@ void defineSearchMappingBean(Optional<HibernateSearchStandaloneEnabledBuildItem>
                 .setRuntimeInit()
                 .createWith(recorder.createSearchMappingFunction(runtimeConfig,
                         enabled.get().getBackendAndIndexNamesForSearchExtensions()))
-                .destroyer(BeanDestroyer.CloseableDestroyer.class)
+                .destroyer(BeanDestroyer.AutoCloseableDestroyer.class)
                 .done());
     }
 

diff --git a/...runtime/src/main/java/io/quarkus/keycloak/admin/client/common/AutoCloseableDestroyer.java b/...runtime/src/main/java/io/quarkus/keycloak/admin/client/common/AutoCloseableDestroyer.java
diff --git a/.../java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientReactiveProcessor.java b/.../java/io/quarkus/keycloak/admin/client/reactive/KeycloakAdminClientReactiveProcessor.java
@@ -10,6 +10,7 @@
 import org.keycloak.json.StringOrArrayDeserializer;
 import org.keycloak.json.StringOrArraySerializer;
 
+import io.quarkus.arc.BeanDestroyer;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.deployment.annotations.BuildProducer;
 import io.quarkus.deployment.annotations.BuildStep;
@@ -21,7 +22,6 @@
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyIgnoreWarningBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ServiceProviderBuildItem;
-import io.quarkus.keycloak.admin.client.common.AutoCloseableDestroyer;
 import io.quarkus.keycloak.admin.client.common.KeycloakAdminClientInjectionEnabled;
 import io.quarkus.keycloak.admin.client.reactive.runtime.ResteasyReactiveClientProvider;
 import io.quarkus.keycloak.admin.client.reactive.runtime.ResteasyReactiveKeycloakAdminClientRecorder;
@@ -69,7 +69,7 @@ public void registerKeycloakAdminClientBeans(ResteasyReactiveKeycloakAdminClient
                 .defaultBean()
                 .unremovable()
                 .supplier(recorder.createAdminClient())
-                .destroyer(AutoCloseableDestroyer.class)
+                .destroyer(BeanDestroyer.AutoCloseableDestroyer.class)
                 .done());
     }
 }
diff --git a/...rc/main/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientProcessor.java b/...rc/main/java/io/quarkus/keycloak/adminclient/deployment/KeycloakAdminClientProcessor.java
@@ -12,6 +12,7 @@
 import org.keycloak.json.StringOrArrayDeserializer;
 import org.keycloak.json.StringOrArraySerializer;
 
+import io.quarkus.arc.BeanDestroyer;
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.deployment.Capabilities;
 import io.quarkus.deployment.Capability;
@@ -24,7 +25,6 @@
 import io.quarkus.deployment.builditem.ServiceStartBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem;
 import io.quarkus.deployment.builditem.nativeimage.ReflectiveHierarchyIgnoreWarningBuildItem;
-import io.quarkus.keycloak.admin.client.common.AutoCloseableDestroyer;
 import io.quarkus.keycloak.admin.client.common.KeycloakAdminClientInjectionEnabled;
 import io.quarkus.keycloak.adminclient.ResteasyKeycloakAdminClientRecorder;
 
@@ -68,7 +68,7 @@ public void registerKeycloakAdminClientBeans(ResteasyKeycloakAdminClientRecorder
                 .defaultBean()
                 .unremovable()
                 .supplier(recorder.createAdminClient())
-                .destroyer(AutoCloseableDestroyer.class)
+                .destroyer(BeanDestroyer.AutoCloseableDestroyer.class)
                 .done());
     }
 }
diff --git a/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanDestroyer.java b/independent-projects/arc/runtime/src/main/java/io/quarkus/arc/BeanDestroyer.java
@@ -34,4 +34,16 @@ public void destroy(Closeable instance, CreationalContext<Closeable> creationalC
         }
     }
 
+    class AutoCloseableDestroyer implements BeanDestroyer<AutoCloseable> {
+        @Override
+        public void destroy(AutoCloseable instance, CreationalContext<AutoCloseable> creationalContext,
+                Map<String, Object> params) {
+            try {
+                instance.close();
+            } catch (Exception e) {
+                throw new RuntimeException(e);
+            }
+        }
+    }
+
 }