renames

Author: csviri

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventScheduler.java

@@ -86,13 +86,13 @@ void scheduleEvent(CustomResourceEvent event) {
             if (eventStore.containsNotScheduledEvent(event.resourceUid())) {
                 log.debug("Replacing not scheduled event with actual event." +
                         " New event: {}", event);
-                eventStore.addOrReplaceEventAsNotScheduledYet(event);
+                eventStore.addOrReplaceEventAsNotScheduled(event);
                 return;
             }
             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.addOrReplaceEventAsNotScheduledYet(event);
+                eventStore.addOrReplaceEventAsNotScheduled(event);
                 return;
             }
 
@@ -118,7 +118,7 @@ void eventProcessingFinishedSuccessfully(CustomResourceEvent event) {
             eventStore.removeEventUnderProcessing(event.resourceUid());
             if (eventStore.containsNotScheduledEvent(event.resourceUid())) {
                 log.debug("Scheduling recent event for processing processing: {}", event);
-                scheduleEvent(eventStore.removeEventNotScheduledYet(event.resourceUid()));
+                scheduleEvent(eventStore.removeEventNotScheduled(event.resourceUid()));
             }
         } finally {
             lock.unlock();
@@ -130,7 +130,7 @@ void eventProcessingFailed(CustomResourceEvent event) {
             lock.lock();
             eventStore.removeEventUnderProcessing(event.resourceUid());
             if (eventStore.containsNotScheduledEvent(event.resourceUid())) {
-                CustomResourceEvent notScheduledEvent = eventStore.removeEventNotScheduledYet(event.resourceUid());
+                CustomResourceEvent notScheduledEvent = eventStore.removeEventNotScheduled(event.resourceUid());
                 log.debug("Event processing failed. Scheduling the most recent event. Failed event: {}," +
                         " Most recent event: {}", event, notScheduledEvent);
                 scheduleEvent(notScheduledEvent);

operator-framework/src/main/java/com/github/containersolutions/operator/processing/EventStore.java

@@ -1,28 +1,23 @@
 package com.github.containersolutions.operator.processing;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.util.HashMap;
 import java.util.Map;
 
 public class EventStore {
 
-    private final static Logger log = LoggerFactory.getLogger(EventStore.class);
-
-    private final Map<String, CustomResourceEvent> eventsNotScheduledYet = new HashMap<>();
+    private final Map<String, CustomResourceEvent> eventsNotScheduled = new HashMap<>();
     private final Map<String, CustomResourceEvent> eventsUnderProcessing = new HashMap<>();
 
     public boolean containsNotScheduledEvent(String uuid) {
-        return eventsNotScheduledYet.containsKey(uuid);
+        return eventsNotScheduled.containsKey(uuid);
     }
 
-    public CustomResourceEvent removeEventNotScheduledYet(String uid) {
-        return eventsNotScheduledYet.remove(uid);
+    public CustomResourceEvent removeEventNotScheduled(String uid) {
+        return eventsNotScheduled.remove(uid);
     }
 
-    public void addOrReplaceEventAsNotScheduledYet(CustomResourceEvent event) {
-        eventsNotScheduledYet.put(event.resourceUid(), event);
+    public void addOrReplaceEventAsNotScheduled(CustomResourceEvent event) {
+        eventsNotScheduled.put(event.resourceUid(), event);
     }
 
     public boolean containsEventUnderProcessing(String uuid) {