diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodAnalyzer.kt b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodAnalyzer.kt
index 7417304b2617..d88571cdfc44 100644
--- a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodAnalyzer.kt
+++ b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodAnalyzer.kt
@@ -215,7 +215,7 @@ internal fun updateMethodAnnotations(method: PsiMethod, inputParameters: List<In
     //TODO use dataoutput.nullability instead
     val returnedExpressions = PsiUtil.findReturnStatements(method).mapNotNull(PsiReturnStatement::getReturnValue)
     val resultNullability = CodeFragmentAnalyzer.inferNullability(returnedExpressions)
-    ExtractMethodHelper.addNullabilityAnnotation(method, resultNullability)
+    ExtractMethodHelper.addNullabilityAnnotation(method.returnTypeElement, resultNullability)
   }
   val parameters = method.parameterList.parameters
   inputParameters
@@ -223,7 +223,7 @@ internal fun updateMethodAnnotations(method: PsiMethod, inputParameters: List<In
     .forEach { inputParameter ->
       val parameterNullability = CodeFragmentAnalyzer.inferNullability(inputParameter.references)
       val parameter = parameters.find { it.name == inputParameter.name }
-      if (parameter != null) ExtractMethodHelper.addNullabilityAnnotation(parameter, parameterNullability)
+      if (parameter != null) ExtractMethodHelper.addNullabilityAnnotation(parameter.typeElement, parameterNullability)
     }
 }
 
diff --git a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodHelper.kt b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodHelper.kt
index afd7892c1b9b..dd7aceba838d 100644
--- a/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodHelper.kt
+++ b/java/java-impl-refactorings/src/com/intellij/refactoring/extractMethod/newImpl/ExtractMethodHelper.kt
@@ -105,18 +105,17 @@ object ExtractMethodHelper {
     return physicalParent ?: throw IllegalArgumentException()
   }
 
-  fun addNullabilityAnnotation(owner: PsiModifierListOwner, nullability: Nullability) {
-    val nullabilityManager = NullableNotNullManager.getInstance(owner.project)
+  fun addNullabilityAnnotation(typeElement: PsiTypeElement?, nullability: Nullability) {
+    if (typeElement == null) return
+    val nullabilityManager = NullableNotNullManager.getInstance(typeElement.project)
     val annotation = when (nullability) {
       Nullability.NOT_NULL -> nullabilityManager.defaultNotNull
       Nullability.NULLABLE -> nullabilityManager.defaultNullable
       else -> return
     }
-    val target: PsiAnnotationOwner? = if (owner is PsiParameter) owner.typeElement else owner.modifierList
-    if (target == null) return
-    val annotationElement = AddAnnotationPsiFix.addPhysicalAnnotationIfAbsent(annotation, PsiNameValuePair.EMPTY_ARRAY, target)
+    val annotationElement = AddAnnotationPsiFix.addPhysicalAnnotationIfAbsent(annotation, PsiNameValuePair.EMPTY_ARRAY, typeElement)
     if (annotationElement != null) {
-      JavaCodeStyleManager.getInstance(owner.project).shortenClassReferences(annotationElement)
+      JavaCodeStyleManager.getInstance(typeElement.project).shortenClassReferences(annotationElement)
     }
   }
 
diff --git a/java/java-tests/testData/inspection/extractMethodRecommender/afterCallExtract.java b/java/java-tests/testData/inspection/extractMethodRecommender/afterCallExtract.java
index 5150c120500c..47626375346e 100644
--- a/java/java-tests/testData/inspection/extractMethodRecommender/afterCallExtract.java
+++ b/java/java-tests/testData/inspection/extractMethodRecommender/afterCallExtract.java
@@ -36,8 +36,7 @@ class Test {
     }
   }
 
