event source provider to context

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/Context.java

@@ -6,6 +6,7 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedDependentResourceContext;
+import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 
 public interface Context<P extends HasMetadata> {
 
@@ -26,4 +27,6 @@ <R> Optional<R> getSecondaryResource(Class<R> expectedType,
   ControllerConfiguration<P> getControllerConfiguration();
 
   ManagedDependentResourceContext managedDependentResourceContext();
+
+  EventSourceRetriever<P> eventSourceRetriever();
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/DefaultContext.java

@@ -9,6 +9,7 @@
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.DefaultManagedDependentResourceContext;
 import io.javaoperatorsdk.operator.api.reconciler.dependent.managed.ManagedDependentResourceContext;
 import io.javaoperatorsdk.operator.processing.Controller;
+import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 
 public class DefaultContext<P extends HasMetadata> implements Context<P> {
 
@@ -50,8 +51,7 @@ public <T> Optional<T> getSecondaryResource(Class<T> expectedType, String eventS
   @Override
   public <R> Optional<R> getSecondaryResource(Class<R> expectedType,
       ResourceDiscriminator<R, P> discriminator) {
-    return discriminator.distinguish(expectedType, primaryResource, this,
-        controller.getEventSourceManager());
+    return discriminator.distinguish(expectedType, primaryResource, this);
   }
 
   @Override
@@ -64,6 +64,11 @@ public ManagedDependentResourceContext managedDependentResourceContext() {
     return defaultManagedDependentResourceContext;
   }
 
+  @Override
+  public EventSourceRetriever<P> eventSourceRetriever() {
+    return controller.getEventSourceManager();
+  }
+
   public DefaultContext<P> setRetryInfo(RetryInfo retryInfo) {
     this.retryInfo = retryInfo;
     return this;

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ResourceDiscriminator.java

@@ -3,13 +3,11 @@
 import java.util.Optional;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 
 // todo is discriminator a good name? it not just discriminates but also reads from cache
 // todo discuss a List version of this (for reconciler but also for batch processing?)
 public interface ResourceDiscriminator<R, P extends HasMetadata> {
 
-  Optional<R> distinguish(Class<R> resource, P primary, Context<P> context,
-      EventSourceRetriever<P> eventSourceRetriever);
+  Optional<R> distinguish(Class<R> resource, P primary, Context<P> context);
 
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/ResourceIDMatcherDiscriminator.java

@@ -4,7 +4,6 @@
 import java.util.function.Function;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
 public class ResourceIDMatcherDiscriminator<R extends HasMetadata, P extends HasMetadata>
@@ -17,8 +16,7 @@ public ResourceIDMatcherDiscriminator(Function<P, ResourceID> mapper) {
   }
 
   @Override
-  public Optional<R> distinguish(Class<R> resource, P primary, Context<P> context,
-      EventSourceRetriever<P> eventSourceRetriever) {
+  public Optional<R> distinguish(Class<R> resource, P primary, Context<P> context) {
     var resourceID = mapper.apply(primary);
     return context.getSecondaryResources(resource).stream()
         .filter(r -> r.getMetadata().getName()

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/reconciler/VoidResourceDiscriminator.java

@@ -3,14 +3,12 @@
 import java.util.Optional;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 
 public class VoidResourceDiscriminator<R, P extends HasMetadata>
     implements ResourceDiscriminator<R, P> {
 
   @Override
-  public Optional<R> distinguish(Class<R> resource, P primary, Context<P> context,
-      EventSourceRetriever<P> eventSourceRetriever) {
+  public Optional<R> distinguish(Class<R> resource, P primary, Context<P> context) {
     throw new UnsupportedOperationException();
   }
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/indexdiscriminator/IndexDiscriminator.java

@@ -5,7 +5,6 @@
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
 import io.javaoperatorsdk.operator.api.reconciler.ResourceDiscriminator;
-import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
 import io.javaoperatorsdk.operator.processing.event.source.informer.InformerEventSource;
 
 import static io.javaoperatorsdk.operator.sample.indexdiscriminator.IndexDiscriminatorTestReconciler.configMapKeyFromPrimary;
@@ -24,11 +23,11 @@ public IndexDiscriminator(String indexName, String nameSuffix) {
   @Override
   public Optional<ConfigMap> distinguish(Class<ConfigMap> resource,
       IndexDiscriminatorTestCustomResource primary,
-      Context<IndexDiscriminatorTestCustomResource> context,
-      EventSourceRetriever<IndexDiscriminatorTestCustomResource> eventSourceRetriever) {
+      Context<IndexDiscriminatorTestCustomResource> context) {
 
     InformerEventSource<ConfigMap, IndexDiscriminatorTestCustomResource> eventSource =
-        (InformerEventSource<ConfigMap, IndexDiscriminatorTestCustomResource>) eventSourceRetriever
+        (InformerEventSource<ConfigMap, IndexDiscriminatorTestCustomResource>) context
+            .eventSourceRetriever()
             .getResourceEventSourceFor(ConfigMap.class);
     var resources = eventSource.byIndex(indexName, configMapKeyFromPrimary(primary, nameSuffix));
     if (resources.isEmpty()) {