wip

Signed-off-by: Attila Mészáros <a_meszaros@apple.com>

Author: csviri

migration/src/main/resources/META-INF/rewrite/v5-3-migration.yml

@@ -73,6 +73,11 @@ recipeList:
       methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics failedReconciliation(..)"
       newMethodName: reconciliationFailed
       matchOverrides: true
+  - org.openrewrite.java.AddMethodParameter:
+      methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics reconciliationFailed(..)"
+      parameterType: io.javaoperatorsdk.operator.api.reconciler.RetryInfo
+      parameterName: retryInfo
+      parameterIndex: 1
   - org.openrewrite.java.ChangeMethodName:
       methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics finishedReconciliation(..)"
       newMethodName: reconciliationFinished
@@ -93,9 +98,11 @@ recipeList:
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: io.javaoperatorsdk.operator.migration.RemoveMonitorSizeOf
-displayName: Remove monitorSizeOf method invocations
+displayName: Remove monitorSizeOf method
 description: >-
-  Removes calls to the monitorSizeOf method which was removed in v5.3.
+  Removes the monitorSizeOf method declarations and invocations which were removed in v5.3.
 recipeList:
   - org.openrewrite.java.RemoveMethodInvocations:
       methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics monitorSizeOf(..)"
+  - io.javaoperatorsdk.operator.migration.RemoveMethodDeclaration:
+      methodPattern: "io.javaoperatorsdk.operator.api.monitoring.Metrics monitorSizeOf(..)"

migration/src/test/java/io/javaoperatorsdk/operator/migration/V53MigrationTest.java

@@ -82,7 +82,7 @@ default void receivedEvent(Object event, Map<String, Object> metadata) {}
               default void reconcileCustomResource(Object resource, Object retryInfo, Map<String, Object> metadata) {}
               default void reconciliationExecutionStarted(Object resource, Map<String, Object> metadata) {}
               default void reconciliationExecutionFinished(Object resource, Map<String, Object> metadata) {}
-              default void failedReconciliation(Object resource, Object retryInfo, Exception exception, Map<String, Object> metadata) {}
+              default void failedReconciliation(Object resource, Exception exception, Map<String, Object> metadata) {}
               default void finishedReconciliation(Object resource, Map<String, Object> metadata) {}
               default void cleanupDoneFor(Object resourceID, Map<String, Object> metadata) {}
             }
@@ -99,7 +99,8 @@ default void eventReceived(Object event, Map<String, Object> metadata) {}
               default void reconciliationSubmitted(Object resource, Object retryInfo, Map<String, Object> metadata) {}
               default void reconciliationStarted(Object resource, Map<String, Object> metadata) {}
               default void reconciliationSucceeded(Object resource, Map<String, Object> metadata) {}
-              default void reconciliationFailed(Object resource, Object retryInfo, Exception exception, Map<String, Object> metadata) {}
+
+                default void reconciliationFailed(Object resource, RetryInfo retryInfo, Exception exception, Map<String, Object> metadata) {}
 
                 default void reconciliationFinished(Object resource, RetryInfo retryInfo, Map<String, Object> metadata) {}
               default void cleanupDone(Object resourceID, Map<String, Object> metadata) {}
@@ -173,4 +174,31 @@ public void reconciliationSubmitted(Object resource, Object retryInfo, Map<Strin
             }
             """));
   }
+
+  @Test
+  void addsRetryInfoParameterToReconciliationFinished() {
+    rewriteRun(
+        // language=java
+        java(
+            """
+            package io.javaoperatorsdk.operator.api.monitoring;
+
+            import java.util.Map;
+
+            public interface Metrics {
+              default void finishedReconciliation(Object resource, Map<String, Object> metadata) {}
+            }
+            """,
+            """
+            package io.javaoperatorsdk.operator.api.monitoring;
+
+            import io.javaoperatorsdk.operator.api.reconciler.RetryInfo;
+
+            import java.util.Map;
+
+            public interface Metrics {
+                default void reconciliationFinished(Object resource, RetryInfo retryInfo, Map<String, Object> metadata) {}
+            }
+            """));
+  }
 }