wip

Author: csviri

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

@@ -20,23 +20,18 @@ protected void onCreated(P primary, R created, Context<P> context) {
       handleExplicitIDStoring(primary, created, context);
     }
   }
+  // todo delete
 
   @SuppressWarnings({"rawtypes", "unchecked"})
   protected void handleExplicitIDStoring(P primary, R created, Context<P> context) {
     ExplicitIDHandler<R, P, ?> handler = (ExplicitIDHandler) this;
     HasMetadata resource = handler.stateResource(primary, created);
     var stateResource = handler.getKubernetesClient().resource(resource).create();
-
-    String name = handler.eventSourceName().orElse(null);
-    ResourceEventSource<R, P> eventSource;
-    if (name == null) {
-      eventSource =
-          context.eventSourceRetriever()
-              .getResourceEventSourceFor((Class<R>) resource.getClass());
-    } else {
-      eventSource = context.eventSourceRetriever()
-          .getResourceEventSourceFor((Class<R>) resource.getClass(), name);
-    }
+    var eventSource = handler.eventSourceName()
+        .map(n -> context.eventSourceRetriever()
+            .getResourceEventSourceFor((Class<R>) resource.getClass(), n))
+        .orElseGet(() -> context.eventSourceRetriever()
+            .getResourceEventSourceFor((Class<R>) resource.getClass()));
     if (eventSource instanceof RecentOperationCacheFiller) {
       ((RecentOperationCacheFiller) eventSource)
           .handleRecentResourceCreate(ResourceID.fromResource(primary), stateResource);

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/dependent/external/AbstractPollingDependentResource.java

@@ -2,14 +2,14 @@
 
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.api.reconciler.Ignore;
-import io.javaoperatorsdk.operator.processing.dependent.AbstractEventSourceHolderDependentResource;
+import io.javaoperatorsdk.operator.processing.dependent.AbstractExternalDependentResource;
 import io.javaoperatorsdk.operator.processing.event.source.CacheKeyMapper;
 import io.javaoperatorsdk.operator.processing.event.source.ExternalResourceCachingEventSource;
 
 @Ignore
 public abstract class AbstractPollingDependentResource<R, P extends HasMetadata>
     extends
-    AbstractEventSourceHolderDependentResource<R, P, ExternalResourceCachingEventSource<R, P>>
+    AbstractExternalDependentResource<R, P, ExternalResourceCachingEventSource<R, P>>
     implements CacheKeyMapper<R> {
 
   public static final int DEFAULT_POLLING_PERIOD = 5000;