Java: don't add abstract modifier to interface methods when pulling up methods

GitOrigin-RevId: df0c5de380b00f2d42e073a15f4472d52cb34470

java/java-impl-refactorings/src/com/intellij/refactoring/util/RefactoringUtil.java

@@ -383,7 +383,9 @@ public final class RefactoringUtil {
         body.delete();
       }
 
-      PsiUtil.setModifierProperty(method, PsiModifier.ABSTRACT, true);
+      if (!targetClass.isInterface()) {
+        PsiUtil.setModifierProperty(method, PsiModifier.ABSTRACT, true);
+      }
     }
 
     if (!targetClass.isInterface()) {

java/java-tests/testData/refactoring/pullUp/NoAbstractModifiersOnInterfaceMethods.java

@@ -0,0 +1,8 @@
+interface Foo1 {
+  void foo();
+}
+class Bar implements Foo1 {
+  public void <caret>foo() {
+    System.out.println("hello");
+  }
+}

java/java-tests/testData/refactoring/pullUp/NoAbstractModifiersOnInterfaceMethods_after.java

@@ -0,0 +1,9 @@
+interface Foo1 {
+    void foo();
+}
+class Bar implements Foo1 {
+  @Override
+  public void foo() {
+    System.out.println("hello");
+  }
+}

java/java-tests/testSrc/com/intellij/java/refactoring/PullUpTest.java

@@ -35,6 +35,10 @@ public class PullUpTest extends LightRefactoringTestCase {
     doTest(new RefactoringTestUtil.MemberDescriptor("foo", PsiMethod.class, true));
   }
 
+  public void testNoAbstractModifiersOnInterfaceMethods() {
+    doTest(new RefactoringTestUtil.MemberDescriptor("foo", PsiMethod.class, true));
+  }
+
   public void testQualifiedReference() {     // IDEADEV-25008
     doTest(new RefactoringTestUtil.MemberDescriptor("x", PsiField.class),
            new RefactoringTestUtil.MemberDescriptor("getX", PsiMethod.class),