Update groovy monorepo to v3.0.10 (#12406)

* Update groovy monorepo to v3.0.10 * Fix Groovy Compile errors Co-authored-by: Renovate Bot <bot@renovateapp.com> Co-authored-by: Puneet Behl <behlp@objectcomputing.com>
grails · Mar 16, 2022 · 1cf1e96 · 1cf1e96
1 parent 32d0468
commit 1cf1e96
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -11,7 +11,7 @@ gdocEngineVersion=1.0.1
 gradleNexusPluginVersion=2.3.1
 gradleNexusStagingPluginVersion=0.12.0
 gradleSdkVendorVersion=1.2.1
-groovyVersion=3.0.7
+groovyVersion=3.0.10
 gspVersion=5.1.0
 h2.version=1.4.199
 h2Version=1.4.200

diff --git a/grails-bootstrap/src/main/groovy/org/grails/config/NavigableMap.groovy b/grails-bootstrap/src/main/groovy/org/grails/config/NavigableMap.groovy
@@ -103,7 +103,7 @@ class NavigableMap implements Map<String, Object>, Cloneable {
     }
 
     @Override
-    void putAll(Map<? extends String, ?> m) {
+    void putAll(Map<? extends String, ? extends Object> m) {
         delegateMap.putAll m
     }
 
@@ -369,19 +369,19 @@ class NavigableMap implements Map<String, Object>, Cloneable {
         currentMap
     }
 
-    public Map<String, Object> toFlatConfig() {
-        Map<String,Object> flatConfig = [:]
+    Map<String, Object> toFlatConfig() {
+        Map<String, Object> flatConfig = [:]
         flattenKeys(flatConfig, this, [], false)
         flatConfig
     }
 
-    public Properties toProperties() {
+    Properties toProperties() {
         Properties properties = new Properties()
-        flattenKeys((Map<String, Object>)properties, this, [], true)
+        flattenKeys((Map<Object, Object>) properties, this, [], true)
         properties
     }
 
-    private void flattenKeys(Map<String, Object> flatConfig, Map currentMap, List<String> path, boolean forceStrings) {
+    private void flattenKeys(Map<? extends Object, Object> flatConfig, Map currentMap, List<String> path, boolean forceStrings) {
         currentMap.each { key, value ->
             String stringKey = String.valueOf(key)
             if(value != null) {

diff --git a/grails-core/src/main/groovy/org/grails/config/NavigableMapConfig.java b/grails-core/src/main/groovy/org/grails/config/NavigableMapConfig.java
@@ -307,7 +307,7 @@ private <T> T convertValueIfNecessary(Object originalValue, Class<T> targetType,
                     return (T) originalValue;
                 }
             } else {
-                if (!(originalValue instanceof NavigableMap)) {
+                if (!(originalValue instanceof NavigableMap) || Map.class.isAssignableFrom(targetType)) {
                     try {
                         T value = conversionService.convert(originalValue, targetType);
                         return DefaultGroovyMethods.asBoolean(value) ? value : defaultValue;

diff --git a/...abinding/src/test/groovy/grails/databinding/SimpleDataBinderEnumValueConverterSpec.groovy b/...abinding/src/test/groovy/grails/databinding/SimpleDataBinderEnumValueConverterSpec.groovy
@@ -40,11 +40,11 @@ enum Color {
 
     String id
 
-    public Color(String id) {
+    Color(String id) {
         this.id = id
     }
 
-    public static getById(String id) {
+    static getById(String id) {
         Color.find{ it.id == id }
     }
 }

diff --git a/...in-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy b/...in-controllers/src/main/groovy/grails/artefact/controller/support/ResponseRenderer.groovy
@@ -118,7 +118,7 @@ trait ResponseRenderer extends WebAttributes {
      * @param closure The markup to render
      */
     @Generated
-    void render(Closure closure) {
+    void render(@DelegatesTo(strategy = Closure.DELEGATE_FIRST) Closure closure) {
         GrailsWebRequest webRequest = (GrailsWebRequest)RequestContextHolder.currentRequestAttributes()
         HttpServletResponse response = webRequest.currentResponse
 
@@ -134,7 +134,7 @@ trait ResponseRenderer extends WebAttributes {
      * @param closure The closure to render
      */
     @Generated
-    void render(Map argMap, Closure closure) {
+    void render(Map argMap, @DelegatesTo(strategy = Closure.DELEGATE_FIRST) Closure closure) {
         GrailsWebRequest webRequest = (GrailsWebRequest)RequestContextHolder.currentRequestAttributes()
         HttpServletResponse response = webRequest.currentResponse
         String explicitSiteMeshLayout = argMap[ARGUMENT_LAYOUT]?.toString() ?: null
@@ -152,7 +152,7 @@ trait ResponseRenderer extends WebAttributes {
         applySiteMeshLayout webRequest.currentRequest, false, explicitSiteMeshLayout
     }
 
-    private void renderJsonInternal(HttpServletResponse response, Closure callable) {
+    private void renderJsonInternal(HttpServletResponse response, @DelegatesTo(value = StreamingJsonBuilder.StreamingJsonDelegate.class, strategy = Closure.DELEGATE_FIRST) Closure callable) {
         response.setContentType(GrailsWebUtil.getContentType(MimeType.JSON.getName(), response.getCharacterEncoding() ?: "UTF-8"))
         def jsonBuilder = new StreamingJsonBuilder(response.writer)
         jsonBuilder.call callable
@@ -484,7 +484,7 @@ trait ResponseRenderer extends WebAttributes {
         return statusSet
     }
 
-    private void renderMarkupInternal(GrailsWebRequest webRequest, Closure closure, HttpServletResponse response) {
+    private void renderMarkupInternal(GrailsWebRequest webRequest, @DelegatesTo(strategy = Closure.DELEGATE_FIRST) Closure closure, HttpServletResponse response) {
         StreamingMarkupBuilder b = new StreamingMarkupBuilder()
         b.encoding = response.characterEncoding