Skip to content

Commit 3e275b7

Browse files
metacosmcsviri
authored andcommitted
refactor: minor improvements
Signed-off-by: Chris Laprun <claprun@redhat.com>
1 parent 56ef869 commit 3e275b7

File tree

2 files changed

+16
-19
lines changed

2 files changed

+16
-19
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentInformerConfig.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,19 @@
1111
import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;
1212

1313

14+
@SuppressWarnings("unused")
1415
public class KubernetesDependentInformerConfig<R extends HasMetadata> {
1516

16-
private String name;
17-
private Set<String> namespaces;
18-
private boolean followControllerNamespacesOnChange;
19-
private String labelSelector;
20-
private OnAddFilter<? super R> onAddFilter;
21-
private OnUpdateFilter<? super R> onUpdateFilter;
22-
private OnDeleteFilter<? super R> onDeleteFilter;
23-
private GenericFilter<? super R> genericFilter;
24-
private ItemStore<R> itemStore;
25-
private Long informerListLimit;
17+
private final String name;
18+
private final Set<String> namespaces;
19+
private final boolean followControllerNamespacesOnChange;
20+
private final String labelSelector;
21+
private final OnAddFilter<? super R> onAddFilter;
22+
private final OnUpdateFilter<? super R> onUpdateFilter;
23+
private final OnDeleteFilter<? super R> onDeleteFilter;
24+
private final GenericFilter<? super R> genericFilter;
25+
private final ItemStore<R> itemStore;
26+
private final Long informerListLimit;
2627

2728
public KubernetesDependentInformerConfig(String name, Set<String> namespaces,
2829
boolean followControllerNamespacesOnChange,

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/KubernetesDependentResource.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -203,21 +203,17 @@ protected void addReferenceHandlingMetadata(R desired, P primary) {
203203
}
204204
}
205205

206-
@SuppressWarnings("unchecked")
207206
@Override
208207
protected InformerEventSource<R, P> createEventSource(EventSourceContext<P> context) {
209208
InformerConfiguration<R> config;
210-
if (kubernetesDependentResourceConfig != null
211-
&& kubernetesDependentResourceConfig.informerConfig() != null) {
209+
final var krdInformerConfig = kubernetesDependentResourceConfig.informerConfig();
210+
if (kubernetesDependentResourceConfig != null && krdInformerConfig != null) {
212211

213212
var configBuilder = informerConfigurationBuilder();
214-
kubernetesDependentResourceConfig.informerConfig().updateInformerConfigBuilder(configBuilder);
213+
krdInformerConfig.updateInformerConfigBuilder(configBuilder);
215214

216-
if (kubernetesDependentResourceConfig.informerConfig().getName() == null) {
217-
configBuilder.withName(name());
218-
} else {
219-
configBuilder.withName(kubernetesDependentResourceConfig.informerConfig().getName());
220-
}
215+
final var informerConfigName = krdInformerConfig.getName();
216+
configBuilder.withName(informerConfigName == null ? name() : informerConfigName);
221217
configBuilder.withSecondaryToPrimaryMapper(getSecondaryToPrimaryMapper().orElseThrow());
222218
config = configBuilder.build();
223219
} else {

0 commit comments

Comments
 (0)