(wip)

Author: dennisvang

src/main/java/nl/dtls/fairdatapoint/api/controller/search/SearchSparqlController.java

@@ -37,6 +37,7 @@
 package nl.dtls.fairdatapoint.api.controller.search;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletResponse;
 import org.eclipse.rdf4j.http.server.readonly.sparql.EvaluateResult;
@@ -74,21 +75,24 @@ public SearchSparqlController(Repository rdf4jRepository, SparqlQueryEvaluator s
      * Method body copied from org.eclipse.rdf4j.http.server.readonly.QueryResponder.
      */
     @PreAuthorize("isAuthenticated()")
-    @PostMapping(path = "/search/sparql", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    @PostMapping(path = "/search/sparql", consumes = MediaType.APPLICATION_JSON_VALUE)
     public void sparqlPost(
         @Schema(example = MediaType.APPLICATION_JSON_VALUE)
             @RequestHeader(value = HttpHeaders.ACCEPT) String acceptHeader,
-        @Schema(example = "\"\"") @RequestParam(value = "default-graph-uri", required = false) String defaultGraphUri,
-        @Schema(example = "\"\"") @RequestParam(value = "named-graph-uri", required = false) String namedGraphUri,
-        @Schema(example = "SELECT * WHERE {?subject ?predicate ?object}") @RequestParam(value = "query") String query,
+        @Schema(example = "{\"query\": \"SELECT * WHERE {?subject ?predicate ?object}}\"")
+            @RequestBody SparqlQuery sparqlQuery,
         HttpServletResponse response
     ) throws IOException {
         // enforce default accept header for wildcard
         final String accept = ("*/*".equals(acceptHeader)) ? MediaType.APPLICATION_JSON_VALUE : acceptHeader;
         try {
             final EvaluateResultHttpResponse result = new EvaluateResultHttpResponse(response);
             sparqlQueryEvaluator.evaluate(
-                    result, rdf4jRepository, query, accept, toArray(defaultGraphUri), toArray(namedGraphUri)
+                    result, rdf4jRepository,
+                    sparqlQuery.query,
+                    accept,
+                    toArray(sparqlQuery.defaultGraphUri),
+                    toArray(sparqlQuery.namedGraphUri)
             );
         }
         catch (MalformedQueryException | IllegalStateException | IOException exception) {
@@ -131,4 +135,5 @@ public OutputStream getOutputstream() throws IOException {
         }
     }
 
+    public record SparqlQuery(String query, String defaultGraphUri, String namedGraphUri) {}
 }

src/test/java/nl/dtls/fairdatapoint/acceptance/search/sparql/TestSparqlPost.java

@@ -27,6 +27,7 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import nl.dtls.fairdatapoint.WebIntegrationTest;
+import nl.dtls.fairdatapoint.api.controller.search.SearchSparqlController;
 import org.eclipse.rdf4j.rio.RDFFormat;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
@@ -76,12 +77,13 @@ public void sparqlPostUnauthenticated() throws JsonProcessingException {
     @Test
     public void sparqlPostSelectAll() throws JsonProcessingException {
         // prepare request
-        MultiValueMap<String, String> requestBody = new LinkedMultiValueMap<>();
-        requestBody.add("query", querySelectAll);
+        SearchSparqlController.SparqlQuery requestBody = new SearchSparqlController.SparqlQuery(
+                querySelectAll, null, null);
         RequestEntity<?> request = RequestEntity
                 .post(url)
                 .header(HttpHeaders.AUTHORIZATION, ALBERT_TOKEN)
                 .accept(MediaType.APPLICATION_JSON)
+                .contentType(MediaType.APPLICATION_JSON)
                 .body(requestBody);
 
         // perform