wip

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

Author: csviri

migration/src/main/java/io/javaoperatorsdk/operator/migration/RemoveMethodDeclaration.java

@@ -56,6 +56,10 @@ public TreeVisitor<?, ExecutionContext> getVisitor() {
       @Override
       public J.MethodDeclaration visitMethodDeclaration(
           J.MethodDeclaration method, ExecutionContext ctx) {
+        if (method.getMethodType() != null && matcher.matches(method.getMethodType())) {
+          //noinspection DataFlowIssue
+          return null;
+        }
         var classDecl = getCursor().firstEnclosing(J.ClassDeclaration.class);
         if (classDecl != null && matcher.matches(method, classDecl)) {
           //noinspection DataFlowIssue

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

@@ -176,9 +176,9 @@ public void reconciliationSubmitted(Object resource, Object retryInfo, Map<Strin
   }
 
   @Test
-  void removesMonitorSizeOfFromImplementation() {
+  void removesMonitorSizeOfFromImplementationWithGenerics() {
     rewriteRun(
-        // Stub for the Metrics interface
+        // Stub for the Metrics interface with generic monitorSizeOf
         // language=java
         java(
             """
@@ -188,7 +188,7 @@ void removesMonitorSizeOfFromImplementation() {
 
             public interface Metrics {
               default void eventReceived(Object event, Map<String, Object> metadata) {}
-              default Map<String, Object> monitorSizeOf(Map<String, Object> map) { return map; }
+              default <T extends Map<?, ?>> T monitorSizeOf(T map, String name) { return map; }
             }
             """,
             """
@@ -200,7 +200,7 @@ public interface Metrics {
               default void eventReceived(Object event, Map<String, Object> metadata) {}
             }
             """),
-        // Implementation that overrides monitorSizeOf
+        // Implementation that overrides monitorSizeOf with generic signature
         // language=java
         java(
             """
@@ -216,7 +216,7 @@ public void eventReceived(Object event, Map<String, Object> metadata) {
               }
 
               @Override
-              public Map<String, Object> monitorSizeOf(Map<String, Object> map) {
+              public <T extends Map<?, ?>> T monitorSizeOf(T map, String name) {
                 System.out.println("monitoring size");
                 return map;
               }
@@ -234,6 +234,30 @@ public void eventReceived(Object event, Map<String, Object> metadata) {
                 System.out.println("event");
               }
             }
+            """),
+        // Implementation without @Override annotation
+        // language=java
+        java(
+            """
+            package com.example;
+
+            import java.util.Map;
+            import io.javaoperatorsdk.operator.api.monitoring.Metrics;
+
+            public class AnotherMetrics implements Metrics {
+              public <T extends Map<?, ?>> T monitorSizeOf(T map, String name) {
+                return map;
+              }
+            }
+            """,
+            """
+            package com.example;
+
+            import java.util.Map;
+            import io.javaoperatorsdk.operator.api.monitoring.Metrics;
+
+            public class AnotherMetrics implements Metrics {
+            }
             """));
   }