Merge branch 'release/1.1.3'

build.gradle

@@ -18,7 +18,7 @@ plugins {
 }
 
 
-version "1.1.2"
+version "1.1.3"
 
 group "au.org.ala"
 

grails-app/conf/logback.groovy

@@ -118,21 +118,21 @@ final warn = [
         'grails.plugins.mail',
         'org.hibernate',
         'org.quartz',
-        'org.flywaydb',
         'asset.pipeline'
 ]
 final info = [
+        'org.flywaydb',
         'au.org.ala.images'
 ]
 
 final debug = []
 final trace = []
 
-for (def name : error) logger(name, ERROR, ['STDOUT'])
-for (def name : warn) logger(name, WARN, ['STDOUT'])
-for (def name: info) logger(name, INFO, ['STDOUT'])
-for (def name: debug) logger(name, DEBUG, ['STDOUT'])
-for (def name: trace) logger(name, TRACE, ['STDOUT'])
+for (def name : error) logger(name, ERROR)
+for (def name : warn) logger(name, WARN)
+for (def name: info) logger(name, INFO)
+for (def name: debug) logger(name, DEBUG)
+for (def name: trace) logger(name, TRACE)
 
 logger('au.org.ala.images.CodeTimer', INFO, ['TIMING_LOG'], false)
 logger('au.org.ala.images.ScheduleReindexAllImagesTask', INFO, ['INDEXING_LOG'], false)

grails-app/conf/spring/resources.groovy

@@ -1,4 +1,5 @@
 import org.flywaydb.core.Flyway
+import org.postgresql.ds.PGSimpleDataSource
 import org.springframework.beans.factory.config.BeanDefinition
 
 // Place your Spring DSL code here
@@ -7,7 +8,12 @@ beans = {
 
         flyway(Flyway) { bean ->
             bean.initMethod = 'migrate'
-            dataSource = ref('dataSource')
+            dataSource = { PGSimpleDataSource pgds ->
+                url = application.config.flyway.jdbcUrl ?: application.config.dataSource.url
+                user = application.config.flyway.username ?: application.config.dataSource.username
+                password = application.config.flyway.password ?: application.config.dataSource.password
+            }
+
             baselineOnMigrate = application.config.getProperty('flyway.baselineOnMigrate', Boolean, true)
             def outOfOrderProp = application.config.getProperty('flyway.outOfOrder', Boolean, false)
             outOfOrder = outOfOrderProp
@@ -30,7 +36,6 @@ beans = {
         if (hibernateDatastoreBeanDef) {
             addDependency(hibernateDatastoreBeanDef, 'flyway')
         }
-
     }
     else {
         log.info "Grails Flyway plugin has been disabled"

grails-app/controllers/au/org/ala/images/StorageLocationController.groovy

@@ -36,13 +36,10 @@ class StorageLocationController {
 
     def listFragment() {
         def storageLocationList = StorageLocation.list([sort: 'id'])
-        def imageCounts = storageLocationList.collectEntries {
-            [(it.id): Image.countByStorageLocationAndDateDeletedIsNull(it) ]
-        }
         def verifieds = storageLocationList.collectEntries {
             [ (it.id): it.verifySettings() ]
         }
-        [storageLocationList:  storageLocationList, imageCounts: imageCounts, defaultId: settingService.getStorageLocationDefault(), verifieds: verifieds]
+        [storageLocationList:  storageLocationList, defaultId: settingService.getStorageLocationDefault(), verifieds: verifieds]
     }
 
     def editFragment() {

grails-app/controllers/au/org/ala/images/WebServiceController.groovy

@@ -3,6 +3,7 @@ package au.org.ala.images
 import au.ala.org.ws.security.RequireApiKey
 import au.org.ala.cas.util.AuthenticationUtils
 import au.org.ala.ws.security.ApiKeyInterceptor
+import com.google.common.base.Suppliers
 import grails.converters.JSON
 import grails.converters.XML
 import io.swagger.annotations.Api
@@ -21,6 +22,7 @@ import org.springframework.web.multipart.MultipartFile
 import swagger.SwaggerService
 
 import javax.servlet.http.HttpServletRequest
+import java.util.concurrent.TimeUnit
 import java.util.zip.GZIPOutputStream
 
 @Api(value = "/ws", description = "Image Web Services")
@@ -666,12 +668,19 @@ class WebServiceController {
             @ApiResponse(code = 404, message = "Image Not Found")]
     )
     def getRepositoryStatistics() {
+        def results = statsCache.get()
+        renderResults(results, 200, true)
+    }
+
+    private def statsCache = Suppliers.memoizeWithExpiration(this.&getRepositoryStatisticsResultsInternal, 1, TimeUnit.MINUTES)
+
+    private Map<String, Integer> getRepositoryStatisticsResultsInternal() {
         def results = [:]
         results.imageCount = Image.count()
         results.deletedImageCount = Image.countByDateDeletedIsNotNull()
         results.licenceCount = License.count()
         results.licenceMappingCount = LicenseMapping.count()
-        renderResults(results, 200, true)
+        return results
     }
 
     @ApiOperation(

grails-app/init/image/service/Application.groovy → grails-app/init/au/org/ala/images/Application.groovy

@@ -1,4 +1,4 @@
-package image.service
+package au.org.ala.images
 
 import grails.boot.GrailsApp
 import grails.boot.config.GrailsAutoConfiguration

grails-app/init/image/service/BootStrap.groovy → grails-app/init/au/org/ala/images/BootStrap.groovy

@@ -1,4 +1,4 @@
-package image.service
+package au.org.ala.images
 
 class BootStrap {
 

grails-app/services/au/org/ala/images/ElasticSearchService.groovy

@@ -755,7 +755,8 @@ class ElasticSearchService {
             ct.stop(true)
 
             ct = new CodeTimer("Object retrieval (${searchResponse.hits.hits.length} of ${searchResponse.hits.totalHits} hits)")
-            final imageList = searchResponse.hits ? Image.findAllByImageIdentifierInList(searchResponse.hits*.id)?.collect { image ->
+            final hitsIdList = searchResponse.hits ? searchResponse.hits*.id : []
+            final imageList = hitsIdList ? Image.findAllByImageIdentifierInList(hitsIdList)?.collect { image ->
                 image.metadata = null
                 image.tags = null
                 asMap(image)