MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-170214 Properly handle Bean Validation inheritance in @NotNull/@Nullable problems inspection

Browse Source
This commit is contained in:
peter
2017-03-28 19:01:55 +02:00
parent d2aa1f7e39
commit e8ac7110c0
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
+9 -4
View File
@@ -479,7 +479,12 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo
!(method.getReturnType() instanceof PsiPrimitiveType) &&
!method.isConstructor() &&
!getNullityManager(method).hasNullability(method) &&
isNotNullNotInferred(superMethod, true, IGNORE_EXTERNAL_SUPER_NOTNULL);
isNotNullNotInferred(superMethod, true, IGNORE_EXTERNAL_SUPER_NOTNULL) &&
!hasInheritableNotNull(superMethod);
}
private static boolean hasInheritableNotNull(PsiModifierListOwner owner) {
return AnnotationUtil.isAnnotated(owner, "javax.annotation.constraints.NotNull", true);
}
private void checkParameters(PsiMethod method,
@@ -515,7 +520,7 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo
}
if (REPORT_NOT_ANNOTATED_METHOD_OVERRIDES_NOTNULL) {
for (PsiParameter superParameter : superParameters) {
if (!nullableManager.hasNullability(parameter) && isNotNullNotInferred(superParameter, false, IGNORE_EXTERNAL_SUPER_NOTNULL)) {
if (!nullableManager.hasNullability(parameter) && isNotNullNotInferred(superParameter, false, IGNORE_EXTERNAL_SUPER_NOTNULL) && !hasInheritableNotNull(superParameter)) {
final LocalQuickFix fix = AnnotationUtil.isAnnotatingApplicable(parameter, nullableManager.getDefaultNotNull())
? new AddNotNullAnnotationFix(parameter)
: createChangeDefaultNotNullFix(nullableManager, superParameter);
@@ -576,10 +581,10 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo
boolean hasAnnotatedParameter = false;
for (int i = 0; i < parameters.length; i++) {
PsiParameter parameter = parameters[i];
parameterAnnotated[i] = isNotNullNotInferred(parameter, false, false);
parameterAnnotated[i] = isNotNullNotInferred(parameter, false, false) && !hasInheritableNotNull(parameter);
hasAnnotatedParameter |= parameterAnnotated[i];
}
if (hasAnnotatedParameter || annotated.isDeclaredNotNull) {
if (hasAnnotatedParameter || annotated.isDeclaredNotNull && !hasInheritableNotNull(method)) {
PsiManager manager = method.getManager();
final String defaultNotNull = nullableManager.getDefaultNotNull();
final boolean superMethodApplicable = AnnotationUtil.isAnnotatingApplicable(method, defaultNotNull);
java/java-tests/testData/inspection/nullableProblems/BeanValidationNotNull.java
+13
View File
@@ -0,0 +1,13 @@
import javax.annotation.constraints.*;
interface Intf {
@NotNull Object foo(@NotNull Object p);
}
class Impl implements Intf {
@Override
public Object foo(Object p) {
return p;
}
}
java/java-tests/testSrc/com/intellij/codeInspection/NullableStuffInspectionTest.java
+8 -1
View File
@@ -115,7 +115,7 @@ public class NullableStuffInspectionTest extends LightCodeInsightFixtureTestCase
DataFlowInspectionTest.addJavaxDefaultNullabilityAnnotations(myFixture);
myFixture.addFileToProject("foo/package-info.java", "@javax.annotation.ParametersAreNonnullByDefault package foo;");
myFixture.addClass("import javax.annotation.*; package foo; public interface NullableFunction { void fun(@Nullable Object o); }");
myFixture.addClass("package foo; import javax.annotation.*; public interface NullableFunction { void fun(@Nullable Object o); }");
myFixture.addClass("package foo; public interface AnyFunction { void fun(Object o); }");
doTest();
@@ -195,4 +195,11 @@ public class NullableStuffInspectionTest extends LightCodeInsightFixtureTestCase
myFixture.checkHighlighting(true, false, true);
}
public void testBeanValidationNotNull() {
myFixture.addClass("package javax.annotation.constraints; public @interface NotNull{}");
DataFlowInspection8Test.setCustomAnnotations(getProject(), getTestRootDisposable(), "javax.annotation.constraints.NotNull", "javax.annotation.constraints.Nullable");
myInspection.REPORT_ANNOTATION_NOT_PROPAGATED_TO_OVERRIDERS = true;
doTest();
}
}