8317356: Fix missing null checks in the ClassFile API

Co-authored-by: Nizar Benalla <nbenalla@openjdk.org>
Reviewed-by: asotona

Author: liach

src/java.base/share/classes/java/lang/classfile/AnnotationValue.java

@@ -42,6 +42,8 @@
 import jdk.internal.classfile.impl.Util;
 import jdk.internal.javac.PreviewFeature;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * Models an {@code element_value} structure, or a value of an element-value
  * pair of an annotation, as defined in JVMS {@jvms 4.7.16.1}.
@@ -488,6 +490,8 @@ default ClassDesc classSymbol() {
      */
     static OfEnum ofEnum(Utf8Entry className,
                          Utf8Entry constantName) {
+        requireNonNull(className);
+        requireNonNull(constantName);
         return new AnnotationImpl.OfEnumImpl(className, constantName);
     }
 
@@ -506,6 +510,7 @@ static OfEnum ofEnum(ClassDesc className, String constantName) {
      * @param className the descriptor string of the class
      */
     static OfClass ofClass(Utf8Entry className) {
+        requireNonNull(className);
         return new AnnotationImpl.OfClassImpl(className);
     }
 
@@ -522,6 +527,7 @@ static OfClass ofClass(ClassDesc className) {
      * @param value the string
      */
     static OfString ofString(Utf8Entry value) {
+        requireNonNull(value);
         return new AnnotationImpl.OfStringImpl(value);
     }
 
@@ -538,6 +544,7 @@ static OfString ofString(String value) {
      * @param value the double value
      */
     static OfDouble ofDouble(DoubleEntry value) {
+        requireNonNull(value);
         return new AnnotationImpl.OfDoubleImpl(value);
     }
 
@@ -554,6 +561,7 @@ static OfDouble ofDouble(double value) {
      * @param value the float value
      */
     static OfFloat ofFloat(FloatEntry value) {
+        requireNonNull(value);
         return new AnnotationImpl.OfFloatImpl(value);
     }
 
@@ -570,6 +578,7 @@ static OfFloat ofFloat(float value) {
      * @param value the long value
      */
     static OfLong ofLong(LongEntry value) {
+        requireNonNull(value);
         return new AnnotationImpl.OfLongImpl(value);
     }
 
@@ -586,6 +595,7 @@ static OfLong ofLong(long value) {
      * @param value the int value
      */
     static OfInt ofInt(IntegerEntry value) {
+        requireNonNull(value);
         return new AnnotationImpl.OfIntImpl(value);
     }
 
@@ -602,6 +612,7 @@ static OfInt ofInt(int value) {
      * @param value the short value
      */
     static OfShort ofShort(IntegerEntry value) {
+        requireNonNull(value);
         return new AnnotationImpl.OfShortImpl(value);
     }
 
@@ -618,6 +629,7 @@ static OfShort ofShort(short value) {
      * @param value the char value
      */
     static OfChar ofChar(IntegerEntry value) {
+        requireNonNull(value);
         return new AnnotationImpl.OfCharImpl(value);
     }
 
@@ -634,6 +646,7 @@ static OfChar ofChar(char value) {
      * @param value the byte value
      */
     static OfByte ofByte(IntegerEntry value) {
+        requireNonNull(value);
         return new AnnotationImpl.OfByteImpl(value);
     }
 
@@ -650,6 +663,7 @@ static OfByte ofByte(byte value) {
      * @param value the boolean value
      */
     static OfBoolean ofBoolean(IntegerEntry value) {
+        requireNonNull(value);
         return new AnnotationImpl.OfBooleanImpl(value);
     }
 
@@ -667,6 +681,7 @@ static OfBoolean ofBoolean(boolean value) {
      * @param value the annotation
      */
     static OfAnnotation ofAnnotation(Annotation value) {
+        requireNonNull(value);
         return new AnnotationImpl.OfAnnotationImpl(value);
     }
 
@@ -784,6 +799,6 @@ static AnnotationValue of(Object value) {
         } else if (value instanceof Enum<?> e) {
             return ofEnum(ClassDesc.ofDescriptor(e.getDeclaringClass().descriptorString()), e.name());
         }
-        throw new IllegalArgumentException("Illegal annotation constant value type " + (value == null ? null : value.getClass()));
+        throw new IllegalArgumentException("Illegal annotation constant value type " + requireNonNull(value).getClass());
     }
 }

src/java.base/share/classes/java/lang/classfile/AttributedElement.java

@@ -33,6 +33,8 @@
 import jdk.internal.classfile.impl.AbstractUnboundModel;
 import jdk.internal.javac.PreviewFeature;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * A {@link ClassFileElement} describing an entity that has attributes, such
  * as a class, field, method, code attribute, or record component.
@@ -58,6 +60,7 @@ public sealed interface AttributedElement extends ClassFileElement
      * is not present
      */
     default <T extends Attribute<T>> Optional<T> findAttribute(AttributeMapper<T> attr) {
+        requireNonNull(attr);
         for (Attribute<?> la : attributes()) {
             if (la.attributeMapper() == attr) {
                 @SuppressWarnings("unchecked")
@@ -76,6 +79,7 @@ default <T extends Attribute<T>> Optional<T> findAttribute(AttributeMapper<T> at
      * is not present
      */
     default <T extends Attribute<T>> List<T> findAttributes(AttributeMapper<T> attr) {
+        requireNonNull(attr);
         var list = new ArrayList<T>();
         for (var a : attributes()) {
             if (a.attributeMapper() == attr) {

src/java.base/share/classes/java/lang/classfile/ClassHierarchyResolver.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2022, 2024, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -39,6 +39,8 @@
 import jdk.internal.classfile.impl.Util;
 
 import static java.lang.constant.ConstantDescs.CD_Object;
+import static java.util.Objects.requireNonNull;
+
 import jdk.internal.javac.PreviewFeature;
 
 /**
@@ -106,6 +108,7 @@ static ClassHierarchyInfo ofInterface() {
      *           other resolver in cases where this resolver returns {@code null}.
      */
     default ClassHierarchyResolver orElse(ClassHierarchyResolver other) {
+        requireNonNull(other);
         return new ClassHierarchyResolver() {
             @Override
             public ClassHierarchyInfo getClassInfo(ClassDesc classDesc) {
@@ -170,7 +173,7 @@ public Map<ClassDesc, ClassHierarchyInfo> get() {
      * @return the {@linkplain ClassHierarchyResolver}
      */
     static ClassHierarchyResolver ofResourceParsing(Function<ClassDesc, InputStream> classStreamResolver) {
-        return new ClassHierarchyImpl.ResourceParsingClassHierarchyResolver(classStreamResolver);
+        return new ClassHierarchyImpl.ResourceParsingClassHierarchyResolver(requireNonNull(classStreamResolver));
     }
 
     /**
@@ -181,6 +184,7 @@ static ClassHierarchyResolver ofResourceParsing(Function<ClassDesc, InputStream>
      * @return the {@linkplain ClassHierarchyResolver}
      */
     static ClassHierarchyResolver ofResourceParsing(ClassLoader loader) {
+        requireNonNull(loader);
         return ofResourceParsing(new Function<>() {
             @Override
             public InputStream apply(ClassDesc classDesc) {
@@ -210,6 +214,7 @@ static ClassHierarchyResolver of(Collection<ClassDesc> interfaces,
      * @return the class hierarchy resolver
      */
     static ClassHierarchyResolver ofClassLoading(ClassLoader loader) {
+        requireNonNull(loader);
         return new ClassLoadingClassHierarchyResolver(new Function<>() {
             @Override
             public Class<?> apply(ClassDesc cd) {
@@ -232,6 +237,7 @@ public Class<?> apply(ClassDesc cd) {
      * @return the class hierarchy resolver
      */
     static ClassHierarchyResolver ofClassLoading(MethodHandles.Lookup lookup) {
+        requireNonNull(lookup);
         return new ClassLoadingClassHierarchyResolver(new Function<>() {
             @Override
             public Class<?> apply(ClassDesc cd) {

src/java.base/share/classes/java/lang/classfile/ClassTransform.java

@@ -32,6 +32,8 @@
 import jdk.internal.classfile.impl.TransformImpl;
 import jdk.internal.javac.PreviewFeature;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * A transformation on streams of {@link ClassElement}.
  *
@@ -63,7 +65,7 @@ public void accept(ClassBuilder builder, ClassElement element) {
      * @return the stateful class transform
      */
     static ClassTransform ofStateful(Supplier<ClassTransform> supplier) {
-        return new TransformImpl.SupplierClassTransform(supplier);
+        return new TransformImpl.SupplierClassTransform(requireNonNull(supplier));
     }
 
     /**
@@ -74,6 +76,7 @@ static ClassTransform ofStateful(Supplier<ClassTransform> supplier) {
      * @return the class transform
      */
     static ClassTransform endHandler(Consumer<ClassBuilder> finisher) {
+        requireNonNull(finisher);
         return new ClassTransform() {
             @Override
             public void accept(ClassBuilder builder, ClassElement element) {
@@ -95,6 +98,7 @@ public void atEnd(ClassBuilder builder) {
      * @return the class transform
      */
     static ClassTransform dropping(Predicate<ClassElement> filter) {
+        requireNonNull(filter);
         return (b, e) -> {
             if (!filter.test(e))
                 b.with(e);
@@ -111,7 +115,7 @@ static ClassTransform dropping(Predicate<ClassElement> filter) {
      */
     static ClassTransform transformingMethods(Predicate<MethodModel> filter,
                                               MethodTransform xform) {
-        return new TransformImpl.ClassMethodTransform(xform, filter);
+        return new TransformImpl.ClassMethodTransform(requireNonNull(xform), requireNonNull(filter));
     }
 
     /**
@@ -122,7 +126,7 @@ static ClassTransform transformingMethods(Predicate<MethodModel> filter,
      * @return the class transform
      */
     static ClassTransform transformingMethods(MethodTransform xform) {
-        return transformingMethods(mm -> true, xform);
+        return transformingMethods(_ -> true, xform);
     }
 
     /**
@@ -157,7 +161,7 @@ static ClassTransform transformingMethodBodies(CodeTransform xform) {
      * @return the class transform
      */
     static ClassTransform transformingFields(FieldTransform xform) {
-        return new TransformImpl.ClassFieldTransform(xform, f -> true);
+        return new TransformImpl.ClassFieldTransform(requireNonNull(xform), _ -> true);
     }
 
     /**
@@ -169,6 +173,6 @@ static ClassTransform transformingFields(FieldTransform xform) {
      */
     @Override
     default ClassTransform andThen(ClassTransform t) {
-        return new TransformImpl.ChainedClassTransform(this, t);
+        return new TransformImpl.ChainedClassTransform(this, requireNonNull(t));
     }
 }

src/java.base/share/classes/java/lang/classfile/CodeTransform.java

@@ -30,6 +30,8 @@
 import jdk.internal.classfile.impl.TransformImpl;
 import jdk.internal.javac.PreviewFeature;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * A transformation on streams of {@link CodeElement}.
  *
@@ -61,7 +63,7 @@ public void accept(CodeBuilder builder, CodeElement element) {
      * @return the stateful code transform
      */
     static CodeTransform ofStateful(Supplier<CodeTransform> supplier) {
-        return new TransformImpl.SupplierCodeTransform(supplier);
+        return new TransformImpl.SupplierCodeTransform(requireNonNull(supplier));
     }
 
     /**
@@ -72,6 +74,7 @@ static CodeTransform ofStateful(Supplier<CodeTransform> supplier) {
      * @return the code transform
      */
     static CodeTransform endHandler(Consumer<CodeBuilder> finisher) {
+        requireNonNull(finisher);
         return new CodeTransform() {
             @Override
             public void accept(CodeBuilder builder, CodeElement element) {
@@ -94,6 +97,6 @@ public void atEnd(CodeBuilder builder) {
      */
     @Override
     default CodeTransform andThen(CodeTransform t) {
-        return new TransformImpl.ChainedCodeTransform(this, t);
+        return new TransformImpl.ChainedCodeTransform(this, requireNonNull(t));
     }
 }

src/java.base/share/classes/java/lang/classfile/FieldTransform.java

@@ -31,6 +31,8 @@
 import jdk.internal.classfile.impl.TransformImpl;
 import jdk.internal.javac.PreviewFeature;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * A transformation on streams of {@link FieldElement}.
  *
@@ -62,7 +64,7 @@ public void accept(FieldBuilder builder, FieldElement element) {
      * @return the stateful field transform
      */
     static FieldTransform ofStateful(Supplier<FieldTransform> supplier) {
-        return new TransformImpl.SupplierFieldTransform(supplier);
+        return new TransformImpl.SupplierFieldTransform(requireNonNull(supplier));
     }
 
     /**
@@ -73,6 +75,7 @@ static FieldTransform ofStateful(Supplier<FieldTransform> supplier) {
      * @return the field transform
      */
     static FieldTransform endHandler(Consumer<FieldBuilder> finisher) {
+        requireNonNull(finisher);
         return new FieldTransform() {
             @Override
             public void accept(FieldBuilder builder, FieldElement element) {
@@ -94,6 +97,7 @@ public void atEnd(FieldBuilder builder) {
      * @return the field transform
      */
     static FieldTransform dropping(Predicate<FieldElement> filter) {
+        requireNonNull(filter);
         return (b, e) -> {
             if (!filter.test(e))
                 b.with(e);
@@ -109,6 +113,6 @@ static FieldTransform dropping(Predicate<FieldElement> filter) {
      */
     @Override
     default FieldTransform andThen(FieldTransform t) {
-        return new TransformImpl.ChainedFieldTransform(this, t);
+        return new TransformImpl.ChainedFieldTransform(this, requireNonNull(t));
     }
 }

src/java.base/share/classes/java/lang/classfile/MethodTransform.java

@@ -31,6 +31,8 @@
 import jdk.internal.classfile.impl.TransformImpl;
 import jdk.internal.javac.PreviewFeature;
 
+import static java.util.Objects.requireNonNull;
+
 /**
  * A transformation on streams of {@link MethodElement}.
  *
@@ -62,6 +64,7 @@ public void accept(MethodBuilder builder, MethodElement element) {
      * @return the stateful method transform
      */
     static MethodTransform ofStateful(Supplier<MethodTransform> supplier) {
+        requireNonNull(supplier);
         return new TransformImpl.SupplierMethodTransform(supplier);
     }
 
@@ -73,6 +76,7 @@ static MethodTransform ofStateful(Supplier<MethodTransform> supplier) {
      * @return the method transform
      */
     static MethodTransform endHandler(Consumer<MethodBuilder> finisher) {
+        requireNonNull(finisher);
         return new MethodTransform() {
             @Override
             public void accept(MethodBuilder builder, MethodElement element) {
@@ -94,6 +98,7 @@ public void atEnd(MethodBuilder builder) {
      * @return the method transform
      */
     static MethodTransform dropping(Predicate<MethodElement> filter) {
+        requireNonNull(filter);
         return (b, e) -> {
             if (!filter.test(e))
                 b.with(e);
@@ -108,7 +113,7 @@ static MethodTransform dropping(Predicate<MethodElement> filter) {
      * @return the class transform
      */
     static MethodTransform transformingCode(CodeTransform xform) {
-        return new TransformImpl.MethodCodeTransform(xform);
+        return new TransformImpl.MethodCodeTransform(requireNonNull(xform));
     }
 
     /**
@@ -120,6 +125,6 @@ static MethodTransform transformingCode(CodeTransform xform) {
      */
     @Override
     default MethodTransform andThen(MethodTransform t) {
-        return new TransformImpl.ChainedMethodTransform(this, t);
+        return new TransformImpl.ChainedMethodTransform(this, requireNonNull(t));
     }
 }