CR and improvements

Author: csviri

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/DefaultEventHandler.java

@@ -58,15 +58,12 @@ public void handleEvent(Event event) {
     }
 
     private void executeBufferedEvents(String customResourceUid) {
-        if (!isControllerUnderExecution(customResourceUid)
-                && eventBuffer.containsEvents(customResourceUid)) {
+        if (!isControllerUnderExecution(customResourceUid) && eventBuffer.containsEvents(customResourceUid)) {
             setUnderExecutionProcessing(customResourceUid);
-            ExecutionScope executionScope =
-                    new ExecutionScope(eventBuffer.getAndRemoveEventsForExecution(customResourceUid),
-                            resourceCache.getLatestResource(customResourceUid).get());
-            ExecutionConsumer executionConsumer =
-                    new ExecutionConsumer(executionScope, eventDispatcher, this);
-            executor.execute(executionConsumer);
+            ExecutionScope executionScope = new ExecutionScope(
+                    eventBuffer.getAndRemoveEventsForExecution(customResourceUid),
+                    resourceCache.getLatestResource(customResourceUid).get());
+            executor.execute(new ExecutionConsumer(executionScope, eventDispatcher, this));
         }
     }
 

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/ProcessingUtils.java

@@ -13,6 +13,10 @@ public static String getUID(CustomResource customResource) {
         return customResource.getMetadata().getUid();
     }
 
+    public static String getVersion(CustomResource customResource) {
+        return customResource.getMetadata().getResourceVersion();
+    }
+
     public static boolean containsCustomResourceDeletedEvent(List<Event> events) {
         return events.stream().anyMatch(e -> {
             if (e instanceof CustomResourceEvent) {

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

@@ -23,10 +23,9 @@ public T getEventSource() {
 
     @Override
     public String toString() {
-        return "AbstractEvent{" +
-                "class='" + this.getClass().getName() + "', " +
-                "relatedCustomResourceUid='" + relatedCustomResourceUid + '\'' +
-                ", eventSource=" + eventSource +
-                '}';
+        return "{ class=" + this.getClass().getName() +
+                ", relatedCustomResourceUid=" + relatedCustomResourceUid +
+                ", eventSource=" + eventSource + " }";
+
     }
 }

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/CustomResourceEventSource.java

@@ -5,11 +5,14 @@
 import io.fabric8.kubernetes.client.Watcher;
 import io.fabric8.kubernetes.client.dsl.MixedOperation;
 import io.fabric8.kubernetes.client.dsl.internal.CustomResourceOperationsImpl;
+import io.javaoperatorsdk.operator.processing.ProcessingUtils;
 import io.javaoperatorsdk.operator.processing.ResourceCache;
 import io.javaoperatorsdk.operator.processing.event.AbstractEventSource;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static io.javaoperatorsdk.operator.processing.ProcessingUtils.*;
+
 /**
  * This is a special case since does not bounds to a single custom resource
  */
@@ -61,15 +64,16 @@ private void registerWatch() {
     }
 
     @Override
-    public void eventReceived(Watcher.Action action, CustomResource resource) {
-        log.debug("Event received for action: {}, {}: {}", action.toString().toLowerCase(), resource.getClass().getSimpleName(),
-                resource.getMetadata().getName());
-        resourceCache.cacheResource(resource); // always store the latest event. Outside the sync block is intentional.
+    public void eventReceived(Watcher.Action action, CustomResource customResource) {
+        log.debug("Event received for action: {}, resource: {}",
+                customResource.getMetadata().getName(), customResource);
+        resourceCache.cacheResource(customResource); // always store the latest event. Outside the sync block is intentional.
         if (action == Action.ERROR) {
-            log.debug("Skipping {} event for custom resource: {}", action, resource);
+            log.debug("Skipping {} event for custom resource uid: {}, version: {}", action,
+                    getUID(customResource), getVersion(customResource));
             return;
         }
-        eventHandler.handleEvent(new CustomResourceEvent(action, resource, this));
+        eventHandler.handleEvent(new CustomResourceEvent(action, customResource, this));
     }
 
     @Override

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/event/internal/TimerEventSource.java

@@ -15,7 +15,7 @@ public class TimerEventSource extends AbstractEventSource {
     private Logger log = LoggerFactory.getLogger(TimerEventSource.class);
 
     private final Timer timer = new Timer();
-    private ReentrantLock lock = new ReentrantLock();
+    private final ReentrantLock lock = new ReentrantLock();
 
     private Map<String, List<EvenProducerTimeTask>> timerTasks = new ConcurrentHashMap<>();
 
@@ -26,7 +26,7 @@ public void schedule(CustomResource customResource, long delay, long period) {
         timer.schedule(task, delay, period);
     }
 
-    public void schedule(CustomResource customResource, long delay) {
+    public void scheduleOnce(CustomResource customResource, long delay) {
         String resourceUid = ProcessingUtils.getUID(customResource);
         OneTimeEventProducerTimerTask task = new OneTimeEventProducerTimerTask(resourceUid);
         storeTask(resourceUid, task);
@@ -65,7 +65,7 @@ public void eventSourceDeRegisteredForResource(String customResourceUid) {
      * @param customResourceUid
      * @return
      */
-    public List<EvenProducerTimeTask> getEvenProducerTimeTask(String customResourceUid) {
+    private List<EvenProducerTimeTask> getEvenProducerTimeTask(String customResourceUid) {
         List<EvenProducerTimeTask> tasks = timerTasks.get(customResourceUid);
         if (tasks == null) {
             return Collections.EMPTY_LIST;