Skip adding CrudRepository when already on Spring Data 3.x (#996)

Author: steve-aom-elliott

src/main/java/org/openrewrite/java/spring/data/MigratePagingAndSortingRepository.java

@@ -65,7 +65,12 @@ public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, Ex
                     }
                 }
 
+                // Only add CrudRepository when the classpath PagingAndSortingRepository still
+                // extends CrudRepository (Spring Data 2.x). In 3.x the inheritance was removed
+                // intentionally, so not extending CrudRepository may be a conscious choice.
                 if (pagingAndSortingType != null && !alreadyHasCrud &&
+                        TypeUtils.isAssignableTo(crudRepoTarget,
+                                TypeUtils.asFullyQualified(pagingAndSortingType.getType())) &&
                         pagingAndSortingType.getTypeParameters() != null &&
                         pagingAndSortingType.getTypeParameters().size() == 2) {
 

src/test/java/org/openrewrite/java/spring/data/MigratePagingAndSortingRepositoryTest.java

@@ -191,4 +191,29 @@ public class NotAnInterface {
           )
         );
     }
+
+    @Test
+    void noChangeWhenAlreadyOnSpringData3() {
+        rewriteRun(
+          spec -> spec.parser(JavaParser.fromJavaVersion().classpathFromResources(new InMemoryExecutionContext(),
+                  "spring-data-commons-3.*")),
+          //language=java
+          java(
+            """
+              import org.springframework.data.repository.PagingAndSortingRepository;
+
+              public interface UserRepository extends PagingAndSortingRepository<User, Long> {
+              }
+              """
+          ),
+          //language=java
+          java(
+            """
+              public class User {
+                  private Long id;
+              }
+              """
+          )
+        );
+    }
 }