Makes HasQualifierParameter an inherited type; Fixes typetools#3831

t-rasmud · Oct 25, 2020 · 63c3d20 · 63c3d20
1 parent 4baef83
commit 63c3d20
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/checker/tests/tainting/ExtendHasQual.java b/checker/tests/tainting/ExtendHasQual.java
@@ -12,7 +12,6 @@ static class Super {
     @HasQualifierParameter(Tainted.class)
     static class Buffer extends Super {}
 
-    // :: error: (missing.has.qual.param)
     static class MyBuffer1 extends Buffer {}
 
     @HasQualifierParameter(Tainted.class)
@@ -28,18 +27,15 @@ static class MyBuffer4 extends Buffer {}
     @HasQualifierParameter(Tainted.class)
     interface BufferInterface {}
 
-    // :: error: (missing.has.qual.param)
     static class ImplementsBufferInterface1 implements BufferInterface {}
 
     @HasQualifierParameter(Tainted.class)
     static class ImplementsBufferInterface2 implements BufferInterface {}
 
-    // :: error: (missing.has.qual.param)
     static class Both1 extends Buffer implements BufferInterface {}
 
     @HasQualifierParameter(Tainted.class)
     static class Both2 extends Buffer implements BufferInterface {}
 
-    // :: error: (missing.has.qual.param)
     static class Both3 extends Super implements BufferInterface {}
 }
diff --git a/checker/tests/tainting/InnerHasQualifierParameter.java b/checker/tests/tainting/InnerHasQualifierParameter.java
@@ -0,0 +1,18 @@
+import org.checkerframework.checker.tainting.qual.Tainted;
+import org.checkerframework.framework.qual.HasQualifierParameter;
+
+@HasQualifierParameter(Tainted.class)
+public class InnerHasQualifierParameter {
+
+    @HasQualifierParameter(Tainted.class)
+    interface TestInterface {
+        public void testMethod();
+    }
+
+    public void test() {
+        TestInterface test =
+                new TestInterface() {
+                    public void testMethod() {}
+                };
+    }
+}
diff --git a/checker/tests/tainting/TestNoQualifierParameterConflicting.java b/checker/tests/tainting/TestNoQualifierParameterConflicting.java
@@ -11,6 +11,6 @@ public class TestNoQualifierParameterConflicting {
     static class Super {}
 
     @NoQualifierParameter(Tainted.class)
-    // :: error: (missing.has.qual.param)
+    // :: error: (conflicting.qual.param)
     static class Sup extends Super {}
 }
diff --git a/framework/src/main/java/org/checkerframework/framework/qual/HasQualifierParameter.java b/framework/src/main/java/org/checkerframework/framework/qual/HasQualifierParameter.java
@@ -1,11 +1,6 @@
 package org.checkerframework.framework.qual;
 
-import java.lang.annotation.Annotation;
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * This is a declaration annotation that applies to type declarations and packages. On a type, it
@@ -63,6 +58,7 @@
  *
  * @see NoQualifierParameter
  */
+@Inherited
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.PACKAGE})