Fixes #2615 (#2616)

* Fixes #2615 * Fixed checkstyle issue Co-authored-by: Aaron Klish <[email protected]>
yahoo · Apr 19, 2022 · 18df59e · 18df59e
1 parent c8dd203
commit 18df59e
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 1 deletion.
diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/extensions/JsonApiPatch.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/extensions/JsonApiPatch.java
@@ -171,7 +171,12 @@ private List<Supplier<Pair<Integer, JsonNode>>> handleActions(PatchRequestScope
                 }
                 String[] combined = ArrayUtils.addAll(rootUri.split("/"), action.patch.getPath().split("/"));
                 String fullPath = String.join("/", combined).replace("/-", "");
-                switch (action.patch.getOperation()) {
+
+                Patch.Operation operation = action.patch.getOperation();
+                if (operation == null) {
+                    throw new InvalidEntityBodyException("Patch extension operation cannot be null.");
+                }
+                switch (operation) {
                     case ADD:
                         result = handleAddOp(fullPath, action.patch.getValue(), requestScope, action);
                         break;

diff --git a/elide-integration-tests/src/test/java/com/yahoo/elide/tests/ResourceIT.java b/elide-integration-tests/src/test/java/com/yahoo/elide/tests/ResourceIT.java
@@ -23,6 +23,7 @@
 import static com.yahoo.elide.test.jsonapi.elements.Relation.TO_ONE;
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.anyOf;
+import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.isEmptyOrNullString;
 import static org.hamcrest.Matchers.nullValue;
@@ -1442,6 +1443,22 @@ public void createChildRelateExisting() {
                 .body(equalTo(expected));
     }
 
+    @Test
+    public void invalidPatchNullOp() {
+        String request = jsonParser.getJson("/ResourceIT/patchExtNullOp.req.json");
+
+        String detail = "Patch extension operation cannot be null.";
+
+        given()
+                .contentType(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .accept(JSONAPI_CONTENT_TYPE_WITH_JSON_PATCH_EXTENSION)
+                .body(request)
+                .patch("/")
+                .then()
+                .statusCode(HttpStatus.SC_BAD_REQUEST)
+                .body("errors[0].detail[0]", containsString(Encode.forHtml(detail)));
+    }
+
     @Test
     public void invalidPatchMissingId() {
         String request = jsonParser.getJson("/ResourceIT/invalidPatchMissingId.req.json");

diff --git a/elide-integration-tests/src/test/resources/ResourceIT/patchExtNullOp.req.json b/elide-integration-tests/src/test/resources/ResourceIT/patchExtNullOp.req.json
@@ -0,0 +1,13 @@
+[
+  {
+    "op": null,
+    "path": "/book",
+    "value": {
+      "type": "book",
+      "id": "123",
+      "attributes": {
+        "title": "My New Book"
+      }
+    }
+  }
+]