improve: remove deprecated RetryConfiguration (#2211)

Signed-off-by: Attila Mészáros <[email protected]>

Author: csviri

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/ControllerConfiguration.java

@@ -13,7 +13,6 @@
 import io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter;
 import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
 import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
-import io.javaoperatorsdk.operator.processing.retry.GradualRetry;
 import io.javaoperatorsdk.operator.processing.retry.Retry;
 
 public interface ControllerConfiguration<P extends HasMetadata> extends ResourceConfiguration<P> {
@@ -58,22 +57,7 @@ default boolean isGenerationAware() {
   String getAssociatedReconcilerClassName();
 
   default Retry getRetry() {
-    final var configuration = getRetryConfiguration();
-    return !RetryConfiguration.DEFAULT.equals(configuration)
-        ? GenericRetry.fromConfiguration(configuration)
-        : GenericRetry.DEFAULT; // NOSONAR
-  }
-
-  /**
-   * Use {@link #getRetry()} instead.
-   *
-   * @return configuration for retry.
-   * @deprecated provide your own {@link Retry} implementation or use the {@link GradualRetry}
-   *             annotation instead
-   */
-  @Deprecated(forRemoval = true)
-  default RetryConfiguration getRetryConfiguration() {
-    return RetryConfiguration.DEFAULT;
+    return GenericRetry.DEFAULT;
   }
 
   @SuppressWarnings("rawtypes")

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/DefaultRetryConfiguration.java

@@ -1,7 +1,6 @@
 package io.javaoperatorsdk.operator.processing.retry;
 
 import io.javaoperatorsdk.operator.api.config.AnnotationConfigurable;
-import io.javaoperatorsdk.operator.api.config.RetryConfiguration;
 
 public class GenericRetry implements Retry, AnnotationConfigurable<GradualRetry> {
   private int maxAttempts = GradualRetry.DEFAULT_MAX_ATTEMPTS;
@@ -19,23 +18,6 @@ public static GenericRetry noRetry() {
     return new GenericRetry().setMaxAttempts(0);
   }
 
-  /**
-   * @deprecated Use the {@link GradualRetry} annotation instead
-   *
-   * @param configuration retry config
-   * @return Retry instance
-   */
-  @Deprecated(forRemoval = true)
-  public static Retry fromConfiguration(RetryConfiguration configuration) {
-    return configuration == null ? defaultLimitedExponentialRetry()
-        : new GenericRetry()
-            .setInitialInterval(configuration.getInitialInterval())
-            .setMaxAttempts(configuration.getMaxAttempts())
-            .setIntervalMultiplier(configuration.getIntervalMultiplier())
-            .setMaxInterval(configuration.getMaxInterval());
-  }
-
-
   public static GenericRetry every10second10TimesRetry() {
     return new GenericRetry().withLinearRetry().setMaxAttempts(10).setInitialInterval(10000);
   }

operator-framework-core/src/main/java/io/javaoperatorsdk/operator/api/config/RetryConfiguration.java

@@ -18,7 +18,6 @@
 import io.javaoperatorsdk.operator.api.config.BaseConfigurationService;
 import io.javaoperatorsdk.operator.api.config.ConfigurationService;
 import io.javaoperatorsdk.operator.api.config.ControllerConfiguration;
-import io.javaoperatorsdk.operator.api.config.RetryConfiguration;
 import io.javaoperatorsdk.operator.api.monitoring.Metrics;
 import io.javaoperatorsdk.operator.processing.event.rate.LinearRateLimiter;
 import io.javaoperatorsdk.operator.processing.event.rate.RateLimiter;
@@ -28,6 +27,7 @@
 import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceEvent;
 import io.javaoperatorsdk.operator.processing.event.source.timer.TimerEventSource;
 import io.javaoperatorsdk.operator.processing.retry.GenericRetry;
+import io.javaoperatorsdk.operator.processing.retry.GradualRetry;
 import io.javaoperatorsdk.operator.processing.retry.Retry;
 import io.javaoperatorsdk.operator.processing.retry.RetryExecution;
 import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
@@ -135,7 +135,7 @@ void schedulesAnEventRetryOnException() {
 
     verify(retryTimerEventSourceMock, times(1))
         .scheduleOnce(eq(ResourceID.fromResource(customResource)),
-            eq(RetryConfiguration.DEFAULT_INITIAL_INTERVAL));
+            eq(GradualRetry.DEFAULT_INITIAL_INTERVAL));
   }
 
   @Test
@@ -167,7 +167,7 @@ void executesTheControllerInstantlyAfterErrorIfNewEventsReceived() {
     assertThat(allValues).hasSize(2);
     verify(retryTimerEventSourceMock, never())
         .scheduleOnce(eq(ResourceID.fromResource(customResource)),
-            eq(RetryConfiguration.DEFAULT_INITIAL_INTERVAL));
+            eq(GradualRetry.DEFAULT_INITIAL_INTERVAL));
   }
 
   @Test

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

@@ -4,38 +4,10 @@
 
 import org.junit.jupiter.api.Test;
 
-import io.javaoperatorsdk.operator.api.config.RetryConfiguration;
-
 import static org.assertj.core.api.Assertions.assertThat;
 
 public class GenericRetryExecutionTest {
 
-  @Test
-  public void forFirstBackOffAlwaysReturnsInitialInterval() {
-    assertThat(getDefaultRetryExecution().nextDelay().get())
-        .isEqualTo(RetryConfiguration.DEFAULT_INITIAL_INTERVAL);
-  }
-
-  @Test
-  public void delayIsMultipliedEveryNextDelayCall() {
-    RetryExecution retryExecution = getDefaultRetryExecution();
-
-    Optional<Long> res = callNextDelayNTimes(retryExecution, 1);
-    assertThat(res.get()).isEqualTo(RetryConfiguration.DEFAULT_INITIAL_INTERVAL);
-
-    res = retryExecution.nextDelay();
-    assertThat(res.get())
-        .isEqualTo((long) (RetryConfiguration.DEFAULT_INITIAL_INTERVAL
-            * RetryConfiguration.DEFAULT_MULTIPLIER));
-
-    res = retryExecution.nextDelay();
-    assertThat(res.get())
-        .isEqualTo(
-            (long) (RetryConfiguration.DEFAULT_INITIAL_INTERVAL
-                * RetryConfiguration.DEFAULT_MULTIPLIER
-                * RetryConfiguration.DEFAULT_MULTIPLIER));
-  }
-
   @Test
   public void noNextDelayIfMaxAttemptLimitReached() {
     RetryExecution retryExecution =