Skip to content

Commit 9af9304

Browse files
committed
refactor: start isolating ResourceConfiguration
1 parent 8440796 commit 9af9304

File tree

5 files changed

+5
-14
lines changed

5 files changed

+5
-14
lines changed

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/health/InformerWrappingEventSourceHealthIndicator.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
import java.util.Map;
44

55
import io.fabric8.kubernetes.api.model.HasMetadata;
6-
import io.javaoperatorsdk.operator.api.config.ResourceConfiguration;
76

87
public interface InformerWrappingEventSourceHealthIndicator<R extends HasMetadata>
98
extends EventSourceHealthIndicator {
@@ -17,6 +16,4 @@ default Status getStatus() {
1716

1817
return nonUp.isPresent() ? Status.UNHEALTHY : Status.HEALTHY;
1918
}
20-
21-
ResourceConfiguration<R> getInformerConfiguration();
2219
}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerEventSource.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,12 @@ public InformerEventSource(
8383
.parseResourceVersionsForEventFilteringAndCaching());
8484
}
8585

86-
public InformerEventSource(InformerConfiguration<R> configuration, KubernetesClient client) {
86+
InformerEventSource(InformerConfiguration<R> configuration, KubernetesClient client) {
8787
this(configuration, client, false);
8888
}
8989

90-
public InformerEventSource(InformerConfiguration<R> configuration,
90+
@SuppressWarnings({"unchecked", "rawtypes"})
91+
private InformerEventSource(InformerConfiguration<R> configuration,
9192
KubernetesClient client,
9293
boolean parseResourceVersions) {
9394
super(configuration.name(),

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/InformerManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import static io.javaoperatorsdk.operator.api.reconciler.Constants.WATCH_ALL_NAMESPACES;
3030

31-
public class InformerManager<R extends HasMetadata, C extends ResourceConfiguration<R>>
31+
class InformerManager<R extends HasMetadata, C extends ResourceConfiguration<R>>
3232
implements LifecycleAware, IndexerResourceCache<R> {
3333

3434
private static final Logger log = LoggerFactory.getLogger(InformerManager.class);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/ManagedInformerEventSource.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,6 @@ public Status getStatus() {
174174
return InformerWrappingEventSourceHealthIndicator.super.getStatus();
175175
}
176176

177-
@Override
178-
public ResourceConfiguration<R> getInformerConfiguration() {
179-
return configuration();
180-
}
181-
182177
@Override
183178
public C configuration() {
184179
return configuration;

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/createupdateeventfilter/CreateUpdateEventFilterTestReconciler.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,9 +96,7 @@ public List<EventSource<?, CreateUpdateEventFilterTestCustomResource>> prepareEv
9696
InformerConfiguration.from(ConfigMap.class, CreateUpdateEventFilterTestCustomResource.class)
9797
.withLabelSelector("integrationtest = " + this.getClass().getSimpleName())
9898
.build();
99-
final var informerEventSource =
100-
new InformerEventSource<ConfigMap, CreateUpdateEventFilterTestCustomResource>(
101-
informerConfiguration, context.getClient());
99+
final var informerEventSource = new InformerEventSource<>(informerConfiguration, context);
102100
this.configMapDR.setEventSource(informerEventSource);
103101

104102
return List.of(informerEventSource);

0 commit comments

Comments
 (0)