-    @NotNull
-    private static String getString(Object o) {
+    private static @NotNull String getString(Object o) {
         String s;
         if (o instanceof String s2 && s2.length() == 1) {
           s = "1";
diff --git a/java/java-tests/testData/inspection/extractMethodRecommender/afterCallExtractFirstNotDeclaration.java b/java/java-tests/testData/inspection/extractMethodRecommender/afterCallExtractFirstNotDeclaration.java
index 7e95328bb1d4..c577a7f50764 100644
--- a/java/java-tests/testData/inspection/extractMethodRecommender/afterCallExtractFirstNotDeclaration.java
+++ b/java/java-tests/testData/inspection/extractMethodRecommender/afterCallExtractFirstNotDeclaration.java
@@ -20,8 +20,7 @@ class Test {
     return List.of(list, list2);
   }
 
-    @NotNull
-    private static List<String> getStrings() {
+    private static @NotNull List<String> getStrings() {
         List<String> list = new ArrayList<>();
         list.add("one");
         list.add("two");
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ChangedVariableDeclaredOnce_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ChangedVariableDeclaredOnce_after.java
index f05147c7638f..0fe3d078ea78 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ChangedVariableDeclaredOnce_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ChangedVariableDeclaredOnce_after.java
@@ -7,8 +7,7 @@ public class Test {
         System.out.println(s);
     }
 
-    @NotNull
-    private static String getString() {
+    private static @NotNull String getString() {
         String s = "42";
         return s;
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalYield_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalYield_after.java
index 93f0b3cbe988..3b42ef9388bf 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalYield_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ConditionalYield_after.java
@@ -13,8 +13,7 @@ public class Test {
         };
     }
 
-    @Nullable
-    private static String getString() {
+    private static @Nullable String getString() {
         if (new Random().nextBoolean()) {
           System.out.println();
             return "one";
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DeclareVarType_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DeclareVarType_after.java
index 77487e2fc3ea..0d6278ab7b3c 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DeclareVarType_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DeclareVarType_after.java
@@ -7,8 +7,7 @@ class SomeClass {
         System.out.println(s);
     }
 
-    @NotNull
-    private static String getString() {
+    private static @NotNull String getString() {
         String s = "42";
         return s;
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DiamondTypesConsideredAsEqual_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DiamondTypesConsideredAsEqual_after.java
index 4e7bf18550c4..5725efac4806 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DiamondTypesConsideredAsEqual_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DiamondTypesConsideredAsEqual_after.java
@@ -10,8 +10,7 @@ class T {
     List<String> list3 = getList1();
   }
 
-    @NotNull
-    private static ArrayList<String> getList1() {
+    private static @NotNull ArrayList<String> getList1() {
         return new ArrayList<>();
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DuplicatedExpressionAndChangeSignature_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DuplicatedExpressionAndChangeSignature_after.java
index dc78bbe0c610..3192416e1d57 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DuplicatedExpressionAndChangeSignature_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/DuplicatedExpressionAndChangeSignature_after.java
@@ -6,8 +6,7 @@ class Test {
         String start2 = getSubstring("two");
     }
 
-    @NotNull
-    private static String getSubstring(String one) {
+    private static @NotNull String getSubstring(String one) {
         return one.substring(0, 10);
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExpressionDuplicates_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExpressionDuplicates_after.java
index a96549445707..45ad5737e5d6 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExpressionDuplicates_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExpressionDuplicates_after.java
@@ -5,8 +5,7 @@ public class Test {
         String r = getLowerCase(p);
     }
 
-    @NotNull
-    private static String getLowerCase(String p) {
+    private static @NotNull String getLowerCase(String p) {
         return p.toLowerCase();
     }
 
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractExpressionFromClassContext_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractExpressionFromClassContext_after.java
index 641707063976..91defa375d2a 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractExpressionFromClassContext_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractExpressionFromClassContext_after.java
@@ -2,8 +2,7 @@ import org.jetbrains.annotations.NotNull;
 
 class Test {
 
-    @NotNull
-    private static String getString() {
+    private static @NotNull String getString() {
         return "One" + "Two";
     }
 
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromPolyadic_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromPolyadic_after.java
index ef6cd7994452..0b118242899a 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromPolyadic_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromPolyadic_after.java
@@ -5,8 +5,7 @@ class Test {
     System.out.println(getString() + "three");
   }
 
-    @NotNull
-    private static String getString() {
+    private static @NotNull String getString() {
         return "one" + "two";
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromSubstring_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromSubstring_after.java
index 7788445a19c4..fff27ce97544 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromSubstring_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/ExtractVirtualExpressionFromSubstring_after.java
@@ -6,8 +6,7 @@ class Test {
     System.out.println("one " + getTwo() + " three");
   }
 
-    @NotNull
-    private static String getTwo() {
+    private static @NotNull String getTwo() {
         return "two";
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IDEA278872_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IDEA278872_after.java
index e5f737b0497e..b12b5ec0ded0 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IDEA278872_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IDEA278872_after.java
@@ -7,8 +7,7 @@ class Test {
         System.out.println(str);
     }
 
-    @NotNull
-    private static String getString() {
+    private static @NotNull String getString() {
         final String str = "atata";
         do {
           System.out.println();
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceNullableObject_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceNullableObject_after.java
index 4264d9077e90..e9144c15c19d 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceNullableObject_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceNullableObject_after.java
@@ -9,8 +9,7 @@ public class Test {
     return 0;
   }
 
-    @Nullable
-    private static Result getResult(boolean param) {
+    private static @Nullable Result getResult(boolean param) {
         int x = 0;
         int y = 0;
         if (param) return null;
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectInsideNestedClass_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectInsideNestedClass_after.java
index 7695839c1784..a2d78b2c5b9d 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectInsideNestedClass_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectInsideNestedClass_after.java
@@ -9,8 +9,7 @@ public class Test {
         System.out.println("Point(" + result.x() + ", " + result.y() + ")");
     }
 
-      @NotNull
-      private static Result getResult() {
+      private static @NotNull Result getResult() {
           int x = 0;
           int y = 0;
           System.out.println();
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithAssignments_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithAssignments_after.java
index 43d38c9e1341..19e13fb3c16f 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithAssignments_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithAssignments_after.java
@@ -9,8 +9,7 @@ public class Test {
     System.out.println("Point(" + x + ", " + result.y() + ")");
   }
 
-    @NotNull
-    private static Result getResult() {
+    private static @NotNull Result getResult() {
         int x = 42;
         int y = 0;
         System.out.println();
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithRename_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithRename_after.java
index fca3fc8cfed1..d66444052b7f 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithRename_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithRename_after.java
@@ -12,8 +12,7 @@ public class Test<R> {
       System.out.println("Custom(" + myVariable.t() + ", " + myVariable.r() + ")");
   }
 
-    @NotNull
-    private <T extends CharSequence> MyResult<T, R> getTrMyResult(T param) {
+    private <T extends CharSequence> @NotNull MyResult<T, R> getTrMyResult(T param) {
         T t = param;
         R r = getR();
         System.out.println();
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithTypeParameters_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithTypeParameters_after.java
index d2ca27ac94db..ef71fb309517 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithTypeParameters_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceObjectWithTypeParameters_after.java
@@ -12,8 +12,7 @@ public class Test<R> {
       System.out.println("Custom(" + result.t() + ", " + result.r() + ")");
   }
 
-    @NotNull
-    private <T extends CharSequence> Result<T, R> getTrResult(T param) {
+    private <T extends CharSequence> @NotNull Result<T, R> getTrResult(T param) {
         T t = param;
         R r = getR();
         System.out.println();
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceSimpleObject_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceSimpleObject_after.java
index 4bfca930ab08..080d2cd5febd 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceSimpleObject_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceSimpleObject_after.java
@@ -8,8 +8,7 @@ public class Test {
       System.out.println("Point(" + result.x + ", " + result.y + ")");
   }
 
-    @NotNull
-    private static Result getResult() {
+    private static @NotNull Result getResult() {
         int x = 0;
         int y = 0;
         System.out.println();
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceSimpleRecord_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceSimpleRecord_after.java
index 96aefae0f753..bc1b11cf6d45 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceSimpleRecord_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/IntroduceSimpleRecord_after.java
@@ -8,8 +8,7 @@ public class Test {
       System.out.println("Point(" + result.x() + ", " + result.y() + ")");
   }
 
-    @NotNull
-    private static Result getResult() {
+    private static @NotNull Result getResult() {
         int x = 0;
         int y = 0;
         System.out.println();
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/KeepVarKeyword_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/KeepVarKeyword_after.java
index 3a0b60625706..fe662b4950b7 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/KeepVarKeyword_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/KeepVarKeyword_after.java
@@ -7,8 +7,7 @@ class SomeClass {
         System.out.println(s);
     }
 
-    @NotNull
-    private static String getString() {
+    private static @NotNull String getString() {
         var s = "42";
         return s;
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/LiteralDuplicates_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/LiteralDuplicates_after.java
index 6931e42c6d69..c3143e411e0a 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/LiteralDuplicates_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/LiteralDuplicates_after.java
@@ -8,8 +8,7 @@ public class Test {
     String third = "Third";
   }
 
-    @NotNull
-    private static String getFirst() {
+    private static @NotNull String getFirst() {
         return "First";
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticFailsWithClassUsage_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticFailsWithClassUsage_after.java
index 89a48edb2c7d..0d0677c33718 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticFailsWithClassUsage_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticFailsWithClassUsage_after.java
@@ -6,8 +6,7 @@ class X {
         r.run();
     }
 
-    @NotNull
-    private Runnable getRunnable() {
+    private @NotNull Runnable getRunnable() {
         Runnable r = new Runnable() {
             @Override
             public void run() {
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithClassUsage_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithClassUsage_after.java
index 7afecc76d484..48a0c4f15c2b 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithClassUsage_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/MakeStaticWithClassUsage_after.java
@@ -6,8 +6,7 @@ class X {
         r.run();
     }
 
-    @NotNull
-    private static Runnable getRunnable() {
+    private static @NotNull Runnable getRunnable() {
         Runnable r = new Runnable() {
             @Override
             public void run() {
diff --git a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/TemplateRenamesInsertedCallOnly_after.java b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/TemplateRenamesInsertedCallOnly_after.java
index 923f519197f1..4802011d1410 100644
--- a/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/TemplateRenamesInsertedCallOnly_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodAndDuplicatesInplace/TemplateRenamesInsertedCallOnly_after.java
@@ -10,8 +10,7 @@ public abstract class Test {
     System.out.println(integer);
   }
 
-    @NotNull
-    private static String renamed() {
+    private static @NotNull String renamed() {
         return "4" + "2";
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/AvoidContinueInsideMethod_after.java b/java/java-tests/testData/refactoring/extractMethodNew/AvoidContinueInsideMethod_after.java
index 207c4343a646..e2f32161fb79 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/AvoidContinueInsideMethod_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/AvoidContinueInsideMethod_after.java
@@ -9,8 +9,7 @@ class Test {
         return "default";
     }
 
-    @Nullable
-    private String newMethod(int z) {
+    private @Nullable String newMethod(int z) {
         if (z > 5) return null;
         if (z < 0) return "sample";
         return null;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ChangedReturnType_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ChangedReturnType_after.java
index 359aa9483800..bfd8591805e1 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ChangedReturnType_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ChangedReturnType_after.java
@@ -9,8 +9,7 @@ class X {
     }
   }
 
-    @Nullable
-    private Object newMethod(Object o) {
+    private @Nullable Object newMethod(Object o) {
         if (o == null) return null;
         String x = bar(o);
         return x;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ClassReference_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ClassReference_after.java
index 7f0cf0808701..464020072f38 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ClassReference_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ClassReference_after.java
@@ -9,8 +9,7 @@ class C {
     }
   }
 
-    @NotNull
-    private A newMethod() {
+    private @NotNull A newMethod() {
         return A.getInstance();
     }
 }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ConditionalExitCombinedWithNullabilityShouldPreserveVarsUsedInExitStatements_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ConditionalExitCombinedWithNullabilityShouldPreserveVarsUsedInExitStatements_after.java
index 8545fdce2a0e..fcfade25e2ab 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ConditionalExitCombinedWithNullabilityShouldPreserveVarsUsedInExitStatements_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ConditionalExitCombinedWithNullabilityShouldPreserveVarsUsedInExitStatements_after.java
@@ -10,8 +10,7 @@ class X {
     return null;
   }
 
-    @Nullable
-    private static String newMethod(String method, String testName) {
+    private static @Nullable String newMethod(String method, String testName) {
         String strings = method;
         if (strings != null && !strings.isEmpty()) {
             return strings.substring(0) + testName;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/CopyParamAnnotations_after.java b/java/java-tests/testData/refactoring/extractMethodNew/CopyParamAnnotations_after.java
index a386b3985b88..f302ba5894ed 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/CopyParamAnnotations_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/CopyParamAnnotations_after.java
@@ -17,8 +17,7 @@ class X {
     return null;
   }
 
-    @Nullable
-    private X newMethod(@Nullable String b) {
+    private @Nullable X newMethod(@Nullable String b) {
         if (b != null) {
           int x = 1;
             return fun1(x);
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous_after.java b/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous_after.java
index f16c12cd90c0..c973fcebe87a 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/DontMakeParametersFinalDueToUsagesInsideAnonymous_after.java
@@ -6,8 +6,7 @@ class Box {
         System.out.println(data);
     }
 
-    @NotNull
-    private Data newMethod(String str1, String str2) {
+    private @NotNull Data newMethod(String str1, String str2) {
         return new Data() {
             @Override
             public String getA() {
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturnDueToThrowable_after.java b/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturnDueToThrowable_after.java
index 6088733af61c..6aeabd49ca53 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturnDueToThrowable_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/DontMissReturnDueToThrowable_after.java
@@ -9,8 +9,7 @@ class Test {
         System.out.println(s);
     }
 
-    @NotNull
-    private String newMethod() throws IOException {
+    private @NotNull String newMethod() throws IOException {
         String s = "result";
         new Test().withError();
         return s;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints11_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints11_after.java
index d4bcf6c334b1..7913fac15cab 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints11_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints11_after.java
@@ -9,8 +9,7 @@ class C {
         throw new RuntimeException();
     }
 
-    @Nullable
-    private Integer newMethod(int id) {
+    private @Nullable Integer newMethod(int id) {
         for (int n : list) {
             if (n == id) {
                 return n <= 0 ? 0 : n;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints4_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints4_after.java
index 6d81150b09c3..cbce5c5f374b 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints4_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints4_after.java
@@ -7,8 +7,7 @@ class Test {
         return 12;
     }
 
-    @Nullable
-    private Integer newMethod() {
+    private @Nullable Integer newMethod() {
         try {
             if(cond1) return 0;
             else if(cond2) return 1;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6_after.java
index 8bba01ef5c9f..1b71d8025308 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints6_after.java
@@ -10,8 +10,7 @@ class K {
         return 1;
     }
 
-    @Nullable
-    private Object newMethod(Object o) {
+    private @Nullable Object newMethod(Object o) {
         if (o == null) return null;
         o = new Object();
         return o;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints8_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints8_after.java
index 07fd497cbfbc..71331e4c2c84 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints8_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints8_after.java
@@ -7,8 +7,7 @@ class C {
         return null;
     }
 
-    @Nullable
-    private Object newMethod() {
+    private @Nullable Object newMethod() {
         for (Object o : new ArrayList<Object>()) {
             if (o != null) {
                 return o;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints9_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints9_after.java
index a1d04f76241b..baacf0d28d62 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints9_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExitPoints9_after.java
@@ -19,8 +19,7 @@ class Main {
         return result;
     }
 
-    @Nullable
-    private static Result newMethod(String name) {
+    private static @Nullable Result newMethod(String name) {
         Result result;
         if (name == null) {
             result = new Result("Name is null");
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareDoWhileBody_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareDoWhileBody_after.java
index 272af52483b6..5e4d74b8523f 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareDoWhileBody_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareDoWhileBody_after.java
@@ -12,8 +12,7 @@ class DoIfWhile {
         return null;
     }
 
-    @Nullable
-    private String newMethod(boolean b, int x) {
+    private @Nullable String newMethod(boolean b, int x) {
         /*comment*/
         if (b) {
             String s = bar(x);
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareElseBranch_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareElseBranch_after.java
index fc80f4f367b6..d133d2c4b387 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareElseBranch_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareElseBranch_after.java
@@ -12,8 +12,7 @@ class ElseIf {
         return null;
     }
 
-    @Nullable
-    private String newMethod(boolean b) {
+    private @Nullable String newMethod(boolean b) {
         if (b) {
             String s = bar();
             if (s != null) return s;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareThenBranch_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareThenBranch_after.java
index 7fc6b4ff6bd7..55cd9e844b17 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareThenBranch_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBareThenBranch_after.java
@@ -10,8 +10,7 @@ class ElseIf {
         return null;
     }
 
-    @Nullable
-    private String newMethod(boolean b) {
+    private @Nullable String newMethod(boolean b) {
         if (b) {
             String s = bar();
             if (s != null) return s;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBracedDoWhileBody_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBracedDoWhileBody_after.java
index 272af52483b6..5e4d74b8523f 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBracedDoWhileBody_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBracedDoWhileBody_after.java
@@ -12,8 +12,7 @@ class DoIfWhile {
         return null;
     }
 
-    @Nullable
-    private String newMethod(boolean b, int x) {
+    private @Nullable String newMethod(boolean b, int x) {
         /*comment*/
         if (b) {
             String s = bar(x);
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBracedElseBranch_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBracedElseBranch_after.java
index fc80f4f367b6..d133d2c4b387 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBracedElseBranch_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBracedElseBranch_after.java
@@ -12,8 +12,7 @@ class ElseIf {
         return null;
     }
 
-    @Nullable
-    private String newMethod(boolean b) {
+    private @Nullable String newMethod(boolean b) {
         if (b) {
             String s = bar();
             if (s != null) return s;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBranchedPrimitive_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBranchedPrimitive_after.java
index c47d087234c7..8d865c6279e2 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractBranchedPrimitive_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractBranchedPrimitive_after.java
@@ -7,8 +7,7 @@ class Test {
         System.out.println(code);
     }
 
-    @Nullable
-    private Integer newMethod(int x) {
+    private @Nullable Integer newMethod(int x) {
         int code;
         if (x == 22) return null;
         if (x > 0) {
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractConstantExpressions_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractConstantExpressions_after.java
index fc60f776e3e3..c53d7a14534c 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractConstantExpressions_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractConstantExpressions_after.java
@@ -10,8 +10,7 @@ class Test {
         return "default";
     }
 
-    @Nullable
-    private Integer newMethod(boolean condition, String f2) {
+    private @Nullable Integer newMethod(boolean condition, String f2) {
         int x = 42;
         if (condition) return null;
         if (!condition) return null;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractFromTryFinally_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractFromTryFinally_after.java
index fae271959f7d..57a757f507a8 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractFromTryFinally_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractFromTryFinally_after.java
@@ -10,8 +10,7 @@ public class S {
     System.out.print(s);
   }
 
-    @NotNull
-    private String newMethod() {
+    private @NotNull String newMethod() {
         String s;
         s = "";
         return s;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractSwitchNotNullVariable_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractSwitchNotNullVariable_after.java
index ce4fbfe459c4..d3335830edbe 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractSwitchNotNullVariable_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractSwitchNotNullVariable_after.java
@@ -6,8 +6,7 @@ class Test {
         System.out.println(x);
     }
 
-    @NotNull
-    private String newMethod(int y) {
+    private @NotNull String newMethod(int y) {
         String x;
         switch (y){
             case 3:
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractSwitchVariable_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractSwitchVariable_after.java
index a83ccbcc9e21..fc74dafa7d9b 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractSwitchVariable_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractSwitchVariable_after.java
@@ -7,8 +7,7 @@ class Test {
         System.out.println(x);
     }
 
-    @Nullable
-    private Integer newMethod(int y) {
+    private @Nullable Integer newMethod(int y) {
         int x;
         switch (y){
             case 3:
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractUnresolvedLambdaExpression_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractUnresolvedLambdaExpression_after.java
index 43b6a8f6af0f..2e1cab390767 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractUnresolvedLambdaExpression_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractUnresolvedLambdaExpression_after.java
@@ -8,8 +8,7 @@ class Test {
     b(newMethod());
   }
 
-    @NotNull
-    private Supplier newMethod() {
+    private @NotNull Supplier newMethod() {
         return (s) -> {
             System.out.println(s);
         };
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractVariableAndReturn_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractVariableAndReturn_after.java
index 5a681fd6d9bf..ffdd8107334c 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractVariableAndReturn_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractVariableAndReturn_after.java
@@ -8,8 +8,7 @@ class Test {
         return -1;
     }
 
-    @Nullable
-    private String newMethod(int x) {
+    private @Nullable String newMethod(int x) {
         String out = "out";
         if (x > 10) return null;
         if (x < 10) return null;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ExtractedVariableReused_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ExtractedVariableReused_after.java
index c7a858b4de46..560794f96325 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ExtractedVariableReused_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ExtractedVariableReused_after.java
@@ -21,8 +21,7 @@ public class OutputVariableReused {
         return null;
     }
 
-    @Nullable
-    private X newMethod(String s, String left, String right) {
+    private @Nullable X newMethod(String s, String left, String right) {
         String res = convert(s, left, right);
         if (res != null) {
             return new X(res);
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/FromLambdaBodyWithReturn_after.java b/java/java-tests/testData/refactoring/extractMethodNew/FromLambdaBodyWithReturn_after.java
index f3441791c8bd..43e3b5d94a24 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/FromLambdaBodyWithReturn_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/FromLambdaBodyWithReturn_after.java
@@ -10,8 +10,7 @@ class Test {
     };
   }
 
-    @NotNull
-    private String newMethod() {
+    private @NotNull String newMethod() {
         return "42";
     }
 }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/InferredNotNullInReturnStatement_after.java b/java/java-tests/testData/refactoring/extractMethodNew/InferredNotNullInReturnStatement_after.java
index 49c74ca6d02f..ce0efde05d6f 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/InferredNotNullInReturnStatement_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/InferredNotNullInReturnStatement_after.java
@@ -9,8 +9,7 @@ class X {
     }
   }
 
-    @Nullable
-    private Object newMethod(Object o) {
+    private @Nullable Object newMethod(Object o) {
         if (o == null) return null;
         Object x = bar(o);
         return x;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/InferredNotNull_after.java b/java/java-tests/testData/refactoring/extractMethodNew/InferredNotNull_after.java
index be3e8f54be9f..ee42e0709938 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/InferredNotNull_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/InferredNotNull_after.java
@@ -6,8 +6,7 @@ class X {
 
   }
 
-    @NotNull
-    private static String newMethod() {
+    private static @NotNull String newMethod() {
         System.out.println();
         return f();
     }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType1_after.java b/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType1_after.java
index d6d4b2348f45..14ee4e329c64 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType1_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType1_after.java
@@ -5,8 +5,7 @@ class Test {
         return newMethod();
     }
 
-    @NotNull
-    private String newMethod() {
+    private @NotNull String newMethod() {
         return "42";
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType4_after.java b/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType4_after.java
index f9fc04be96bb..7913297da422 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType4_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType4_after.java
@@ -7,8 +7,7 @@ class Test {
         return 42l;
     }
 
-    @Nullable
-    private Double newMethod(boolean b) {
+    private @Nullable Double newMethod(boolean b) {
         if (b) {
             return 42.0;
         }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType5_after.java b/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType5_after.java
index 66f7ffd44b94..3c215d8926a3 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType5_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType5_after.java
@@ -7,8 +7,7 @@ class Test {
         return 42l;
     }
 
-    @Nullable
-    private Double newMethod(boolean b, Integer notNullInt) {
+    private @Nullable Double newMethod(boolean b, Integer notNullInt) {
         if (b) {
             return (double) notNullInt;
         }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType6_after.java b/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType6_after.java
index a184ff1f81ad..ebc19e1dcf6f 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType6_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/InferredReturnType6_after.java
@@ -9,8 +9,7 @@ class Test {
         return null;
     }
 
-    @Nullable
-    private Collection<String> newMethod(boolean c, @NotNull Set<String> set) {
+    private @Nullable Collection<String> newMethod(boolean c, @NotNull Set<String> set) {
         if (c) {
             return new ArrayList<String>();
         }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/LocalVariablesAreNotExposed_after.java b/java/java-tests/testData/refactoring/extractMethodNew/LocalVariablesAreNotExposed_after.java
index 41ce8ddbca03..73d850a14121 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/LocalVariablesAreNotExposed_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/LocalVariablesAreNotExposed_after.java
@@ -13,8 +13,7 @@ public class Test {
         return null;
     }
 
-    @Nullable
-    private Test newMethod(List<String> list) {
+    private @Nullable Test newMethod(List<String> list) {
         for (String some : list) {
             String x = "x";
             String y = "y";
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/Method2InterfaceFromConstant_after.java b/java/java-tests/testData/refactoring/extractMethodNew/Method2InterfaceFromConstant_after.java
index 6913f366b8a6..b0e7b36ddef5 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/Method2InterfaceFromConstant_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/Method2InterfaceFromConstant_after.java
@@ -3,8 +3,7 @@ import org.jetbrains.annotations.NotNull;
 interface I {
     String FOO = newMethod();
 
-    @NotNull
-    static String newMethod() {
+    static @NotNull String newMethod() {
         return "hello";
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentAnonymousClassInIfNoBlock_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentAnonymousClassInIfNoBlock_after.java
index c5cf7ad4168d..27ad2a1be24c 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentAnonymousClassInIfNoBlock_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentAnonymousClassInIfNoBlock_after.java
@@ -7,8 +7,7 @@ class C {
             newMethod(o).run();
     }
 
-    @NotNull
-    private Runnable newMethod(@NotNull Object o) {
+    private @NotNull Runnable newMethod(@NotNull Object o) {
         return new Runnable() {
             @Override
             public void run() {
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock_after.java
index be5f095fa784..5955965238a9 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInIfNoBlock_after.java
@@ -7,8 +7,7 @@ class C {
             newMethod(o).run();
     }
 
-    @NotNull
-    private Runnable newMethod(@NotNull Object o) {
+    private @NotNull Runnable newMethod(@NotNull Object o) {
         return (Runnable) (() -> bar(o));
     }
 
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock_after.java
index 037d898917a9..fd00ecc84f61 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NotNullArgumentLambdaInWhileNoBlock_after.java
@@ -7,8 +7,7 @@ class C {
             newMethod(o).run();
     }
 
-    @NotNull
-    private Runnable newMethod(@NotNull Object o) {
+    private @NotNull Runnable newMethod(@NotNull Object o) {
         return (Runnable) (() -> bar(o));
     }
 
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NotNullCheckNameConflicts_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NotNullCheckNameConflicts_after.java
index 54cdd6f72cbc..44e557455975 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NotNullCheckNameConflicts_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NotNullCheckNameConflicts_after.java
@@ -16,8 +16,7 @@ class X {
         return null;
     }
 
-    @Nullable
-    private X newMethod(boolean b) {
+    private @Nullable X newMethod(boolean b) {
         if (b) {
             int x = 1;
             return fun1(x);
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NullableCheck1_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NullableCheck1_after.java
index e5b0bb430818..ce17bccb5a5f 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NullableCheck1_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NullableCheck1_after.java
@@ -10,8 +10,7 @@ class Test {
       return null;
    }
 
-    @Nullable
-    private String newMethod(int i, boolean flag) {
+    private @Nullable String newMethod(int i, boolean flag) {
         String xxx = "";
         if (flag) {
             for (int j = 0; j < 100; j++) {
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckBreak_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckBreak_after.java
index 7e3350cae579..d1bf0340e05a 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckBreak_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckBreak_after.java
@@ -13,8 +13,7 @@ class Test {
     }
   }
 
-    @Nullable
-    private Pojo newMethod() {
+    private @Nullable Pojo newMethod() {
         Pojo x = things.get(0);
 
         if(x.it > 0) {
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckDontMissFinal_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckDontMissFinal_after.java
index 8f3374d9ef5a..aa7a1f995e88 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckDontMissFinal_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckDontMissFinal_after.java
@@ -11,8 +11,7 @@ class Test {
     }
   }
 
-    @Nullable
-    private String newMethod() {
+    private @Nullable String newMethod() {
         final String str = "";
         if (str == "a") {
             return null;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckVoid_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckVoid_after.java
index 6fda0613bdfc..3a6b14e7f4e1 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckVoid_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NullableCheckVoid_after.java
@@ -7,8 +7,7 @@ class Test {
        System.out.println(o);
    }
 
-    @Nullable
-    private Object newMethod() {
+    private @Nullable Object newMethod() {
         Object o = "";
         for (int i = 0; i < 5; i++) {
            if (i == 10){
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/NullableCheck_after.java b/java/java-tests/testData/refactoring/extractMethodNew/NullableCheck_after.java
index bfbef5990962..b2d8cfe69b42 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/NullableCheck_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/NullableCheck_after.java
@@ -8,8 +8,7 @@ class Test {
       return o;
    }
 
-    @Nullable
-    private Object newMethod() {
+    private @Nullable Object newMethod() {
         Object o = "";
         for (int i = 0; i < 5; i++) {
            if (i == 10){
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ReturnFromTry_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ReturnFromTry_after.java
index ce3d365100e9..abfecf50492b 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ReturnFromTry_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ReturnFromTry_after.java
@@ -11,8 +11,7 @@ class A {
         return "";
     }
 
-    @NotNull
-    private String newMethod() {
+    private @NotNull String newMethod() {
         try {
             return "";
         }
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ReturnVariablesResolved_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ReturnVariablesResolved_after.java
index 5c5fce1023d2..adad98cb2524 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ReturnVariablesResolved_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ReturnVariablesResolved_after.java
@@ -8,8 +8,7 @@ class Test {
         return "return";
     }
 
-    @Nullable
-    private String newMethod(String variable) {
+    private @Nullable String newMethod(String variable) {
         if (1 == 1) return variable;
         if (2 == 1) return "literal";
         return null;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/SCR15815_after.java b/java/java-tests/testData/refactoring/extractMethodNew/SCR15815_after.java
index a2fd5cfe52ec..849a13ea9739 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/SCR15815_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/SCR15815_after.java
@@ -9,8 +9,7 @@ public class Foo {
             },
             f2 = new Foo(){};
 
-    @NotNull
-    private static String newMethod() {
+    private static @NotNull String newMethod() {
         return "a" + "b";
     }
 
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/SCR27887_after.java b/java/java-tests/testData/refactoring/extractMethodNew/SCR27887_after.java
index 4133873492d2..65b6eecd85a2 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/SCR27887_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/SCR27887_after.java
@@ -37,8 +37,7 @@ public class SCR27887 {
         return included.size();
     }
 
-    @NotNull
-    private RefObjectUList newMethod(ZippingXMLGeneratorFactory genFac) {
+    private @NotNull RefObjectUList newMethod(ZippingXMLGeneratorFactory genFac) {
         RefObjectUList included = makeIncludedSet();
         if (!included.isEmpty()) {
             ScatteringDocBuilder docBuilder = new MyDocBuilder(repository, included);
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ShortenClassRefsInNewReturnType_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ShortenClassRefsInNewReturnType_after.java
index 9dd120ab2db4..cdb0d4fe29c0 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ShortenClassRefsInNewReturnType_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ShortenClassRefsInNewReturnType_after.java
@@ -9,8 +9,7 @@ class Test {
     return list;
   }
 
-    @NotNull
-    private Collection newMethod() {
+    private @NotNull Collection newMethod() {
         return new ArrayList<String>();
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/ThisCall_after.java b/java/java-tests/testData/refactoring/extractMethodNew/ThisCall_after.java
index 5f954d13db6e..a06527445d74 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/ThisCall_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/ThisCall_after.java
@@ -8,8 +8,7 @@ public class A {
         this(newMethod());
     }
 
-    @NotNull
-    private static String newMethod() {
+    private static @NotNull String newMethod() {
         return "a";
     }
 }
\ No newline at end of file
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/UseVarInCatch1_after.java b/java/java-tests/testData/refactoring/extractMethodNew/UseVarInCatch1_after.java
index de99c81ba2bb..5f99b934adb2 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/UseVarInCatch1_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/UseVarInCatch1_after.java
@@ -14,8 +14,7 @@ class A {
         }
     }
 
-    @NotNull
-    private String newMethod(String s) throws MyException {
+    private @NotNull String newMethod(String s) throws MyException {
         bar();
         s = "b";
         return s;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/UseVarInFinally1_after.java b/java/java-tests/testData/refactoring/extractMethodNew/UseVarInFinally1_after.java
index 307f0db900e9..92d07bbb81a1 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/UseVarInFinally1_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/UseVarInFinally1_after.java
@@ -13,8 +13,7 @@ public class A {
         }
     }
 
-    @NotNull
-    private String newMethod(String s) {
+    private @NotNull String newMethod(String s) {
         if (r()) throw new RuntimeException();
         s = "b";
         return s;
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/UseVarInOtherCatch_after.java b/java/java-tests/testData/refactoring/extractMethodNew/UseVarInOtherCatch_after.java
index 756b94f3457a..24b8835c159c 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/UseVarInOtherCatch_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/UseVarInOtherCatch_after.java
@@ -18,8 +18,7 @@ class A {
         }
     }
 
-    @NotNull
-    private String newMethod(boolean b) throws ExceptionB {
+    private @NotNull String newMethod(boolean b) throws ExceptionB {
         String s;
         s = "b";
         if (b) throw new ExceptionB();
diff --git a/java/java-tests/testData/refactoring/extractMethodNew/VarDeclAfterExpressionExtraction_after.java b/java/java-tests/testData/refactoring/extractMethodNew/VarDeclAfterExpressionExtraction_after.java
index fdf2963c9797..c1b636ebef2a 100644
--- a/java/java-tests/testData/refactoring/extractMethodNew/VarDeclAfterExpressionExtraction_after.java
+++ b/java/java-tests/testData/refactoring/extractMethodNew/VarDeclAfterExpressionExtraction_after.java
@@ -11,8 +11,7 @@ class BasicLazyResolveTest {
 
     }
 
-    @NotNull
-    private Object newMethod() {
+    private @NotNull Object newMethod() {
         return new Object() {
 
 /*