Fail fast with null AnnotationSpec on type.

square · Mar 12, 2018 · f24801f · f24801f
1 parent d91f8e1
commit f24801f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 0 deletions.
diff --git a/src/main/java/com/squareup/javapoet/TypeSpec.java b/src/main/java/com/squareup/javapoet/TypeSpec.java
@@ -435,6 +435,7 @@ public Builder addAnnotations(Iterable<AnnotationSpec> annotationSpecs) {
     }
 
     public Builder addAnnotation(AnnotationSpec annotationSpec) {
+      checkNotNull(annotationSpec, "annotationSpec == null");
       this.annotations.add(annotationSpec);
       return this;
     }

diff --git a/src/test/java/com/squareup/javapoet/TypeSpecTest.java b/src/test/java/com/squareup/javapoet/TypeSpecTest.java
@@ -325,6 +325,27 @@ private TypeElement getElement(Class<?> clazz) {
         + "}\n");
   }
 
+  @Test public void addAnnotationDisallowsNull() {
+    try {
+      TypeSpec.classBuilder("Foo").addAnnotation((AnnotationSpec) null);
+      fail();
+    } catch (NullPointerException expected) {
+      assertThat(expected).hasMessageThat().isEqualTo("annotationSpec == null");
+    }
+    try {
+      TypeSpec.classBuilder("Foo").addAnnotation((ClassName) null);
+      fail();
+    } catch (NullPointerException expected) {
+      assertThat(expected).hasMessageThat().isEqualTo("type == null");
+    }
+    try {
+      TypeSpec.classBuilder("Foo").addAnnotation((Class<?>) null);
+      fail();
+    } catch (NullPointerException expected) {
+      assertThat(expected).hasMessageThat().isEqualTo("clazz == null");
+    }
+  }
+
   @Test public void enumWithSubclassing() throws Exception {
     TypeSpec roshambo = TypeSpec.enumBuilder("Roshambo")
         .addModifiers(Modifier.PUBLIC)