Add Spring Data 3.0 upgrade recipe

build.gradle.kts

@@ -54,9 +54,11 @@ recipeDependencies {
     parserClasspath("org.springframework:spring-webmvc:5.+")
 
     parserClasspath("org.springframework.data:spring-data-commons:2.7.+")
+    parserClasspath("org.springframework.data:spring-data-commons:3.0.+")
     parserClasspath("org.springframework.data:spring-data-commons:1.+")
     parserClasspath("org.springframework.data:spring-data-jpa:2.+")
     parserClasspath("org.springframework.data:spring-data-jpa:2.3.+")
+    parserClasspath("org.springframework.data:spring-data-jpa:3.0.+")
     parserClasspath("org.springframework.data:spring-data-rest-webmvc:3.1.+")
     parserClasspath("org.springframework.data:spring-data-mongodb:2.2.+")
     parserClasspath("org.mongodb:mongo-java-driver:3.12.+")
@@ -159,7 +161,9 @@ recipeDependencies {
     testParserClasspath("org.springframework.data:spring-data-jpa:2.3.+")
     testParserClasspath("org.springframework.data:spring-data-jpa:2.4.+")
     testParserClasspath("org.springframework.data:spring-data-jpa:2.7.+")
+    testParserClasspath("org.springframework.data:spring-data-jpa:3.0.+")
     testParserClasspath("org.springframework.data:spring-data-jpa:3.4.7")
+    testParserClasspath("org.springframework.data:spring-data-commons:3.0.+")
     testParserClasspath("org.springframework.data:spring-data-mongodb:2.2.+")
 
     testParserClasspath("org.springframework.plugin:spring-plugin-core:2.0.0.RELEASE")

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

@@ -0,0 +1,103 @@
+/*
+ * Copyright 2026 the original author or authors.
+ * <p>
+ * Licensed under the Moderne Source Available License (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * https://docs.moderne.io/licensing/moderne-source-available-license
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.openrewrite.java.spring.data;
+
+import lombok.Getter;
+import org.openrewrite.ExecutionContext;
+import org.openrewrite.Preconditions;
+import org.openrewrite.Recipe;
+import org.openrewrite.TreeVisitor;
+import org.openrewrite.java.JavaIsoVisitor;
+import org.openrewrite.java.search.UsesType;
+import org.openrewrite.java.tree.*;
+import org.openrewrite.internal.ListUtils;
+import org.openrewrite.marker.Markers;
+
+import java.util.Arrays;
+
+import static org.openrewrite.Tree.randomId;
+
+public class MigratePagingAndSortingRepository extends Recipe {
+
+    private static final String PAGING_AND_SORTING_REPOSITORY = "org.springframework.data.repository.PagingAndSortingRepository";
+    private static final String CRUD_REPOSITORY = "org.springframework.data.repository.CrudRepository";
+
+    @Getter
+    final String displayName = "Add `CrudRepository` to interfaces extending `PagingAndSortingRepository`";
+
+    @Getter
+    final String description = "In Spring Data 3.0, `PagingAndSortingRepository` no longer extends `CrudRepository`. " +
+            "Interfaces that extend only `PagingAndSortingRepository` must also explicitly extend `CrudRepository` " +
+            "to retain CRUD methods like `save()`, `findById()`, and `delete()`.";
+
+    @Override
+    public TreeVisitor<?, ExecutionContext> getVisitor() {
+        return Preconditions.check(new UsesType<>(PAGING_AND_SORTING_REPOSITORY, false), new JavaIsoVisitor<ExecutionContext>() {
+            @Override
+            public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext ctx) {
+                J.ClassDeclaration cd = super.visitClassDeclaration(classDecl, ctx);
+                if (cd.getKind() != J.ClassDeclaration.Kind.Type.Interface || cd.getImplements() == null) {
+                    return cd;
+                }
+
+                J.ParameterizedType pagingAndSortingType = null;
+                boolean alreadyHasCrud = false;
+
+                JavaType.FullyQualified crudRepoTarget = JavaType.ShallowClass.build(CRUD_REPOSITORY);
+                for (TypeTree impl : cd.getImplements()) {
+                    if (TypeUtils.isOfClassType(impl.getType(), PAGING_AND_SORTING_REPOSITORY) && impl instanceof J.ParameterizedType) {
+                        pagingAndSortingType = (J.ParameterizedType) impl;
+                    } else if (TypeUtils.isAssignableTo(crudRepoTarget, TypeUtils.asFullyQualified(impl.getType()))) {
+                        alreadyHasCrud = true;
+                    }
+                }
+
+                if (pagingAndSortingType != null && !alreadyHasCrud &&
+                        pagingAndSortingType.getTypeParameters() != null &&
+                        pagingAndSortingType.getTypeParameters().size() == 2) {
+
+                    // Build CrudRepository type with the same type parameters
+                    JavaType.FullyQualified crudRepoType = JavaType.ShallowClass.build(CRUD_REPOSITORY)
+                            .withTypeParameters(Arrays.asList(
+                                    pagingAndSortingType.getTypeParameters().get(0).getType(),
+                                    pagingAndSortingType.getTypeParameters().get(1).getType()
+                            ));
+
+                    // Clone the PagingAndSortingRepository parameterized type, replacing name and type
+                    J.Identifier crudRepoIdent = new J.Identifier(
+                            randomId(),
+                            Space.EMPTY,
+                            Markers.EMPTY,
+                            null,
+                            "CrudRepository",
+                            crudRepoType,
+                            null
+                    );
+
+                    J.ParameterizedType crudRepoParamType = pagingAndSortingType
+                            .withId(randomId())
+                            .withPrefix(Space.SINGLE_SPACE)
+                            .withClazz(crudRepoIdent)
+                            .withType(crudRepoType);
+
+                    maybeAddImport(CRUD_REPOSITORY);
+                    return cd.withImplements(ListUtils.concat(cd.getImplements(), crudRepoParamType));
+                }
+                return cd;
+            }
+        });
+    }
+}