Merge remote-tracking branch 'origin/dev' into feature/biocollect-1586

Author: temi

grails-app/services/au/org/ala/ecodata/forms/EcpWebService.groovy

@@ -615,19 +615,22 @@ class EcpWebService {
 
         // Execute request
         try (Response response = client.newCall(requestBuilder.build()).execute()) {
-            okhttp3.MediaType respContentType = response.body().contentType()
-            String subType = respContentType.subtype()?.toLowerCase()
+
+            ResponseBody responseBody = response.body()
+            okhttp3.MediaType respContentType = responseBody.contentType()
+            String mediaType = respContentType.toString()?.toLowerCase()
             def responseData
-            String responseBody = response.body().string()
-            switch (subType) {
-                case "json":
+            if (isTextBased(mediaType)) {
+                responseData = responseBody.string()
+                if (mediaType.contains('json')) {
                     ObjectMapper objectMapper = new ObjectMapper()
-                    responseData = objectMapper.readValue(responseBody, Object)
-                    break
-                case "text":
-                default:
-                    responseData = responseBody
-                    break
+                    responseData = objectMapper.readValue(responseData, Object)
+                }
+            } else {
+                // This is only used for the /document/createThumbnail endpoint.  Because the thumbnail is small we
+                // can get away with reading the entire response into memory.  If dealing with large files
+                // we might have to remove the try with resources and handle the stream manually.
+                responseData = responseBody.bytes()
             }
 
             result.statusCode = result.status = response.code()
@@ -641,6 +644,18 @@ class EcpWebService {
         return result
     }
 
+    private static boolean isTextBased(String contentType) {
+        if (!contentType) {
+            log.error("Missing content type")
+            return false
+        }
+        String contentTypeLower = contentType.toLowerCase()
+        return contentTypeLower.contains('json') ||
+                contentTypeLower.contains('text') ||
+                contentTypeLower.contains('xml') ||
+                contentTypeLower.contains('graphql')
+    }
+
     /**
      * Forwards a HTTP multipart/form-data request to ecodata.
      * @param url the URL to forward to.
@@ -660,7 +675,7 @@ class EcpWebService {
     }
 
     Map postMultipart(String url, Map params, File file, String contentType, String originalFilename, String fileParamName = 'files', boolean useToken = false, boolean userToken = false) {
-        RequestBody fileBody = RequestBody.create(okhttp3.MediaType.parse(contentType), file)
+        RequestBody fileBody = RequestBody.create(file, okhttp3.MediaType.parse(contentType))
         postMultipart(url, params, fileBody, contentType, originalFilename, fileParamName, useToken, userToken)
     }
 

grails-app/services/au/org/ala/ecodata/forms/SpeciesListService.groovy

@@ -28,6 +28,7 @@ class SpeciesListService {
     static final String UPLOAD_V2 = "/upload"
     public static final String INGEST_V2 = "/ingest"
     public static final String PROGRESS_V2 = "/progress"
+    public static final String ENCODING = 'UTF-8'
 
     GrailsApplication grailsApplication
     EcpWebService ecpWebService
@@ -245,7 +246,7 @@ class SpeciesListService {
         if (!listId) {
             return null
         }
-        String url = grailsApplication.config.getProperty('lists.baseURL') + SPECIES_LIST_ITEMS_PATH_V2 + '/' + listId
+        String url = grailsApplication.config.getProperty('lists.baseURL') + SPECIES_LIST_ITEMS_PATH_V2 + '/' + URLEncoder.encode(listId, ENCODING)
         Map params = [pageSize: pageSize, page: page]
         if (query) {
             params.q = query