Skip to content

Commit 99ca7e2

Browse files
committed
fix: remove potentially problematic default implementation
Signed-off-by: Chris Laprun <[email protected]>
1 parent e99899a commit 99ca7e2

File tree

3 files changed

+8
-11
lines changed

3 files changed

+8
-11
lines changed

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ResourceConfiguration.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ default String getResourceTypeName() {
2626
return ReconcilerUtils.getResourceTypeName(getResourceClass());
2727
}
2828

29-
default InformerConfigHolder<R> getInformerConfig() {
30-
return InformerConfigHolder.DEFAULT_EVENT_SOURCE_CONFIG;
31-
}
29+
InformerConfigHolder<R> getInformerConfig();
3230

3331
default Optional<OnAddFilter<? super R>> onAddFilter() {
3432
return Optional.ofNullable(getInformerConfig().getOnAddFilter());

Diff for: operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/kubernetes/InformerConfigHolder.java

-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,6 @@
1818

1919
@SuppressWarnings("unused")
2020
public class InformerConfigHolder<R extends HasMetadata> {
21-
@SuppressWarnings("rawtypes")
22-
public static final InformerConfigHolder DEFAULT_CONTROLLER_CONFIG =
23-
InformerConfigHolder.builder().buildForController();
24-
@SuppressWarnings("rawtypes")
25-
public static final InformerConfigHolder DEFAULT_EVENT_SOURCE_CONFIG =
26-
InformerConfigHolder.builder().buildForInformerEventSource();
2721
private final Builder builder = new Builder();
2822
private String name;
2923
private Set<String> namespaces;

Diff for: operator-framework-core/src/test/java/io/javaoperatorsdk/operator/api/config/ResourceConfigurationTest.java

+7-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,17 @@
66
import org.junit.jupiter.api.Disabled;
77
import org.junit.jupiter.api.Test;
88

9+
import io.fabric8.kubernetes.api.model.HasMetadata;
910
import io.javaoperatorsdk.operator.api.reconciler.Constants;
11+
import io.javaoperatorsdk.operator.processing.dependent.kubernetes.InformerConfigHolder;
1012

1113
import static org.junit.jupiter.api.Assertions.*;
1214

1315
class ResourceConfigurationTest {
1416

17+
public static final ResourceConfiguration<HasMetadata> DEFAULT =
18+
() -> InformerConfigHolder.builder().buildForInformerEventSource();
19+
1520
@Test
1621
void allNamespacesWatched() {
1722
assertThrows(IllegalArgumentException.class,
@@ -46,14 +51,14 @@ void currentNamespaceWatched() {
4651

4752
@Test
4853
void nullLabelSelectorByDefault() {
49-
assertNull(new ResourceConfiguration<>() {}.getLabelSelector());
54+
assertNull(DEFAULT.getLabelSelector());
5055
}
5156

5257
// todo: fix me
5358
@Disabled
5459
@Test
5560
void shouldWatchAllNamespacesByDefault() {
56-
assertTrue(new ResourceConfiguration<>() {}.watchAllNamespaces());
61+
assertTrue(DEFAULT.watchAllNamespaces());
5762
}
5863

5964
@Test

0 commit comments

Comments
 (0)