naming improvement

operator-framework · May 3, 2020 · 0505718 · 0505718
1 parent 4c0a462
commit 0505718
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/...ework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java b/...ework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java
@@ -77,7 +77,7 @@ void scheduleEventFromApi(CustomResourceEvent event) {
             if (eventStore.containsNotScheduledEvent(event.resourceUid())) {
                 log.debug("Replacing not scheduled event with actual event." +
                         " New event: {}", event);
-                eventStore.addOrReplaceEventAsNotScheduled(event);
+                eventStore.addOrReplaceEventAsNotScheduledAndUpdateLastGeneration(event);
                 return;
             }
             if (generationAware && !eventStore.hasLargerGenerationThanLastStored(event)) {
@@ -88,7 +88,7 @@ void scheduleEventFromApi(CustomResourceEvent event) {
             if (eventStore.containsEventUnderProcessing(event.resourceUid())) {
                 log.debug("Scheduling event for later processing since there is an event under processing for same kind." +
                         " New event: {}", event);
-                eventStore.addOrReplaceEventAsNotScheduled(event);
+                eventStore.addOrReplaceEventAsNotScheduledAndUpdateLastGeneration(event);
                 return;
             }
             scheduleEventForExecution(event);
@@ -108,7 +108,7 @@ private void scheduleEventForExecution(CustomResourceEvent event) {
                 log.warn("Event max retry limit reached. Will be discarded. {}", event);
                 return;
             }
-            eventStore.addEventUnderProcessing(event);
+            eventStore.addEventUnderProcessingAndUpdateLastGeneration(event);
             executor.schedule(new EventConsumer(event, eventDispatcher, this),
                     nextBackOff.get(), TimeUnit.MILLISECONDS);
             log.trace("Scheduled task for event: {}", event);

diff --git a/...framework/src/main/java/com/github/containersolutions/operator/processing/EventStore.java b/...framework/src/main/java/com/github/containersolutions/operator/processing/EventStore.java
@@ -17,7 +17,7 @@ public CustomResourceEvent removeEventNotScheduled(String uid) {
         return eventsNotScheduled.remove(uid);
     }
 
-    public void addOrReplaceEventAsNotScheduled(CustomResourceEvent event) {
+    public void addOrReplaceEventAsNotScheduledAndUpdateLastGeneration(CustomResourceEvent event) {
         eventsNotScheduled.put(event.resourceUid(), event);
         updateLastGeneration(event);
     }
@@ -26,7 +26,7 @@ public boolean containsEventUnderProcessing(String uuid) {
         return eventsUnderProcessing.containsKey(uuid);
     }
 
-    public void addEventUnderProcessing(CustomResourceEvent event) {
+    public void addEventUnderProcessingAndUpdateLastGeneration(CustomResourceEvent event) {
         eventsUnderProcessing.put(event.resourceUid(), event);
         updateLastGeneration(event);
     }