Skip to content

Commit ee18088

Browse files
geoandmetacosm
authored andcommitted
fix(quarkus): use constructor injection instead of @Inject
1 parent b01073d commit ee18088

File tree

3 files changed

+13
-8
lines changed

3 files changed

+13
-8
lines changed

operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/ConfigurationServiceRecorder.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package io.javaoperatorsdk.quarkus.extension;
22

3+
import io.fabric8.kubernetes.client.KubernetesClient;
34
import io.javaoperatorsdk.operator.api.config.ConfigurationService;
45
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
6+
import io.quarkus.arc.Arc;
57
import io.quarkus.runtime.annotations.Recorder;
68
import java.util.List;
79
import java.util.function.Supplier;
@@ -11,6 +13,8 @@ public class ConfigurationServiceRecorder {
1113

1214
public Supplier<ConfigurationService> configurationServiceSupplier(
1315
List<ControllerConfiguration> controllerConfigs) {
14-
return () -> new QuarkusConfigurationService(controllerConfigs);
16+
return () ->
17+
new QuarkusConfigurationService(
18+
controllerConfigs, Arc.container().instance(KubernetesClient.class).get());
1519
}
1620
}

operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/OperatorProducer.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@
88
import io.quarkus.arc.DefaultBean;
99
import javax.enterprise.inject.Instance;
1010
import javax.enterprise.inject.Produces;
11-
import javax.inject.Inject;
1211
import javax.inject.Singleton;
1312

1413
@Singleton
1514
public class OperatorProducer {
1615

17-
@Inject Instance<ResourceController<? extends CustomResource>> controllers;
18-
1916
@Produces
2017
@DefaultBean
2118
@Singleton
22-
Operator operator(KubernetesClient client, ConfigurationService configuration) {
19+
Operator operator(
20+
KubernetesClient client,
21+
ConfigurationService configuration,
22+
Instance<ResourceController<? extends CustomResource>> controllers) {
2323
final var operator = new Operator(client, configuration);
2424
controllers.stream().forEach(operator::register);
2525
return operator;

operator-framework-quarkus-extension/runtime/src/main/java/io/javaoperatorsdk/quarkus/extension/QuarkusConfigurationService.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@
88
import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
99
import io.quarkus.arc.runtime.ClientProxyUnwrapper;
1010
import java.util.List;
11-
import javax.inject.Inject;
1211

1312
public class QuarkusConfigurationService extends AbstractConfigurationService {
14-
@Inject KubernetesClient client;
1513
private static final ClientProxyUnwrapper unwrapper = new ClientProxyUnwrapper();
14+
private final KubernetesClient client;
1615

17-
public QuarkusConfigurationService(List<ControllerConfiguration> configurations) {
16+
public QuarkusConfigurationService(
17+
List<ControllerConfiguration> configurations, KubernetesClient client) {
18+
this.client = client;
1819
if (configurations != null && !configurations.isEmpty()) {
1920
configurations.forEach(this::register);
2021
}

0 commit comments

Comments
 (0)