Align with latest changes in rewrite

openrewrite · Dec 18, 2023 · aabf288 · aabf288
1 parent 1a65c15
commit aabf288
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/org/openrewrite/staticanalysis/FinalizePrivateFields.java b/src/main/java/org/openrewrite/staticanalysis/FinalizePrivateFields.java
@@ -108,7 +108,8 @@ public J.VariableDeclarations visitVariableDeclarations(J.VariableDeclarations m
     }
 
     private static boolean anyAnnotationApplied(J.VariableDeclarations mv) {
-        return !mv.getAllAnnotations().isEmpty();
+        return !mv.getLeadingAnnotations().isEmpty()
+               || mv.getTypeExpression() instanceof J.AnnotatedType;
     }
 
     /**

diff --git a/src/main/java/org/openrewrite/staticanalysis/JavaElementFactory.java b/src/main/java/org/openrewrite/staticanalysis/JavaElementFactory.java
@@ -83,7 +83,7 @@ static Expression className(JavaType type, boolean qualified) {
         Scanner scanner = new Scanner(qualifiedName.replace('$', '.')).useDelimiter("\\.");
         for (int i = 0; scanner.hasNext(); i++) {
             String part = scanner.next();
-            JavaType typeOfContaining = scanner.hasNext() ? null : type;
+            JavaType typeOfContaining = scanner.hasNext() ? JavaType.Unknown.getInstance() : type;
             if (i > 0) {
                 name = new J.FieldAccess(
                         randomId(),