Merge pull request #443 from EBISPOT/issue-417

issue-417: set content-type header for search, select and suggest
EBISPOT · Jul 27, 2023 · ffc591b · ffc591b
2 parents b068bac + 2d89f00
commit ffc591b
Show file tree

Hide file tree

Showing 10 changed files with 7 additions and 58 deletions.
diff --git a/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SearchController.java b/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SearchController.java
@@ -251,6 +251,7 @@ public void search(
         responseObj.put("response", responseBody);
 
         response.getOutputStream().write(gson.toJson(responseObj).getBytes(StandardCharsets.UTF_8));
+        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
         response.flushBuffer();
     }
 

diff --git a/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SelectController.java b/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SelectController.java
@@ -9,6 +9,7 @@
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrDocument;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -27,8 +28,6 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
 @Controller
 public class V1SelectController {
 
@@ -40,7 +39,7 @@ public class V1SelectController {
     @Autowired
     private OlsSolrClient solrClient;
 
-    @RequestMapping(path = "/api/select", produces = {APPLICATION_JSON_VALUE}, method = RequestMethod.GET)
+    @RequestMapping(path = "/api/select", produces = {MediaType.APPLICATION_JSON_VALUE}, method = RequestMethod.GET)
     public void select(
             @RequestParam("q") String query,
             @RequestParam(value = "ontology", required = false) Collection<String> ontologies,
@@ -205,6 +204,7 @@ public void select(
         responseObj.put("highlighting", highlighting);
 
         response.getOutputStream().write(gson.toJson(responseObj).getBytes(StandardCharsets.UTF_8));
+        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
         response.flushBuffer();
 
     }

diff --git a/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SuggestController.java b/backend/src/main/java/uk/ac/ebi/spot/ols/controller/api/v1/V1SuggestController.java
@@ -8,6 +8,7 @@
 import org.apache.solr.client.solrj.util.ClientUtils;
 import org.apache.solr.common.SolrDocument;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -21,8 +22,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.*;
 
-import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
-
 @Controller
 public class V1SuggestController {
 
@@ -34,7 +33,7 @@ public class V1SuggestController {
     @Autowired
     private OlsSolrClient solrClient;
 
-    @RequestMapping(path = "/api/suggest", produces = {APPLICATION_JSON_VALUE}, method = RequestMethod.GET)
+    @RequestMapping(path = "/api/suggest", produces = {MediaType.APPLICATION_JSON_VALUE}, method = RequestMethod.GET)
     public void suggest(
             @RequestParam("q") String query,
             @RequestParam(value = "ontology", required = false) Collection<String> ontologies,
@@ -106,6 +105,7 @@ public void suggest(
         responseObj.put("response", responseBody);
 
         response.getOutputStream().write(gson.toJson(responseObj).getBytes(StandardCharsets.UTF_8));
+        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
         response.flushBuffer();
     }
 

diff --git a/frontend/ols/asset-manifest.json b/frontend/ols/asset-manifest.json
diff --git a/frontend/ols/favicon.ico b/frontend/ols/favicon.ico
diff --git a/frontend/ols/index.html b/frontend/ols/index.html
diff --git a/frontend/ols/logo192.png b/frontend/ols/logo192.png
diff --git a/frontend/ols/logo512.png b/frontend/ols/logo512.png
diff --git a/frontend/ols/manifest.json b/frontend/ols/manifest.json
diff --git a/frontend/ols/robots.txt b/frontend/ols/robots.txt