Passing query parameters and headers to patch extension request scope (…

…#1781) * Passing query parameters and headers to patch extension request scope * Added javadocs Co-authored-by: Aaron Klish <[email protected]>
yahoo · Jan 22, 2021 · 9ce5414 · 9ce5414
1 parent acb9e30
commit 9ce5414
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/elide-core/src/main/java/com/yahoo/elide/Elide.java b/elide-core/src/main/java/com/yahoo/elide/Elide.java
@@ -341,7 +341,7 @@ public ElideResponse patch(String baseUrlEndPoint, String contentType, String ac
         if (JsonApiPatch.isPatchExtension(contentType) && JsonApiPatch.isPatchExtension(accept)) {
             handler = (tx, user) -> {
                 PatchRequestScope requestScope = new PatchRequestScope(baseUrlEndPoint, path, apiVersion, tx,
-                        user, requestId, elideSettings);
+                        user, requestId, queryParams, requestHeaders, elideSettings);
                 try {
                     Supplier<Pair<Integer, JsonNode>> responder =
                             JsonApiPatch.processJsonPatch(dataStore, path, jsonApiDocument, requestScope);

diff --git a/elide-core/src/main/java/com/yahoo/elide/jsonapi/extensions/PatchRequestScope.java b/elide-core/src/main/java/com/yahoo/elide/jsonapi/extensions/PatchRequestScope.java
@@ -12,7 +12,8 @@
 import com.yahoo.elide.jsonapi.EntityProjectionMaker;
 import com.yahoo.elide.jsonapi.models.JsonApiDocument;
 
-import java.util.Collections;
+import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 import javax.ws.rs.core.MultivaluedMap;
 
@@ -30,6 +31,8 @@ public class PatchRequestScope extends RequestScope {
      * @param transaction current database transaction
      * @param user        request user
      * @param requestId   request ID
+     * @param queryParams request query parameters
+     * @param requestHeaders request headers
      * @param elideSettings Elide settings object
      */
     public PatchRequestScope(
@@ -39,6 +42,8 @@ public PatchRequestScope(
             DataStoreTransaction transaction,
             User user,
             UUID requestId,
+            MultivaluedMap<String, String> queryParams,
+            Map<String, List<String>> requestHeaders,
             ElideSettings elideSettings) {
         super(
                 baseUrlEndPoint,
@@ -47,8 +52,8 @@ public PatchRequestScope(
                 (JsonApiDocument) null,
                 transaction,
                 user,
-                (MultivaluedMap<String, String>) null,
-                Collections.emptyMap(),
+                queryParams,
+                requestHeaders,
                 requestId,
                 elideSettings
         );

diff --git a/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java b/elide-core/src/test/java/com/yahoo/elide/core/PersistentResourceTest.java
@@ -2227,7 +2227,7 @@ public void testRelationChangeSpecType() {
     @Test
     public void testPatchRequestScope() {
         DataStoreTransaction tx = mock(DataStoreTransaction.class);
-        PatchRequestScope parentScope = new PatchRequestScope(null, "/book", NO_VERSION, tx, new TestUser("1"), UUID.randomUUID(), elideSettings);
+        PatchRequestScope parentScope = new PatchRequestScope(null, "/book", NO_VERSION, tx, new TestUser("1"), UUID.randomUUID(), null, Collections.emptyMap(), elideSettings);
         PatchRequestScope scope = new PatchRequestScope(
                 parentScope.getPath(), parentScope.getJsonApiDocument(), parentScope);
         // verify wrap works