[java] remove redundant import when "Remove annotation" quick fix is applied (IDEA-288488)

GitOrigin-RevId: 562cf18eafa636a761c75ae3e9630bdab3eff760

java/java-analysis-impl/src/com/intellij/codeInspection/RemoveAnnotationQuickFix.java

@@ -9,13 +9,16 @@ import com.intellij.java.analysis.JavaAnalysisBundle;
 import com.intellij.openapi.application.WriteAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
+import com.intellij.psi.codeStyle.JavaCodeStyleManager;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import java.util.function.Consumer;
+import java.util.stream.Collectors;
 
 
 public class RemoveAnnotationQuickFix implements LocalQuickFix {
@@ -74,7 +77,13 @@ public class RemoveAnnotationQuickFix implements LocalQuickFix {
     if (!FileModificationService.getInstance().preparePsiElementsForWrite(physical)) {
       return;
     }
-    WriteAction.run(() -> physical.forEach(PsiAnnotation::delete));
+    WriteAction.run(() -> {
+      Set<PsiJavaFile> containingFiles = physical.stream().map(PsiAnnotation::getContainingFile)
+          .filter(PsiJavaFile.class::isInstance).map(PsiJavaFile.class::cast)
+          .collect(Collectors.toSet());
+      physical.forEach(PsiAnnotation::delete);
+      containingFiles.forEach(JavaCodeStyleManager.getInstance(project)::removeRedundantImports);
+    });
 
     if (qualifiedName != null) {
       for (PsiModifierListOwner owner : externalOwners) {

java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/annotateMethod/afterPrimitive.java

@@ -1,7 +1,5 @@
 // "Remove annotation" "true"
 
-import org.jetbrains.annotations.*;
-
 class Foo {
   <caret>int foo(){return 0;}
 }

java/java-tests/testData/inspection/nullableProblems/RemoveAnnotationWithImportQuickFix.java

@@ -0,0 +1,6 @@
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+class RemoveAnnotationWithImportQuickFix {
+  <warning descr="Cannot annotate with both @NotNull and @Nullable">@<caret>NotNull</warning> <warning descr="Cannot annotate with both @Nullable and @NotNull">@Nullable</warning> String s;
+}

java/java-tests/testData/inspection/nullableProblems/RemoveAnnotationWithImportQuickFix_after.java

@@ -0,0 +1,5 @@
+import org.jetbrains.annotations.Nullable;
+
+class RemoveAnnotationWithImportQuickFix {
+  @Nullable String s;
+}

java/java-tests/testData/inspection/nullableProblems/RemoveMethodAnnotationRemovesOverriders_after.java

@@ -1,5 +1,3 @@
-import org.jetbrains.annotations.*;
-
 interface Foo {
   long getTime();
 }

java/java-tests/testData/inspection/nullableProblems/RemoveParameterAnnotationRemovesOverriders_after.java

@@ -1,5 +1,3 @@
-import org.jetbrains.annotations.*;
-
 interface Foo {
   void getTime(int a);
 }

java/java-tests/testSrc/com/intellij/java/codeInspection/NullableStuffInspectionTest.java

@@ -374,6 +374,10 @@ public class NullableStuffInspectionTest extends LightJavaCodeInsightFixtureTest
     }
   }
 
+  public void testRemoveAnnotationWithImportQuickFix() {
+    doTestWithFix("Remove annotation");
+  }
+  
   public void testQuickFixOnTypeArgumentNullable() {
     DataFlowInspection8Test.setupTypeUseAnnotations("typeUse", myFixture);
     NullableNotNullManager manager = NullableNotNullManager.getInstance(getProject());