renaming from PR comments, test info message

Author: csviri

operator-framework/src/main/java/io/javaoperatorsdk/operator/api/RetryInfo.java

@@ -1,25 +1,8 @@
 package io.javaoperatorsdk.operator.api;
 
-public class RetryInfo {
+public interface RetryInfo {
 
-  private int attemptIndex;
-  private boolean lastAttempt;
+  int getAttemptCount();
 
-  public RetryInfo(int retryNumber, boolean lastAttempt) {
-    this.attemptIndex = retryNumber;
-    this.lastAttempt = lastAttempt;
-  }
-
-  public int getAttemptIndex() {
-    return attemptIndex;
-  }
-
-  public boolean isLastAttempt() {
-    return lastAttempt;
-  }
-
-  @Override
-  public String toString() {
-    return "RetryInfo{" + "attemptIndex=" + attemptIndex + ", lastAttempt=" + lastAttempt + '}';
-  }
+  boolean isLastAttempt();
 }

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

@@ -103,12 +103,7 @@ private void executeBufferedEvents(String customResourceUid) {
   }
 
   private RetryInfo retryInfo(String customResourceUid) {
-    RetryExecution retryExecution = retryState.get(customResourceUid);
-    if (retryExecution != null) {
-      return new RetryInfo(retryExecution.getCurrentAttemptIndex(), retryExecution.isLastAttempt());
-    } else {
-      return null;
-    }
+    return retryState.get(customResourceUid);
   }
 
   void eventProcessingFinished(

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/GenericRetryExecution.java

@@ -34,7 +34,7 @@ public boolean isLastAttempt() {
   }
 
   @Override
-  public int getCurrentAttemptIndex() {
+  public int getAttemptCount() {
     return lastAttemptIndex;
   }
 }

operator-framework/src/main/java/io/javaoperatorsdk/operator/processing/retry/RetryExecution.java

@@ -1,8 +1,9 @@
 package io.javaoperatorsdk.operator.processing.retry;
 
+import io.javaoperatorsdk.operator.api.RetryInfo;
 import java.util.Optional;
 
-public interface RetryExecution {
+public interface RetryExecution extends RetryInfo {
 
   /**
    * Calculates the delay for the next execution. This method should return 0, when called first
@@ -11,12 +12,4 @@ public interface RetryExecution {
    * @return
    */
   Optional<Long> nextDelay();
-
-  /**
-   * @return true, if the last returned delay is, the last returned values, thus there will be no
-   *     further retry
-   */
-  boolean isLastAttempt();
-
-  int getCurrentAttemptIndex();
 }

operator-framework/src/test/java/io/javaoperatorsdk/operator/EventDispatcherTest.java

@@ -187,14 +187,27 @@ void executeControllerRegardlessGenerationInNonGenerationAwareMode() {
   @Test
   void propagatesRetryInfoToContext() {
     eventDispatcher.handleExecution(
-        new ExecutionScope(Arrays.asList(), testCustomResource, new RetryInfo(2, true)));
+        new ExecutionScope(
+            Arrays.asList(),
+            testCustomResource,
+            new RetryInfo() {
+              @Override
+              public int getAttemptCount() {
+                return 2;
+              }
+
+              @Override
+              public boolean isLastAttempt() {
+                return true;
+              }
+            }));
 
     ArgumentCaptor<Context<CustomResource>> contextArgumentCaptor =
         ArgumentCaptor.forClass(Context.class);
     verify(controller, times(1))
         .createOrUpdateResource(eq(testCustomResource), contextArgumentCaptor.capture());
     Context<CustomResource> context = contextArgumentCaptor.getValue();
-    assertThat(context.getRetryInfo().get().getAttemptIndex()).isEqualTo(2);
+    assertThat(context.getRetryInfo().get().getAttemptCount()).isEqualTo(2);
     assertThat(context.getRetryInfo().get().isLastAttempt()).isEqualTo(true);
   }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/DefaultEventHandlerTest.java

@@ -26,9 +26,13 @@
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.stubbing.Answer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 class DefaultEventHandlerTest {
 
+  private static final Logger log = LoggerFactory.getLogger(DefaultEventHandlerTest.class);
+
   public static final int FAKE_CONTROLLER_EXECUTION_DURATION = 250;
   public static final int SEPARATE_EXECUTION_TIMEOUT = 450;
   private EventDispatcher eventDispatcherMock = mock(EventDispatcher.class);
@@ -160,6 +164,8 @@ public void executesTheControllerInstantlyAfterErrorIfEventsBuffered() {
 
   @Test
   public void successfulExecutionResetsTheRetry() {
+    log.info("Starting successfulExecutionResetsTheRetry");
+
     Event event = prepareCREvent();
     TestCustomResource customResource = testCustomResource();
     customResource.getMetadata().setUid(event.getRelatedCustomResourceUid());
@@ -187,7 +193,7 @@ public void successfulExecutionResetsTheRetry() {
     assertThat(executionScopes).hasSize(3);
     assertThat(executionScopes.get(0).getRetryInfo()).isNull();
     assertThat(executionScopes.get(2).getRetryInfo()).isNull();
-    assertThat(executionScopes.get(1).getRetryInfo().getAttemptIndex()).isEqualTo(1);
+    assertThat(executionScopes.get(1).getRetryInfo().getAttemptCount()).isEqualTo(1);
     assertThat(executionScopes.get(1).getRetryInfo().isLastAttempt()).isEqualTo(false);
   }
 

operator-framework/src/test/java/io/javaoperatorsdk/operator/processing/retry/GenericRetryExecutionTest.java

@@ -78,9 +78,9 @@ public void supportsIsLastExecution() {
   public void returnAttemptIndex() {
     RetryExecution retryExecution = GenericRetry.defaultLimitedExponentialRetry().initExecution();
 
-    assertThat(retryExecution.getCurrentAttemptIndex()).isEqualTo(0);
+    assertThat(retryExecution.getAttemptCount()).isEqualTo(0);
     retryExecution.nextDelay();
-    assertThat(retryExecution.getCurrentAttemptIndex()).isEqualTo(1);
+    assertThat(retryExecution.getAttemptCount()).isEqualTo(1);
   }
 
   private RetryExecution getDefaultRetryExecution() {