wip

Author: csviri

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

@@ -11,14 +11,17 @@ public interface Context<P extends HasMetadata> {
 
   Optional<RetryInfo> getRetryInfo();
 
-  default <T> Optional<T> getSecondaryResource(Class<T> expectedType) {
-    return getSecondaryResource(expectedType, null);
+  default <R> Optional<R> getSecondaryResource(Class<R> expectedType) {
+    return getSecondaryResource(expectedType, (String) null);
   }
 
-  <T> Set<T> getSecondaryResources(Class<T> expectedType);
+  <R> Set<R> getSecondaryResources(Class<R> expectedType);
 
   @Deprecated(forRemoval = true)
-  <T> Optional<T> getSecondaryResource(Class<T> expectedType, String eventSourceName);
+  <R> Optional<R> getSecondaryResource(Class<R> expectedType, String eventSourceName);
+
+  <R> Optional<R> getSecondaryResource(Class<R> expectedType,
+      ResourceDiscriminator<R, P> discriminator);
 
   ControllerConfiguration<P> getControllerConfiguration();
 

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

@@ -47,6 +47,13 @@ public <T> Optional<T> getSecondaryResource(Class<T> expectedType, String eventS
         .getSecondaryResource(primaryResource);
   }
 
+  // todo implement
+  @Override
+  public <R> Optional<R> getSecondaryResource(Class<R> expectedType,
+      ResourceDiscriminator<R, P> discriminator) {
+    return Optional.empty();
+  }
+
   @Override
   public ControllerConfiguration<P> getControllerConfiguration() {
     return controllerConfiguration;

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

@@ -0,0 +1,14 @@
+package io.javaoperatorsdk.operator.api.reconciler;
+
+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
+public interface ResourceDiscriminator<R, P extends HasMetadata> {
+
+  Optional<R> distinguish(Class<R> resource, Context<P> context,
+      EventSourceRetriever<P> eventSourceManager);
+
+}

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

@@ -0,0 +1,19 @@
+package io.javaoperatorsdk.operator.api.reconciler;
+
+import java.util.Optional;
+import java.util.Set;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.processing.event.EventSourceRetriever;
+
+public abstract class ResourceListDiscriminator<R, P extends HasMetadata>
+    implements ResourceDiscriminator<R, P> {
+  @Override
+  public Optional<R> distinguish(Class<R> resource, Context<P> context,
+      EventSourceRetriever<P> eventSourceManager) {
+    var resources = context.getSecondaryResources(resource);
+    return distinguish(resources);
+  }
+
+  abstract Optional<R> distinguish(Set<R> resourceList);
+}

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

@@ -2,7 +2,6 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Context;
-import io.javaoperatorsdk.operator.processing.ResourceOwner;
 
 /**
  * An interface to implement and provide dependent resource support.

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/ResourceOwner.java

@@ -23,19 +23,20 @@
 import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceAction;
 import io.javaoperatorsdk.operator.processing.event.source.timer.TimerEventSource;
 
-public class EventSourceManager<R extends HasMetadata> implements LifecycleAware {
+public class EventSourceManager<P extends HasMetadata>
+    implements LifecycleAware, EventSourceRetriever<P> {
 
   private static final Logger log = LoggerFactory.getLogger(EventSourceManager.class);
 
-  private final EventSources<R> eventSources;
-  private final EventProcessor<R> eventProcessor;
-  private final Controller<R> controller;
+  private final EventSources<P> eventSources;
+  private final EventProcessor<P> eventProcessor;
+  private final Controller<P> controller;
 
-  public EventSourceManager(Controller<R> controller) {
+  public EventSourceManager(Controller<P> controller) {
     this(controller, new EventSources<>());
   }
 
-  EventSourceManager(Controller<R> controller, EventSources<R> eventSources) {
+  EventSourceManager(Controller<P> controller, EventSources<P> eventSources) {
     this.eventSources = eventSources;
     this.controller = controller;
     // controller event source needs to be available before we create the event processor
@@ -132,10 +133,10 @@ public final synchronized void registerEventSource(String name, EventSource even
   }
 
   @SuppressWarnings("unchecked")
-  public void broadcastOnResourceEvent(ResourceAction action, R resource, R oldResource) {
+  public void broadcastOnResourceEvent(ResourceAction action, P resource, P oldResource) {
     eventSources.additionalNamedEventSources().forEach(eventSource -> {
       if (eventSource instanceof ResourceEventAware) {
-        var lifecycleAwareES = ((ResourceEventAware<R>) eventSource);
+        var lifecycleAwareES = ((ResourceEventAware<P>) eventSource);
         switch (action) {
           case ADDED:
             lifecycleAwareES.onResourceCreated(resource);
@@ -175,30 +176,37 @@ public Set<EventSource> getRegisteredEventSources() {
         .collect(Collectors.toCollection(LinkedHashSet::new));
   }
 
-  public ControllerResourceEventSource<R> getControllerResourceEventSource() {
+  public ControllerResourceEventSource<P> getControllerResourceEventSource() {
     return eventSources.controllerResourceEventSource();
   }
 
-  <S> ResourceEventSource<S, R> getResourceEventSourceFor(
-      Class<S> dependentType) {
+  @Override
+  public <R> ResourceEventSource<R, P> getResourceEventSourceFor(
+      Class<R> dependentType) {
     return getResourceEventSourceFor(dependentType, null);
   }
 
-  public <S> List<ResourceEventSource<S, R>> getEventSourcesFor(Class<S> dependentType) {
+  public <R> List<ResourceEventSource<R, P>> getResourceEventSourcesFor(Class<R> dependentType) {
     return eventSources.getEventSources(dependentType);
   }
 
-  public <S> ResourceEventSource<S, R> getResourceEventSourceFor(
-      Class<S> dependentType, String qualifier) {
+  @Deprecated
+  public <R> List<ResourceEventSource<R, P>> getEventSourcesFor(Class<R> dependentType) {
+    return eventSources.getEventSources(dependentType);
+  }
+
+  @Override
+  public <R> ResourceEventSource<R, P> getResourceEventSourceFor(
+      Class<R> dependentType, String qualifier) {
     Objects.requireNonNull(dependentType, "dependentType is Mandatory");
     return eventSources.get(dependentType, qualifier);
   }
 
-  TimerEventSource<R> retryEventSource() {
+  TimerEventSource<P> retryEventSource() {
     return eventSources.retryEventSource();
   }
 
-  Controller<R> getController() {
+  Controller<P> getController() {
     return controller;
   }
 }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceManager.java

@@ -0,0 +1,18 @@
+package io.javaoperatorsdk.operator.processing.event;
+
+import java.util.List;
+
+import io.fabric8.kubernetes.api.model.HasMetadata;
+import io.javaoperatorsdk.operator.processing.event.source.ResourceEventSource;
+
+public interface EventSourceRetriever<P extends HasMetadata> {
+
+  <R> ResourceEventSource<R, P> getResourceEventSourceFor(
+      Class<R> dependentType);
+
+  <R> ResourceEventSource<R, P> getResourceEventSourceFor(
+      Class<R> dependentType, String qualifier);
+
+  <R> List<ResourceEventSource<R, P>> getResourceEventSourcesFor(Class<R> dependentType);
+
+}

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSourceRetriever.java

@@ -8,7 +8,6 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.processing.Controller;
-import io.javaoperatorsdk.operator.processing.ResourceOwner;
 import io.javaoperatorsdk.operator.processing.event.source.EventSource;
 import io.javaoperatorsdk.operator.processing.event.source.ResourceEventSource;
 import io.javaoperatorsdk.operator.processing.event.source.controller.ControllerResourceEventSource;
@@ -86,8 +85,8 @@ public void add(String name, EventSource eventSource) {
 
   @SuppressWarnings("rawtypes")
   private Class<?> getResourceType(EventSource source) {
-    return source instanceof ResourceOwner
-        ? ((ResourceOwner) source).resourceType()
+    return source instanceof ResourceEventSource
+        ? ((ResourceEventSource) source).resourceType()
         : source.getClass();
   }
 

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/EventSources.java

@@ -4,14 +4,19 @@
 import java.util.Set;
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
-import io.javaoperatorsdk.operator.processing.ResourceOwner;
 import io.javaoperatorsdk.operator.processing.event.source.filter.GenericFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnAddFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnDeleteFilter;
 import io.javaoperatorsdk.operator.processing.event.source.filter.OnUpdateFilter;
 
-public interface ResourceEventSource<R, P extends HasMetadata> extends EventSource,
-    ResourceOwner<R, P> {
+public interface ResourceEventSource<R, P extends HasMetadata> extends EventSource {
+
+  /**
+   * Retrieves the resource type associated with this ResourceOwner
+   *
+   * @return the resource type associated with this ResourceOwner
+   */
+  Class<R> resourceType();
 
   default Optional<R> getSecondaryResource(P primary) {
     var resources = getSecondaryResources(primary);

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

@@ -93,6 +93,4 @@ private void initDependentResources(KubernetesClient client) {
     });
   }
 
-
-
 }