Skip to content

Commit d8f3ace

Browse files
committed
refactor: replace fields by value instead of Optional
1 parent 2216e41 commit d8f3ace

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public class DefaultResourceConfiguration<R extends HasMetadata>
1414

1515
private final Class<R> resourceClass;
1616
private final String resourceTypeName;
17-
private final Optional<OnAddFilter<R>> onAddFilter;
18-
private final Optional<OnUpdateFilter<R>> onUpdateFilter;
19-
private final Optional<GenericFilter<R>> genericFilter;
17+
private final OnAddFilter<R> onAddFilter;
18+
private final OnUpdateFilter<R> onUpdateFilter;
19+
private final GenericFilter<R> genericFilter;
2020
private final String labelSelector;
2121
private final Set<String> namespaces;
2222

@@ -25,9 +25,9 @@ protected DefaultResourceConfiguration(Class<R> resourceClass,
2525
OnUpdateFilter<R> onUpdateFilter, GenericFilter<R> genericFilter) {
2626
this.resourceClass = resourceClass;
2727
this.resourceTypeName = ReconcilerUtils.getResourceTypeName(resourceClass);
28-
this.onAddFilter = Optional.ofNullable(onAddFilter);
29-
this.onUpdateFilter = Optional.ofNullable(onUpdateFilter);
30-
this.genericFilter = Optional.ofNullable(genericFilter);
28+
this.onAddFilter = onAddFilter;
29+
this.onUpdateFilter = onUpdateFilter;
30+
this.genericFilter = genericFilter;
3131

3232
this.namespaces = ResourceConfiguration.ensureValidNamespaces(namespaces);
3333
this.labelSelector = ResourceConfiguration.ensureValidLabelSelector(labelSelector);
@@ -56,15 +56,15 @@ public Class<R> getResourceClass() {
5656

5757
@Override
5858
public Optional<OnAddFilter<R>> onAddFilter() {
59-
return onAddFilter;
59+
return Optional.ofNullable(onAddFilter);
6060
}
6161

6262
@Override
6363
public Optional<OnUpdateFilter<R>> onUpdateFilter() {
64-
return onUpdateFilter;
64+
return Optional.ofNullable(onUpdateFilter);
6565
}
6666

6767
public Optional<GenericFilter<R>> genericFilter() {
68-
return genericFilter;
68+
return Optional.ofNullable(genericFilter);
6969
}
7070
}

0 commit comments

Comments
 (0)