Change Nullness Checker new class error

Author: smillst

checker/src/main/java/org/checkerframework/checker/nullness/NullnessVisitor.java

@@ -33,9 +33,7 @@
 import com.sun.source.tree.VariableTree;
 import com.sun.source.tree.WhileLoopTree;
 import com.sun.source.util.TreePath;
-import java.lang.annotation.Annotation;
 import java.util.List;
-import java.util.Set;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
@@ -55,7 +53,6 @@
 import org.checkerframework.framework.type.AnnotatedTypeFactory;
 import org.checkerframework.framework.type.AnnotatedTypeMirror;
 import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedArrayType;
-import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedDeclaredType;
 import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedExecutableType;
 import org.checkerframework.framework.type.AnnotatedTypeMirror.AnnotatedPrimitiveType;
 import org.checkerframework.javacutil.AnnotationMirrorSet;
@@ -147,16 +144,6 @@ public boolean isValidUse(AnnotatedPrimitiveType type, Tree tree) {
     return true;
   }
 
-  private boolean containsSameByName(
-      Set<Class<? extends Annotation>> quals, AnnotationMirror anno) {
-    for (Class<? extends Annotation> q : quals) {
-      if (atypeFactory.areSameByClass(anno, q)) {
-        return true;
-      }
-    }
-    return false;
-  }
-
   @Override
   protected boolean commonAssignmentCheck(
       Tree varTree,
@@ -751,27 +738,19 @@ public Void visitNewClass(NewClassTree tree, Void p) {
     if (enclosingExpr != null) {
       checkForNullability(enclosingExpr, DEREFERENCE_OF_NULLABLE);
     }
-    AnnotatedDeclaredType type = atypeFactory.getAnnotatedType(tree);
-    ExpressionTree identifier = tree.getIdentifier();
-    if (identifier instanceof AnnotatedTypeTree) {
-      AnnotatedTypeTree t = (AnnotatedTypeTree) identifier;
-      for (AnnotationMirror a : atypeFactory.getAnnotatedType(t).getPrimaryAnnotations()) {
-        // is this an annotation of the nullness checker?
-        boolean nullnessCheckerAnno = containsSameByName(atypeFactory.getNullnessAnnotations(), a);
-        if (nullnessCheckerAnno && !AnnotationUtils.areSame(NONNULL, a)) {
-          // The type is not non-null => warning
-          checker.reportWarning(tree, "new.class", type.getPrimaryAnnotations());
-          // Note that other consistency checks are made by isValid.
+
+    AnnotationMirrorSet explicitAnnos = atypeFactory.getExplicitNewClassAnnos(tree);
+    AnnotationMirror nullnessAnno =
+        qualHierarchy.findAnnotationInSameHierarchy(explicitAnnos, NONNULL);
+    if (nullnessAnno != null) {
+      if (atypeFactory.areSameByClass(nullnessAnno, NonNull.class)) {
+        if (warnRedundantAnnotations) {
+          checker.reportWarning(tree, "redundant.anno", NONNULL);
         }
-      }
-      if (t.toString().contains("@PolyNull")) {
-        // TODO: this is a hack, but PolyNull gets substituted
-        // afterwards
-        checker.reportWarning(tree, "new.class", type.getPrimaryAnnotations());
+      } else {
+        checker.reportWarning(tree, "new.class");
       }
     }
-    // TODO: It might be nicer to introduce a framework-level
-    // isValidNewClassType or some such.
     return super.visitNewClass(tree, p);
   }
 

checker/src/main/java/org/checkerframework/checker/nullness/messages.properties

@@ -22,7 +22,7 @@ nulltest.redundant=redundant test against null; "%s" is non-null
 instanceof.nullable=instanceof is only true for a non-null expression
 instanceof.nonnull.redundant=redundant @NonNull annotation on instanceof
 new.array=annotations %s may not be applied as component type for array "%s"
-new.class=the annotations %s do not need be applied in object creations
+new.class=do not write nullness annotations on a constructor invocation; the result is always non-null
 nullness.on.constructor=do not write nullness annotations on a constructor, whose result is always non-null
 nullness.on.enum=do not write nullness annotations on an enum constant, which is always non-null
 nullness.on.exception.parameter=do not write nullness annotations on an exception parameter, which is always non-null

framework/src/main/java/org/checkerframework/common/basetype/BaseTypeVisitor.java

@@ -271,7 +271,7 @@ public class BaseTypeVisitor<Factory extends GenericAnnotatedTypeFactory<?, ?, ?
   private final boolean checkCastElementType;
 
   /** True if "-AwarnRedundantAnnotations" was passed on the command line */
-  private final boolean warnRedundantAnnotations;
+  protected final boolean warnRedundantAnnotations;
 
   /** The tree of the enclosing method that is currently being visited, if any. */
   protected @Nullable MethodTree methodTree = null;