HSEARCH-3967 Correctly resolve property keys when using overrides/fal…

…lbacks in configuration property sources

engine/src/main/java/org/hibernate/search/engine/cfg/impl/FallbackConfigurationPropertySource.java

@@ -32,7 +32,12 @@ public Optional<?> get(String key) {
 
 	@Override
 	public Optional<String> resolve(String key) {
-		return main.resolve( key );
+		if ( !main.get( key ).isPresent() && fallback.get( key ).isPresent() ) {
+			return fallback.resolve( key );
+		}
+		else {
+			return main.resolve( key );
+		}
 	}
 
 	@Override

engine/src/main/java/org/hibernate/search/engine/cfg/impl/OverriddenConfigurationPropertySource.java

@@ -39,7 +39,12 @@ public Optional<?> get(String key) {
 
 	@Override
 	public Optional<String> resolve(String key) {
-		return main.resolve( key );
+		if ( override.get( key ).isPresent() ) {
+			return override.resolve( key );
+		}
+		else {
+			return main.resolve( key );
+		}
 	}
 
 	@Override

integrationtest/backend/elasticsearch/src/test/java/org/hibernate/search/integrationtest/backend/elasticsearch/index/lifecycle/ElasticsearchIndexLifecycleStrategyIT.java

@@ -39,8 +39,7 @@ public void noCall() {
 		)
 				.isInstanceOf( SearchException.class )
 				.hasMessageContainingAll(
-						"Unable to convert configuration property 'hibernate.search.backend.indexes." + index.name()
-								+ ".lifecycle.strategy' with value 'update'",
+						"Unable to convert configuration property 'hibernate.search.backend.lifecycle.strategy' with value 'update'",
 						"The lifecycle strategy cannot be set at the index level anymore",
 						"Set the schema management strategy via the property 'hibernate.search.schema_management.strategy' instead"
 				);