Fix review issues

vaadin · Jun 25, 2020 · 63563db · 63563db
1 parent 33c2f65
commit 63563db
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/flow-server/src/main/java/com/vaadin/flow/internal/JsonUtils.java b/flow-server/src/main/java/com/vaadin/flow/internal/JsonUtils.java
@@ -20,6 +20,7 @@
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.function.BiConsumer;
 import java.util.function.BinaryOperator;
@@ -47,13 +48,13 @@
  */
 public final class JsonUtils {
 
-    private static ObjectMapper objectMapper = new ObjectMapper();
+    private static final ObjectMapper objectMapper = new ObjectMapper();
 
     /**
      * Collects a stream of JSON values to a JSON array.
      *
      * @author Vaadin Ltd
- * @since 1.0
+     * @since 1.0
      */
     private static final class JsonArrayCollector
             implements Collector<JsonValue, JsonArray, JsonArray> {
@@ -289,9 +290,8 @@ public static <T> JsonObject createObject(Map<String, T> map,
      * @return a JSON representation of the bean
      */
     public static JsonObject beanToJson(Object bean) {
-        if (bean == null) {
-            throw new RuntimeException("Cannot convert null to a JSON object");
-        }
+        Objects.requireNonNull(bean, "Cannot convert null to a JSON object");
+
         try {
             return Json.parse(objectMapper.writeValueAsString(bean));
         } catch (JsonProcessingException e) {