Fix exception on annotation traversal when target is not present (#51)

slackhq · Mar 28, 2022 · a2e0f2d · a2e0f2d
1 parent 5eed679
commit a2e0f2d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/main/java/com/slack/eithernet/Annotations.kt b/src/main/java/com/slack/eithernet/Annotations.kt
@@ -80,7 +80,7 @@ private fun <A : Any> Array<out Annotation>.nextAnnotations(type: Class<A>): Pai
     if (type.isInstance(next)) {
       @Suppress("UNCHECKED_CAST")
       resultType = next as A
-    } else {
+    } else if (nextIndex < nextAnnotations.size) {
       nextAnnotations[nextIndex] = next
       nextIndex++
     }

diff --git a/src/test/kotlin/com/slack/eithernet/ResultTypeTest.kt b/src/test/kotlin/com/slack/eithernet/ResultTypeTest.kt
@@ -62,7 +62,7 @@ class ResultTypeTest {
   }
 
   @Test
-  fun errorType() {
+  fun errorType_present() {
     val annotations = Array<Annotation>(4) {
       ResultTypeTest::class.java.getAnnotation(SampleAnnotation::class.java)
     }
@@ -74,7 +74,15 @@ class ResultTypeTest {
   }
 
   @Test
-  fun statusCode() {
+  fun errorType_absent() {
+    val annotations = Array<Annotation>(4) {
+      ResultTypeTest::class.java.getAnnotation(SampleAnnotation::class.java)
+    }
+    assertThat(annotations.errorType()).isNull()
+  }
+
+  @Test
+  fun statusCode_present() {
     val annotations = Array<Annotation>(4) {
       ResultTypeTest::class.java.getAnnotation(SampleAnnotation::class.java)
     }
@@ -85,6 +93,14 @@ class ResultTypeTest {
     assertThat(statusCode).isSameInstanceAs(statusCodeAnnotation)
   }
 
+  @Test
+  fun statusCode_absent() {
+    val annotations = Array<Annotation>(4) {
+      ResultTypeTest::class.java.getAnnotation(SampleAnnotation::class.java)
+    }
+    assertThat(annotations.statusCode()).isNull()
+  }
+
   private class A
 
   private class B