Prepare LombokValToFinalVar for Lombok type attribution

Author: knutwannheden

src/main/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVar.java

@@ -80,7 +80,8 @@ public J.CompilationUnit visitCompilationUnit(J.CompilationUnit compilationUnit,
         @Override
         public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations mv, ExecutionContext ctx) {
             J.VariableDeclarations varDecls = super.visitVariableDeclarations(mv, ctx);
-            if (TypeUtils.isOfClassType(varDecls.getType(), LOMBOK_VAL)) {
+            if (TypeUtils.isOfClassType(varDecls.getType(), LOMBOK_VAL) ||
+                (varDecls.getTypeExpression() instanceof J.Identifier && ((J.Identifier) varDecls.getTypeExpression()).getSimpleName().equals("val"))) {
                 maybeRemoveImport(LOMBOK_VAL);
 
                 J.VariableDeclarations.NamedVariable nv = mv.getVariables().get(0);

src/test/java/org/openrewrite/java/migrate/lombok/LombokValToFinalVarTest.java

@@ -64,6 +64,7 @@ void bar() {
     void replaceAssignmentVar() {
         //language=java
         rewriteRun(
+          spec -> spec.typeValidationOptions(TypeValidation.builder().identifiers(false).build()),
           version(
             java(
               """