wip

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

Author: csviri

docs/content/en/blog/releases/v5-3-release.md

@@ -220,6 +220,11 @@ checks.
 
 `reconciliationFinished(..)` is extended with `RetryInfo`. `monitorSizeOf(..)` is removed.
 
+### `ResourceAction` relocated
+
+`ResourceAction` in `io.javaoperatorsdk.operator.processing.event.source.controller` has been
+removed. Use `io.javaoperatorsdk.operator.processing.event.source.ResourceAction` instead.
+
 See the full [migration guide](/docs/migration/v5-3-migration) for details.
 
 ## Getting Started

docs/content/en/docs/migration/v5-3-migration.md

@@ -72,4 +72,10 @@ The following table shows the relevant method renames:
 
 Other changes:
 - `reconciliationFinished(..)` method is extended with `RetryInfo`
-- `monitorSizeOf(..)` method is removed.
+- `monitorSizeOf(..)` method is removed.
+
+## ResourceAction relocation
+
+The `ResourceAction` enum has been removed from
+`io.javaoperatorsdk.operator.processing.event.source.controller` use the one in package
+`io.javaoperatorsdk.operator.processing.event.source.ResourceAction`; thus update your imports accordingly.

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

@@ -15,58 +15,136 @@
  */
 package io.javaoperatorsdk.operator.migration;
 
+import java.util.Objects;
+
 import org.openrewrite.ExecutionContext;
+import org.openrewrite.NlsRewrite;
 import org.openrewrite.Option;
 import org.openrewrite.Recipe;
 import org.openrewrite.TreeVisitor;
 import org.openrewrite.java.JavaIsoVisitor;
-import org.openrewrite.java.MethodMatcher;
 import org.openrewrite.java.tree.J;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.openrewrite.java.tree.JavaType;
 
 public class RemoveMethodDeclaration extends Recipe {
 
   @Option(
-      displayName = "Method pattern",
-      description = "A method pattern used to find matching method declarations.",
-      example = "com.example.Foo bar(..)")
-  private final String methodPattern;
-
-  @JsonCreator
-  public RemoveMethodDeclaration(@JsonProperty("methodPattern") String methodPattern) {
-    this.methodPattern = methodPattern;
-  }
+      displayName = "Interface name",
+      description = "Fully qualified or simple name of the interface.",
+      example = "com.example.YourInterface")
+  String interfaceName;
+
+  @Option(
+      displayName = "Method name",
+      description = "Name of the method to remove.",
+      example = "removedMethod")
+  String methodName;
 
   @Override
   public String getDisplayName() {
-    return "Remove method declaration";
+    return "Remove obsolete method from implementing classes";
   }
 
   @Override
