wip

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

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

@@ -7,17 +7,19 @@
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 import io.javaoperatorsdk.operator.processing.event.source.SecondaryToPrimaryMapper;
 
-class DefaultPrimaryToSecondaryIndex<R extends HasMetadata> implements PrimaryToSecondaryIndex<R> {
+class DefaultTemporalPrimaryToSecondaryIndex<R extends HasMetadata>
+    implements TemporalPrimaryToSecondaryIndex<R> {
 
   private final SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper;
   private final Map<ResourceID, Set<ResourceID>> index = new HashMap<>();
 
-  public DefaultPrimaryToSecondaryIndex(SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper) {
+  public DefaultTemporalPrimaryToSecondaryIndex(
+      SecondaryToPrimaryMapper<R> secondaryToPrimaryMapper) {
     this.secondaryToPrimaryMapper = secondaryToPrimaryMapper;
   }
 
   @Override
-  public synchronized void onAddOrUpdate(R resource) {
+  public synchronized void explicitAddOrUpdate(R resource) {
     Set<ResourceID> primaryResources = secondaryToPrimaryMapper.toPrimaryResourceIDs(resource);
     primaryResources.forEach(
         primaryResource -> {
@@ -28,7 +30,7 @@ public synchronized void onAddOrUpdate(R resource) {
   }
 
   @Override
-  public synchronized void onDelete(R resource) {
+  public synchronized void cleanupForResource(R resource) {
     Set<ResourceID> primaryResources = secondaryToPrimaryMapper.toPrimaryResourceIDs(resource);
     primaryResources.forEach(
         primaryResource -> {

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/DefaultPrimaryToSecondaryIndex.java renamed to operator-framework-core/src/main/java/io/javaoperatorsdk/operator/processing/event/source/informer/DefaultTemporalPrimaryToSecondaryIndex.java

@@ -65,7 +65,7 @@ public class InformerEventSource<R extends HasMetadata, P extends HasMetadata>
   private static final Logger log = LoggerFactory.getLogger(InformerEventSource.class);
   // we need direct control for the indexer to propagate the just update resource also to the index
   private final PrimaryToSecondaryMapper<P> primaryToSecondaryMapper;
-  private final ComplementaryPrimaryToSecondaryIndex<R> complementaryPrimaryToSecondaryIndex;
+  private final TemporalPrimaryToSecondaryIndex<R> temporalPrimaryToSecondaryIndex;
   private final String id = UUID.randomUUID().toString();
 
   public InformerEventSource(
@@ -99,9 +99,8 @@ private InformerEventSource(
     // If there is a primary to secondary mapper there is no need for primary to secondary index.
     primaryToSecondaryMapper = configuration.getPrimaryToSecondaryMapper();
     if (useSecondaryToPrimaryIndex()) {
-      complementaryPrimaryToSecondaryIndex =
-          new DefaultComplementaryPrimaryToSecondaryIndex<>(
-              configuration.getSecondaryToPrimaryMapper());
+      temporalPrimaryToSecondaryIndex =
+          new DefaultTemporalPrimaryToSecondaryIndex<>(configuration.getSecondaryToPrimaryMapper());
       addIndexers(
           Map.of(
               PRIMARY_TO_SECONDARY_INDEX_NAME,
@@ -110,7 +109,7 @@ private InformerEventSource(
                       .map(InformerEventSource::resourceIdToString)
                       .toList()));
     } else {
-      complementaryPrimaryToSecondaryIndex = new NOOPComplementaryPrimaryToSecondaryIndex();
+      temporalPrimaryToSecondaryIndex = NOOPTemporalPrimaryToSecondaryIndex.getInstance();
     }
 
     final var informerConfig = configuration.getInformerConfig();
@@ -159,7 +158,7 @@ public void onDelete(R resource, boolean b) {
           ResourceID.fromResource(resource),
           resourceType().getSimpleName());
     }
-    complementaryPrimaryToSecondaryIndex.cleanupForResource(resource);
+    temporalPrimaryToSecondaryIndex.cleanupForResource(resource);
     super.onDelete(resource, b);
     if (acceptedByDeleteFilters(resource, b)) {
       propagateEvent(resource);
@@ -169,7 +168,7 @@ public void onDelete(R resource, boolean b) {
   private synchronized void onAddOrUpdate(
       Operation operation, R newObject, R oldObject, Runnable superOnOp) {
     var resourceID = ResourceID.fromResource(newObject);
-    complementaryPrimaryToSecondaryIndex.cleanupForResource(newObject);
+    temporalPrimaryToSecondaryIndex.cleanupForResource(newObject);
     if (canSkipEvent(newObject, oldObject, resourceID)) {
       log.debug(
           "Skipping event propagation for {}, since was a result of a reconcile action. Resource"
@@ -256,7 +255,7 @@ public Set<R> getSecondaryResources(P primary) {
 
     if (useSecondaryToPrimaryIndex()) {
       var primaryID = ResourceID.fromResource(primary);
-      var complementaryIds = complementaryPrimaryToSecondaryIndex.getSecondaryResources(primaryID);
+      var complementaryIds = temporalPrimaryToSecondaryIndex.getSecondaryResources(primaryID);
       var resources = byIndex(PRIMARY_TO_SECONDARY_INDEX_NAME, resourceIdToString(primaryID));
       log.debug("Resources in cache: {} kind: {}", resources, resourceType().getSimpleName());
       log.debug(
@@ -309,7 +308,7 @@ public synchronized void handleRecentResourceCreate(ResourceID resourceID, R res
   }
 
   private void handleRecentCreateOrUpdate(Operation operation, R newResource, R oldResource) {
-    complementaryPrimaryToSecondaryIndex.explicitAddOrUpdate(newResource);
+    temporalPrimaryToSecondaryIndex.explicitAddOrUpdate(newResource);
     temporaryResourceCache.putResource(
         newResource,
         Optional.ofNullable(oldResource)

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

@@ -5,25 +5,27 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
-class NOOPPrimaryToSecondaryIndex<R extends HasMetadata> implements PrimaryToSecondaryIndex<R> {
+class NOOPTemporalPrimaryToSecondaryIndex<R extends HasMetadata>
+    implements TemporalPrimaryToSecondaryIndex<R> {
 
   @SuppressWarnings("rawtypes")
-  private static final NOOPPrimaryToSecondaryIndex instance = new NOOPPrimaryToSecondaryIndex();
+  private static final NOOPTemporalPrimaryToSecondaryIndex instance =
+      new NOOPTemporalPrimaryToSecondaryIndex();
 
   @SuppressWarnings("unchecked")
-  public static <T extends HasMetadata> NOOPPrimaryToSecondaryIndex<T> getInstance() {
+  public static <T extends HasMetadata> NOOPTemporalPrimaryToSecondaryIndex<T> getInstance() {
     return instance;
   }
 
-  private NOOPPrimaryToSecondaryIndex() {}
+  private NOOPTemporalPrimaryToSecondaryIndex() {}
 
   @Override
-  public void onAddOrUpdate(R resource) {
+  public void explicitAddOrUpdate(R resource) {
     // empty method because of noop implementation
   }
 
   @Override
-  public void onDelete(R resource) {
+  public void cleanupForResource(R resource) {
     // empty method because of noop implementation
   }
 

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

@@ -5,11 +5,11 @@
 import io.fabric8.kubernetes.api.model.HasMetadata;
 import io.javaoperatorsdk.operator.processing.event.ResourceID;
 
-public interface ComplementaryPrimaryToSecondaryIndex<R extends HasMetadata> {
+public interface TemporalPrimaryToSecondaryIndex<R extends HasMetadata> {
 
   void explicitAddOrUpdate(R resource);
 
-  void cleanupForResource(R resourceID);
+  void cleanupForResource(R resource);
 
   Set<ResourceID> getSecondaryResources(ResourceID primary);
 }