Fix ChangeMethodTargetToVariable

openrewrite · Aug 3, 2020 · 8ff0f8c · 8ff0f8c
1 parent 19dcae8
commit 8ff0f8c
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodTargetToVariable.java b/rewrite-java/src/main/java/org/openrewrite/java/ChangeMethodTargetToVariable.java
@@ -101,14 +101,13 @@ public J visitMethodInvocation(J.MethodInvocation method) {
 
                 JavaType.Method methodType = null;
                 if (method.getType() != null) {
-                    // if the original is a static method invocation, the import on it's type may no longer be needed
-                    andThen(orderImports);
-
                     Set<Flag> flags = new LinkedHashSet<>(method.getType().getFlags());
                     flags.remove(Flag.Static);
                     methodType = method.getType().withDeclaringType(this.type).withFlags(flags);
                 }
 
+                andThen(orderImports);
+
                 return method
                         .withSelect(J.Ident.build(randomId(), variable, type, select == null ? Formatting.EMPTY : select.getFormatting()))
                         .withType(methodType);