Skip to content

Commit 49be4d1

Browse files
authored
Merge pull request #53019 from holly-cummins/fix-dev-service-dependency-regression
Re-enable injection of config from previous dev services to dependencies (regression fix)
2 parents a790a23 + 19203f0 commit 49be4d1

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed

core/deployment/src/main/java/io/quarkus/deployment/builditem/DevServicesRegistryBuildItem.java

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,21 +184,26 @@ private void reallyStart(DevServicesResultBuildItem request, List<DevServicesCus
184184

185185
if (missingDependency == null) {
186186
startable.start();
187+
188+
Map<String, String> config = request.getConfig(startable);
189+
Map<String, String> overrideConfig = request.getOverrideConfig(startable);
190+
configs.putAll(config);
191+
configs.putAll(overrideConfig);
192+
187193
// We do not "copy" the config map here since it is created within the request.getConfig:
188-
Map<String, String> combinedConfig = request.getConfig(startable);
189194
// Some extensions may rely on adding/overriding config properties
190195
// depending on the results of the started dev services,
191196
// e.g. Hibernate Search/ORM may change the default schema management
192197
// if it detects that it runs over a dev service datasource/Elasticsearch distribution.
193198
for (DevServicesAdditionalConfigBuildItem additionalConfigBuildItem : additionalConfigBuildItems) {
194199
Map<String, String> extraFromBuildItem = additionalConfigBuildItem.getConfigProvider()
195-
.provide(combinedConfig);
200+
.provide(configs);
196201
if (!extraFromBuildItem.isEmpty()) {
197-
combinedConfig.putAll(extraFromBuildItem);
202+
configs.putAll(extraFromBuildItem);
198203
}
199204
}
200205
RunningService service = new RunningService(request.getName(), request.getDescription(),
201-
combinedConfig, request.getOverrideConfig(startable), startable.getContainerId(), startable);
206+
configs, request.getOverrideConfig(startable), startable.getContainerId(), startable);
202207
this.addRunningService(request.getName(), request.getServiceName(), request.getServiceConfig(), service);
203208
compressor.close();
204209

0 commit comments

Comments
 (0)