api: add missing null check TextDecoration#withState states

KyoriPowered · Oct 31, 2021 · edb0a67 · edb0a67
1 parent 5228cce
commit edb0a67
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/api/src/main/java/net/kyori/adventure/text/format/TextDecorationAndStateImpl.java b/api/src/main/java/net/kyori/adventure/text/format/TextDecorationAndStateImpl.java
@@ -27,13 +27,17 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import static java.util.Objects.requireNonNull;
+
 final class TextDecorationAndStateImpl implements TextDecorationAndState {
   private final TextDecoration decoration;
   private final TextDecoration.State state;
 
   TextDecorationAndStateImpl(final TextDecoration decoration, final TextDecoration.State state) {
+    // no null check is required on the decoration since this constructor is always invoked in such a way that
+    // decoration is always non-null
     this.decoration = decoration;
-    this.state = state;
+    this.state = requireNonNull(state, "state");
   }
 
   @Override

diff --git a/api/src/test/java/net/kyori/adventure/text/format/TextDecorationTest.java b/api/src/test/java/net/kyori/adventure/text/format/TextDecorationTest.java
@@ -26,6 +26,7 @@
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
 class TextDecorationTest {
   @Test
@@ -34,4 +35,10 @@ void testByBoolean() {
     assertEquals(TextDecoration.State.FALSE, TextDecoration.State.byBoolean(false));
     assertEquals(TextDecoration.State.TRUE, TextDecoration.State.byBoolean(true));
   }
+
+  @Test
+  void withStateOrAsThrowsOnNull() {
+    assertThrows(NullPointerException.class, () -> TextDecoration.BOLD.as(null));
+    assertThrows(NullPointerException.class, () -> TextDecoration.BOLD.withState(null));
+  }
 }