-  public String getDescription() {
-    return "Removes method declarations matching the given method pattern.";
+  public @NlsRewrite.Description String getDescription() {
+    return "Remove obsolete method from implementing classes";
   }
 
   @Override
   public TreeVisitor<?, ExecutionContext> getVisitor() {
-    var matcher = new MethodMatcher(methodPattern, true);
-    return new JavaIsoVisitor<>() {
+    return new JavaIsoVisitor<ExecutionContext>() {
+
+      @Override
+      public J.ClassDeclaration visitClassDeclaration(
+          J.ClassDeclaration classDecl, ExecutionContext ctx) {
+        J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx);
+
+        if (cd.getType() == null || !typeMatchesOrImplements(cd.getType())) {
+          return cd;
+        }
+
+        // Mutate the type info in place to remove the method from the declared methods list,
+        // so all AST nodes sharing this type reference stay consistent.
+        var type = cd.getType();
+        if (type instanceof JavaType.Class classType) {
+          var updatedMethods =
+              classType.getMethods().stream().filter(m -> !m.getName().equals(methodName)).toList();
+          classType.unsafeSet(
+              classType.getTypeParameters(),
+              classType.getSupertype(),
+              classType.getOwningClass(),
+              classType.getAnnotations(),
+              classType.getInterfaces(),
+              classType.getMembers(),
+              updatedMethods);
+        }
+
+        return cd;
+      }
+
       @Override
       public J.MethodDeclaration visitMethodDeclaration(
           J.MethodDeclaration method, ExecutionContext ctx) {
-        if (method.getMethodType() != null && matcher.matches(method.getMethodType())) {
-          //noinspection DataFlowIssue
-          return null;
+        if (!method.getSimpleName().equals(methodName)) {
+          return super.visitMethodDeclaration(method, ctx);
+        }
+
+        J.ClassDeclaration classDecl = getCursor().firstEnclosing(J.ClassDeclaration.class);
+        if (classDecl == null || classDecl.getType() == null) {
+          return super.visitMethodDeclaration(method, ctx);
         }
-        var classDecl = getCursor().firstEnclosing(J.ClassDeclaration.class);
-        if (classDecl != null && matcher.matches(method, classDecl)) {
+
+        if (typeMatchesOrImplements(classDecl.getType())) {
           //noinspection DataFlowIssue
           return null;
         }
+
         return super.visitMethodDeclaration(method, ctx);
       }
+
+      private boolean typeMatchesOrImplements(JavaType.FullyQualified type) {
+        for (var iface : type.getInterfaces()) {
+          if (iface.getFullyQualifiedName().equals(interfaceName)
+              || typeMatchesOrImplements(iface)) {
+            return true;
+          }
+        }
+        var supertype = type.getSupertype();
+        if (supertype != null && !supertype.getFullyQualifiedName().equals("java.lang.Object")) {
+          return typeMatchesOrImplements(supertype);
+        }
+        return false;
+      }
     };
   }
+
+  public String getInterfaceName() {
+    return interfaceName;
+  }
+
+  public void setInterfaceName(String interfaceName) {
+    this.interfaceName = interfaceName;
+  }
+
+  public String getMethodName() {
+    return methodName;
+  }
+
+  public void setMethodName(String methodName) {
+    this.methodName = methodName;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (o == null || getClass() != o.getClass()) return false;
+    if (!super.equals(o)) return false;
+    RemoveMethodDeclaration that = (RemoveMethodDeclaration) o;
+    return Objects.equals(interfaceName, that.interfaceName)
+        && Objects.equals(methodName, that.methodName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode(), interfaceName, methodName);
+  }
 }

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

@@ -26,6 +26,7 @@ recipeList:
   - io.javaoperatorsdk.operator.migration.RenameJUnitModule
   - io.javaoperatorsdk.operator.migration.MetricsMethodRenames
   - io.javaoperatorsdk.operator.migration.RemoveMonitorSizeOf
+  - io.javaoperatorsdk.operator.migration.RelocateResourceAction
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: io.javaoperatorsdk.operator.migration.UpgradeJOSDKVersion
@@ -98,11 +99,18 @@ recipeList:
 ---
 type: specs.openrewrite.org/v1beta/recipe
 name: io.javaoperatorsdk.operator.migration.RemoveMonitorSizeOf
-displayName: Remove monitorSizeOf method
-description: >-
-  Removes the monitorSizeOf method declarations and invocations which were removed in v5.3.
+displayName: Remove MonitorSizeOf
 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(..)"
+      interfaceName: io.javaoperatorsdk.operator.api.monitoring.Metrics
+      methodName: monitorSizeOf
+---
+type: specs.openrewrite.org/v1beta/recipe
+name: io.javaoperatorsdk.operator.migration.RelocateResourceAction
+displayName: Relocate ResourceAction class
+description: >-
+  Moves ResourceAction import from the controller sub-package to the event source package.
+recipeList:
+  - org.openrewrite.java.ChangeType:
+      oldFullyQualifiedTypeName: io.javaoperatorsdk.operator.processing.event.source.controller.ResourceAction
+      newFullyQualifiedTypeName: io.javaoperatorsdk.operator.processing.event.source.ResourceAction

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

@@ -178,7 +178,7 @@ public void reconciliationSubmitted(Object resource, Object retryInfo, Map<Strin
   @Test
   void removesMonitorSizeOfFromImplementationWithGenerics() {
     rewriteRun(
-        // Stub for the Metrics interface with generic monitorSizeOf
+        // Stub for the Metrics interface (unchanged, from JOSDK library)
         // language=java
         java(
             """
@@ -190,15 +190,6 @@ public interface Metrics {
               default void eventReceived(Object event, Map<String, Object> metadata) {}
               default <T extends Map<?, ?>> T monitorSizeOf(T map, String name) { return map; }
             }
-            """,
-            """
-            package io.javaoperatorsdk.operator.api.monitoring;
-
-            import java.util.Map;
-
-            public interface Metrics {
-              default void eventReceived(Object event, Map<String, Object> metadata) {}
-            }
             """),
         // Implementation that overrides monitorSizeOf with generic signature
         // language=java
@@ -287,4 +278,49 @@ default void reconciliationFinished(Object resource, RetryInfo retryInfo, Map<St
             }
             """));
   }
+
+  @Test
+  void relocatesResourceActionImport() {
+    rewriteRun(
+        // Stub for the old ResourceAction location
+        // language=java
+        java(
+            """
+            package io.javaoperatorsdk.operator.processing.event.source.controller;
+
+            public class ResourceAction {
+            }
+            """,
+            """
+            package io.javaoperatorsdk.operator.processing.event.source;
+
+            public class ResourceAction {
+            }
+            """),
+        // Class that imports ResourceAction from the old package
+        // language=java
+        java(
+            """
+            package com.example;
+
+            import io.javaoperatorsdk.operator.processing.event.source.controller.ResourceAction;
+
+            public class MyHandler {
+              public void handle(ResourceAction action) {
+                System.out.println(action);
+              }
+            }
+            """,
+            """
+            package com.example;
+
+            import io.javaoperatorsdk.operator.processing.event.source.ResourceAction;
+
+            public class MyHandler {
+              public void handle(ResourceAction action) {
+                System.out.println(action);
+              }
+            }
+            """));
+  }
 }