Avoid failures caused by invalid configuration when Hibernate Search …

…is disabled explicitly It was already almost implemented, but the implementation code was not being used. This commit fixes that.
quarkusio · Nov 3, 2021 · d23ef9f · d23ef9f
1 parent 9d8de14
commit d23ef9f
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 7 deletions.
diff --git a/...s/hibernate/search/orm/elasticsearch/aws/HibernateSearchOrmElasticsearchAwsProcessor.java b/...s/hibernate/search/orm/elasticsearch/aws/HibernateSearchOrmElasticsearchAwsProcessor.java
@@ -6,8 +6,8 @@
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.annotations.ExecutionTime;
 import io.quarkus.deployment.annotations.Record;
-import io.quarkus.hibernate.orm.deployment.integration.HibernateOrmIntegrationRuntimeConfiguredBuildItem;
 import io.quarkus.hibernate.search.orm.elasticsearch.HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem;
+import io.quarkus.hibernate.search.orm.elasticsearch.HibernateSearchIntegrationRuntimeConfiguredBuildItem;
 import io.quarkus.hibernate.search.orm.elasticsearch.aws.runtime.HibernateSearchOrmElasticsearchAwsRecorder;
 import io.quarkus.hibernate.search.orm.elasticsearch.aws.runtime.HibernateSearchOrmElasticsearchAwsRuntimeConfig;
 
@@ -20,13 +20,12 @@ class HibernateSearchOrmElasticsearchAwsProcessor {
     void setRuntimeConfig(HibernateSearchOrmElasticsearchAwsRecorder recorder,
             HibernateSearchOrmElasticsearchAwsRuntimeConfig runtimeConfig,
             List<HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem> configuredPersistenceUnits,
-            BuildProducer<HibernateOrmIntegrationRuntimeConfiguredBuildItem> runtimeConfigured) {
+            BuildProducer<HibernateSearchIntegrationRuntimeConfiguredBuildItem> runtimeConfigured) {
         for (HibernateSearchElasticsearchPersistenceUnitConfiguredBuildItem configuredPersistenceUnit : configuredPersistenceUnits) {
             String puName = configuredPersistenceUnit.getPersistenceUnitName();
-            runtimeConfigured.produce(new HibernateOrmIntegrationRuntimeConfiguredBuildItem(
-                    HIBERNATE_SEARCH_ORM_ELASTICSEARCH_AWS, puName)
-                            .setInitListener(
-                                    recorder.createRuntimeInitListener(runtimeConfig, puName)));
+            runtimeConfigured.produce(new HibernateSearchIntegrationRuntimeConfiguredBuildItem(
+                    HIBERNATE_SEARCH_ORM_ELASTICSEARCH_AWS, puName,
+                    recorder.createRuntimeInitListener(runtimeConfig, puName)));
         }
     }
 

diff --git a/...search/aws/test/configuration/MissingRegionSigningEnabledHibernateSearchDisabledTest.java b/...search/aws/test/configuration/MissingRegionSigningEnabledHibernateSearchDisabledTest.java
@@ -0,0 +1,23 @@
+package io.quarkus.hibernate.search.elasticsearch.aws.test.configuration;
+
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
+
+import io.quarkus.test.QuarkusUnitTest;
+
+public class MissingRegionSigningEnabledHibernateSearchDisabledTest {
+
+    @RegisterExtension
+    static final QuarkusUnitTest config = new QuarkusUnitTest().setArchiveProducer(
+            () -> ShrinkWrap.create(JavaArchive.class).addClass(IndexedEntity.class))
+            .withConfigurationResource("application.properties")
+            .overrideConfigKey("quarkus.hibernate-search-orm.elasticsearch.aws.signing.enabled", "true")
+            .overrideConfigKey("quarkus.hibernate-search-orm.enabled", "false");
+
+    @Test
+    public void testNoConfig() {
+        // Just check there are no exceptions on startup, on contrary to MissingRegionSigningEnabledTest
+    }
+}
diff --git a/...ernate/search/orm/elasticsearch/HibernateSearchIntegrationRuntimeConfiguredBuildItem.java b/...ernate/search/orm/elasticsearch/HibernateSearchIntegrationRuntimeConfiguredBuildItem.java
@@ -3,7 +3,7 @@
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.hibernate.orm.runtime.integration.HibernateOrmIntegrationRuntimeInitListener;
 
-public class HibernateSearchIntegrationRuntimeConfiguredBuildItem extends MultiBuildItem {
+public final class HibernateSearchIntegrationRuntimeConfiguredBuildItem extends MultiBuildItem {
     private final String integrationName;
     private final String persistenceUnitName;
     private final HibernateOrmIntegrationRuntimeInitListener initListener;

diff --git a/...rkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java b/...rkus/hibernate/search/orm/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java
@@ -219,6 +219,10 @@ public void contributeRuntimeProperties(BiConsumer<String, Object> propertyColle
                     .entrySet()) {
                 contributeBackendRuntimeProperties(propertyCollector, backendEntry.getKey(), backendEntry.getValue());
             }
+
+            for (HibernateOrmIntegrationRuntimeInitListener integrationRuntimeInitListener : integrationRuntimeInitListeners) {
+                integrationRuntimeInitListener.contributeRuntimeProperties(propertyCollector);
+            }
         }
 
         private void contributeBackendRuntimeProperties(BiConsumer<String, Object> propertyCollector, String backendName,