remove-package

Author: fabapp2

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/CrudRepositoryExtension.java

@@ -18,11 +18,11 @@
 
 import org.jetbrains.annotations.NotNull;
 import org.openrewrite.*;
+import org.openrewrite.internal.lang.NonNullApi;
 import org.openrewrite.internal.lang.Nullable;
 import org.openrewrite.java.JavaIsoVisitor;
 import org.openrewrite.java.tree.J;
 import org.openrewrite.java.tree.JavaType;
-import org.springframework.sbm.boot.upgrade_27_30.helperrecipe.ImplementTypedInterface;
 
 import java.util.List;
 import java.util.Optional;
@@ -32,6 +32,7 @@ public class CrudRepositoryExtension extends Recipe {
     public static final String CRUD_REPOSITORY = "org.springframework.data.repository.CrudRepository";
 
     @Override
+    @NotNull
     public String getDisplayName() {
         return "Extends CrudRepository for Interfaces that extends PagingAndSortingRepository";
     }
@@ -40,7 +41,8 @@ public String getDisplayName() {
     protected @Nullable TreeVisitor<?, ExecutionContext> getApplicableTest() {
         return new JavaIsoVisitor<>() {
             @Override
-            public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext executionContext) {
+            @NotNull
+            public J.ClassDeclaration visitClassDeclaration(@NotNull J.ClassDeclaration classDecl, @NotNull ExecutionContext executionContext) {
                 return doesItExtendPagingAndSorting(classDecl) ? applyThisRecipe(classDecl) : ceaseVisit(classDecl);
             }
 
@@ -64,10 +66,12 @@ private J.ClassDeclaration applyThisRecipe(J.ClassDeclaration classDecl) {
     }
 
     @Override
+    @NotNull
     protected JavaIsoVisitor<ExecutionContext> getVisitor() {
         return new JavaIsoVisitor<>() {
             @Override
-            public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, ExecutionContext executionContext) {
+            @NotNull
+            public J.ClassDeclaration visitClassDeclaration(@NotNull J.ClassDeclaration classDecl, @NotNull ExecutionContext executionContext) {
 
                 Optional<JavaType.FullyQualified> pagingInterface = getExtendPagingAndSorting(classDecl);
                 if (pagingInterface.isEmpty()) {

components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/helperrecipe/ImplementTypedInterface.java renamed to components/sbm-recipes-boot-upgrade/src/main/java/org/springframework/sbm/boot/upgrade_27_30/ImplementTypedInterface.java

@@ -13,8 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.sbm.boot.upgrade_27_30.helperrecipe;
+package org.springframework.sbm.boot.upgrade_27_30;
 
+import org.jetbrains.annotations.NotNull;
 import org.openrewrite.Tree;
 import org.openrewrite.internal.ListUtils;
 import org.openrewrite.internal.lang.Nullable;
@@ -38,19 +39,18 @@ public ImplementTypedInterface(J.ClassDeclaration scope, JavaType.FullyQualified
     }
 
     public ImplementTypedInterface(J.ClassDeclaration scope, String interfaze, List<JavaType> typeParameters) {
-        this(scope, (JavaType.FullyQualified) JavaType.ShallowClass.build(interfaze), typeParameters);
+        this(scope, JavaType.ShallowClass.build(interfaze), typeParameters);
     }
 
-    public J.ClassDeclaration visitClassDeclaration(J.ClassDeclaration classDecl, P p) {
+    @NotNull
+    public J.ClassDeclaration visitClassDeclaration(@NotNull J.ClassDeclaration classDecl, @NotNull P p) {
         J.ClassDeclaration c = super.visitClassDeclaration(classDecl, p);
-        if (c.isScope(this.scope) && (c.getImplements() == null || c.getImplements().stream().noneMatch((f) -> {
-            return TypeUtils.isAssignableTo(f.getType(), this.interfaceType);
-        }))) {
+        if (c.isScope(this.scope) && (c.getImplements() == null || c.getImplements().stream().noneMatch((f) -> TypeUtils.isAssignableTo(f.getType(), this.interfaceType)))) {
             if (!classDecl.getSimpleName().equals(this.interfaceType.getClassName())) {
                 this.maybeAddImport(this.interfaceType);
             }
 
-            TypeTree type = (TypeTree) TypeTree.build(classDecl.getSimpleName().equals(this.interfaceType.getClassName()) ? this.interfaceType.getFullyQualifiedName() : this.interfaceType.getClassName()).withType(this.interfaceType).withPrefix(Space.format(" "));
+            TypeTree type = TypeTree.build(classDecl.getSimpleName().equals(this.interfaceType.getClassName()) ? this.interfaceType.getFullyQualifiedName() : this.interfaceType.getClassName()).withType(this.interfaceType).withPrefix(Space.format(" "));
             if (typeParameters != null && !typeParameters.isEmpty() && typeParameters.stream().noneMatch(tp -> tp instanceof JavaType.GenericTypeVariable)) {
                 type = new J.ParameterizedType(UUID.randomUUID(), Space.EMPTY, Markers.EMPTY, type, buildTypeParameters(typeParameters));
             }
@@ -89,9 +89,7 @@ private JContainer<Expression> buildTypeParameters(List<JavaType> typeParameters
     private TypeTree buildTypeTree(@Nullable JavaType type, Space space) {
         if (type == null || type instanceof JavaType.Unknown) {
             return null;
-        } else if (type instanceof JavaType.FullyQualified) {
-
-            JavaType.FullyQualified fq = (JavaType.FullyQualified) type;
+        } else if (type instanceof JavaType.FullyQualified fq) {
 
             J.Identifier identifier = new J.Identifier(Tree.randomId(),
                     space,
@@ -120,9 +118,7 @@ private TypeTree buildTypeTree(@Nullable JavaType type, Space space) {
                 maybeAddImport(fq);
                 return identifier;
             }
-        } else if (type instanceof JavaType.GenericTypeVariable) {
-            JavaType.GenericTypeVariable genericType = (JavaType.GenericTypeVariable) type;
-
+        } else if (type instanceof JavaType.GenericTypeVariable genericType) {
             if (!genericType.getName().equals("?")) {
                 return new J.Identifier(Tree.randomId(),
                         space,