Skip to content

Commit 0459d07

Browse files
committed
refactor: configure spec directly instead of using public setter
Signed-off-by: Chris Laprun <claprun@redhat.com>
1 parent a29483f commit 0459d07

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/BaseConfigurationService.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -228,9 +228,8 @@ private static List<DependentResourceSpec> dependentResources(
228228
eventSourceName);
229229

230230
// extract potential configuration
231-
final var configuration = DependentResourceConfigurationResolver
232-
.extractConfigurationFromConfigured(spec, controllerConfiguration, dependentType);
233-
spec.setConfiguration(configuration);
231+
DependentResourceConfigurationResolver.configureSpecFromConfigured(spec, controllerConfiguration,
232+
dependentType);
234233

235234
specsMap.put(dependentName, spec);
236235
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/dependent/DependentResourceConfigurationResolver.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ private DependentResourceConfigurationResolver() {}
2020
new HashMap<>();
2121

2222

23-
public static <C extends ControllerConfiguration<?>> Object extractConfigurationFromConfigured(
23+
public static <C extends ControllerConfiguration<?>> void configureSpecFromConfigured(
2424
DependentResourceSpec spec,
2525
C parentConfiguration,
2626
Class<? extends DependentResource> dependentResourceClass) {
@@ -30,7 +30,7 @@ public static <C extends ControllerConfiguration<?>> Object extractConfiguration
3030
if (converterAnnotationPair == null) {
3131
var configuredClassPair = getConfigured(dependentResourceClass);
3232
if (configuredClassPair == null) {
33-
return null;
33+
return;
3434
}
3535

3636
// check if we already have a converter registered for the found Configured annotated class
@@ -54,8 +54,9 @@ public static <C extends ControllerConfiguration<?>> Object extractConfiguration
5454

5555
// always called even if the annotation is null so that implementations can provide default
5656
// values
57-
return converter.configFrom(configAnnotation, spec, parentConfiguration,
57+
final var config = converter.configFrom(configAnnotation, spec, parentConfiguration,
5858
dependentResourceClass);
59+
spec.setNullableConfiguration(config);
5960
}
6061

6162
private static ConfiguredClassPair getConfigured(

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/dependent/DependentResourceSpec.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public Optional<C> getConfiguration() {
104104
return Optional.ofNullable(nullableConfiguration);
105105
}
106106

107-
public void setConfiguration(C configuration) {
107+
protected void setNullableConfiguration(C configuration) {
108108
this.nullableConfiguration = configuration;
109109
}
110110
}

0 commit comments

Comments
 (0)