chore: generify TimerEventSource to reduce the noise about raw use of parameters

Author: lburgazzoli

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

@@ -34,13 +34,13 @@ public class DefaultEventSourceManager<R extends CustomResource<?, ?>>
   private final ReentrantLock lock = new ReentrantLock();
   private final Map<String, EventSource> eventSources = new ConcurrentHashMap<>();
   private final DefaultEventHandler<R> defaultEventHandler;
-  private TimerEventSource retryTimerEventSource;
+  private TimerEventSource<R> retryTimerEventSource;
 
   DefaultEventSourceManager(DefaultEventHandler<R> defaultEventHandler, boolean supportRetry) {
     this.defaultEventHandler = defaultEventHandler;
     defaultEventHandler.setEventSourceManager(this);
     if (supportRetry) {
-      this.retryTimerEventSource = new TimerEventSource();
+      this.retryTimerEventSource = new TimerEventSource<>();
       registerEventSource(RETRY_TIMER_EVENT_SOURCE_NAME, retryTimerEventSource);
     }
   }

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

@@ -12,15 +12,15 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class TimerEventSource extends AbstractEventSource {
+public class TimerEventSource<R extends CustomResource<?, ?>> extends AbstractEventSource {
+  private static final Logger log = LoggerFactory.getLogger(TimerEventSource.class);
 
   private final Timer timer = new Timer();
   private final AtomicBoolean running = new AtomicBoolean();
   private final Map<String, EventProducerTimeTask> onceTasks = new ConcurrentHashMap<>();
   private final Map<String, EventProducerTimeTask> timerTasks = new ConcurrentHashMap<>();
-  private Logger log = LoggerFactory.getLogger(TimerEventSource.class);
 
-  public void schedule(CustomResource customResource, long delay, long period) {
+  public void schedule(R customResource, long delay, long period) {
     if (!running.get()) {
       throw new IllegalStateException("The TimerEventSource is not running");
     }
@@ -34,7 +34,7 @@ public void schedule(CustomResource customResource, long delay, long period) {
     timer.schedule(task, delay, period);
   }
 
-  public void scheduleOnce(CustomResource customResource, long delay) {
+  public void scheduleOnce(R customResource, long delay) {
     if (!running.get()) {
       throw new IllegalStateException("The TimerEventSource is not running");
     }

operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/internal/TimerEventSourceTest.java

@@ -4,11 +4,11 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
 
-import io.fabric8.kubernetes.client.CustomResource;
 import io.javaoperatorsdk.operator.TestUtils;
 import io.javaoperatorsdk.operator.processing.KubernetesResourceUtils;
 import io.javaoperatorsdk.operator.processing.event.Event;
 import io.javaoperatorsdk.operator.processing.event.EventHandler;
+import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
 import java.io.IOException;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
@@ -25,21 +25,21 @@ class TimerEventSourceTest {
   public static final int PERIOD = 50;
   public static final int TESTING_TIME_SLACK = 40;
 
-  private TimerEventSource timerEventSource;
+  private TimerEventSource<TestCustomResource> timerEventSource;
   private CapturingEventHandler eventHandlerMock;
 
   @BeforeEach
   public void setup() {
     eventHandlerMock = new CapturingEventHandler();
 
-    timerEventSource = new TimerEventSource();
+    timerEventSource = new TimerEventSource<>();
     timerEventSource.setEventHandler(eventHandlerMock);
     timerEventSource.start();
   }
 
   @Test
   public void producesEventsPeriodically() {
-    CustomResource customResource = TestUtils.testCustomResource();
+    TestCustomResource customResource = TestUtils.testCustomResource();
     timerEventSource.schedule(customResource, INITIAL_DELAY, PERIOD);
 
     untilAsserted(() -> {
@@ -54,7 +54,7 @@ public void producesEventsPeriodically() {
 
   @Test
   public void deRegistersPeriodicalEventSources() {
-    CustomResource customResource = TestUtils.testCustomResource();
+    TestCustomResource customResource = TestUtils.testCustomResource();
 
     timerEventSource.schedule(customResource, INITIAL_DELAY, PERIOD);
     untilAsserted(() -> assertThat(eventHandlerMock.events).hasSizeGreaterThan(1));
@@ -67,7 +67,7 @@ public void deRegistersPeriodicalEventSources() {
 
   @Test
   public void schedulesOnce() {
-    CustomResource customResource = TestUtils.testCustomResource();
+    TestCustomResource customResource = TestUtils.testCustomResource();
 
     timerEventSource.scheduleOnce(customResource, PERIOD);
 
@@ -77,7 +77,7 @@ public void schedulesOnce() {
 
   @Test
   public void canCancelOnce() {
-    CustomResource customResource = TestUtils.testCustomResource();
+    TestCustomResource customResource = TestUtils.testCustomResource();
 
     timerEventSource.scheduleOnce(customResource, PERIOD);
     timerEventSource.cancelOnceSchedule(KubernetesResourceUtils.getUID(customResource));
@@ -87,7 +87,7 @@ public void canCancelOnce() {
 
   @Test
   public void canRescheduleOnceEvent() {
-    CustomResource customResource = TestUtils.testCustomResource();
+    TestCustomResource customResource = TestUtils.testCustomResource();
 
     timerEventSource.scheduleOnce(customResource, PERIOD);
     timerEventSource.scheduleOnce(customResource, 2 * PERIOD);
@@ -97,7 +97,7 @@ public void canRescheduleOnceEvent() {
 
   @Test
   public void deRegistersOnceEventSources() {
-    CustomResource customResource = TestUtils.testCustomResource();
+    TestCustomResource customResource = TestUtils.testCustomResource();
 
     timerEventSource.scheduleOnce(customResource, PERIOD);
     timerEventSource.eventSourceDeRegisteredForResource(getUID(customResource));
@@ -107,7 +107,7 @@ public void deRegistersOnceEventSources() {
 
   @Test
   public void eventNotRegisteredIfStopped() throws IOException {
-    CustomResource customResource = TestUtils.testCustomResource();
+    TestCustomResource customResource = TestUtils.testCustomResource();
 
     timerEventSource.close();
     assertThatExceptionOfType(IllegalStateException.class).isThrownBy(

operator-framework/src/test/java/io/javaoperatorsdk/operator/sample/event/EventSourceTestCustomResourceController.java

@@ -25,7 +25,8 @@ public class EventSourceTestCustomResourceController
   public static final int TIMER_DELAY = 300;
   public static final int TIMER_PERIOD = 500;
   private final AtomicInteger numberOfExecutions = new AtomicInteger(0);
-  private final TimerEventSource timerEventSource = new TimerEventSource();
+  private final TimerEventSource<EventSourceTestCustomResource> timerEventSource =
+      new TimerEventSource<>();
 
   @Override
   public void init(EventSourceManager eventSourceManager) {