NoEmptyCollectionWithRawType: Minor tweaks

openrewrite · Mar 6, 2024 · ad1cf8e · ad1cf8e
1 parent 88f3531
commit ad1cf8e
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/src/main/java/org/openrewrite/staticanalysis/NoEmptyCollectionWithRawType.java b/src/main/java/org/openrewrite/staticanalysis/NoEmptyCollectionWithRawType.java
@@ -58,7 +58,6 @@ public Duration getEstimatedEffortPerOccurrence() {
     public TreeVisitor<?, ExecutionContext> getVisitor() {
         return Preconditions.check(new UsesType<>("java.util.Collections", false), new JavaVisitor<ExecutionContext>() {
             final Map<String, String> updateFields = new HashMap<>();
-
             {
                 updateFields.put("EMPTY_LIST", "emptyList");
                 updateFields.put("EMPTY_MAP", "emptyMap");
@@ -79,13 +78,13 @@ public J visitImport(J.Import anImport, ExecutionContext ctx) {
             public J visitFieldAccess(J.FieldAccess fieldAccess, ExecutionContext ctx) {
                 J.Identifier name = fieldAccess.getName();
                 JavaType.Variable varType = name.getFieldType();
-                if (varType != null && TypeUtils.isOfClassType(varType.getOwner(), "java.util.Collections") &&
-                    varType.getName().startsWith("EMPTY_")) {
-                    return JavaTemplate.builder("#{any(java.util.Collections)}." + updateFields.get(varType.getName()) + "()")
+                if (varType != null && varType.getName().startsWith("EMPTY_") &&
+                    TypeUtils.isOfClassType(varType.getOwner(), "java.util.Collections")) {
+                    return JavaTemplate.builder("java.util.Collections." + updateFields.get(varType.getName()) + "()")
                             .contextSensitive() // context sensitive due to generics
-                            .imports("java.util.Collections")
                             .build()
-                            .apply(getCursor(), fieldAccess.getCoordinates().replace(), fieldAccess.getTarget());
+                            .<J.MethodInvocation>apply(getCursor(), fieldAccess.getCoordinates().replace())
+                            .withSelect(fieldAccess.getTarget());
                 }
                 return super.visitFieldAccess(fieldAccess, ctx);
             }