Attempt to fix integration tests

AtlasOfLivingAustralia · Jul 27, 2020 · ad5ae86 · ad5ae86
1 parent d18f55f
commit ad5ae86
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/grails-app/services/au/org/ala/regions/MetadataService.groovy b/grails-app/services/au/org/ala/regions/MetadataService.groovy
@@ -6,6 +6,7 @@ import grails.util.Metadata
 import groovyx.net.http.URIBuilder
 import org.apache.commons.lang.StringEscapeUtils
 import org.apache.commons.httpclient.util.URIUtil
+import org.grails.web.json.JSONObject
 
 import javax.annotation.PostConstruct
 
@@ -592,16 +593,20 @@ class MetadataService {
  }
 
  @Cacheable(value = "metadata", key = { '"getStateEmblems"' })
- def getStateEmblems() {
+ JSONObject getStateEmblems() {
  def file = new File(CONFIG_DIR + "/state-emblems.json")
+ JSONObject emblemObj = new JSONObject()
+
  if (!file.exists()) {
+ log.debug "Emblems not found in ext config, looking in grails-app/conf."
  file = new File(this.class.classLoader.getResource('default/state-emblems.json').toURI())
  }
+
  if (file.exists()) {
- JSON.parse(file.text)
- } else {
- [] // NdR this should be a Map not List! TODO test and fix
+ emblemObj = JSON.parse(file.text)
  }
+
+ emblemObj
  }
 
  /**
@@ -778,8 +783,7 @@ class MetadataService {
  if (file.exists()) {
  JSON.parse(file.text)
  } else {
- file =
- null
+ file = null
  }
  }
 }