From 79160729f88484d5fe6bab3c1df5008b35fa4e38 Mon Sep 17 00:00:00 2001 From: Luis Toledo Date: Wed, 2 Feb 2022 20:05:51 -0300 Subject: [PATCH] transform NavigableMap for map using toFlatConfig method (#294) --- .../groovy/asset/pipeline/AssetPipelineGrailsPlugin.groovy | 2 +- .../asset/pipeline/grails/AssetProcessorService.groovy | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/asset-pipeline-grails/src/main/groovy/asset/pipeline/AssetPipelineGrailsPlugin.groovy b/asset-pipeline-grails/src/main/groovy/asset/pipeline/AssetPipelineGrailsPlugin.groovy index cd0cfacc..0e30b6ff 100644 --- a/asset-pipeline-grails/src/main/groovy/asset/pipeline/AssetPipelineGrailsPlugin.groovy +++ b/asset-pipeline-grails/src/main/groovy/asset/pipeline/AssetPipelineGrailsPlugin.groovy @@ -103,7 +103,7 @@ class AssetPipelineGrailsPlugin extends grails.plugins.Plugin { } - AssetPipelineConfigHolder.config = assetsConfig + AssetPipelineConfigHolder.config = assetsConfig.toFlatConfig() if (BuildSettings.TARGET_DIR) { AssetPipelineConfigHolder.config.cacheLocation = new File((File) BuildSettings.TARGET_DIR, ".assetcache").canonicalPath } diff --git a/asset-pipeline-grails/src/main/groovy/asset/pipeline/grails/AssetProcessorService.groovy b/asset-pipeline-grails/src/main/groovy/asset/pipeline/grails/AssetProcessorService.groovy index 5420f8db..06311199 100644 --- a/asset-pipeline-grails/src/main/groovy/asset/pipeline/grails/AssetProcessorService.groovy +++ b/asset-pipeline-grails/src/main/groovy/asset/pipeline/grails/AssetProcessorService.groovy @@ -4,6 +4,7 @@ package asset.pipeline.grails import asset.pipeline.AssetHelper import grails.core.GrailsApplication import grails.util.Environment +import org.grails.config.NavigableMap import javax.annotation.Resource import javax.servlet.http.HttpServletRequest @@ -109,8 +110,9 @@ class AssetProcessorService { } - String assetBaseUrl(final HttpServletRequest req, final UrlBase urlBase, final Map conf = grailsApplication.config.getProperty('grails.assets',Map,[:])) { - final String url = getConfigBaseUrl(req, conf) + String assetBaseUrl(final HttpServletRequest req, final UrlBase urlBase, final NavigableMap conf = grailsApplication.config.getProperty('grails.assets',Map,[:])) { + Map map = conf.toFlatConfig() + final String url = getConfigBaseUrl(req, map) if (url) { return url }