Merge branch '3.1.x' of github.com:grails/grails-core into 3.1.x

Author: graemerocher

grails-plugin-validation/src/main/groovy/grails/validation/Validateable.groovy

@@ -78,19 +78,35 @@ trait Validateable {
         }
     }
 
-    boolean validate(Closure... adHocConstraintsClosures) {
+    boolean validate() {
+        validate null, null, null
+    }
+
+    boolean validate(Closure<?>... adHocConstraintsClosures) {
         validate(null, null, adHocConstraintsClosures)
     }
 
-    boolean validate(Map<String, Object> params, Closure... adHocConstraintsClosures) {
+    boolean validate(Map<String, Object> params) {
+        validate params, null
+    }
+
+    boolean validate(Map<String, Object> params, Closure<?>... adHocConstraintsClosures) {
         validate(null, params, adHocConstraintsClosures)
     }
 
-    boolean validate(List fieldsToValidate, Closure... adHocConstraintsClosures) {
+    boolean validate(List fieldsToValidate) {
+        validate fieldsToValidate, null, null
+    }
+
+    boolean validate(List fieldsToValidate, Closure<?>... adHocConstraintsClosures) {
         validate(fieldsToValidate, null, adHocConstraintsClosures)
     }
 
-    boolean validate(List fieldsToValidate, Map<String, Object> params, Closure... adHocConstraintsClosures) {
+    boolean validate(List fieldsToValidate, Map<String, Object> params) {
+        validate fieldsToValidate, params, null
+    }
+
+    boolean validate(List fieldsToValidate, Map<String, Object> params, Closure<?>... adHocConstraintsClosures) {
         beforeValidateHelper.invokeBeforeValidate(this, fieldsToValidate)
 
         boolean shouldInherit = Boolean.valueOf(params?.inherit?.toString() ?: 'true')

grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy

@@ -328,7 +328,7 @@ abstract class AbstractProfile implements Profile {
         return parentNames.collect() { String name ->
             def parent = profileRepository.getProfile(name)
             if(parent == null) {
-                throw new IllegalStateException("Profile [$name] declares and invalid dependency on parent profile [$name]")
+                throw new IllegalStateException("Profile [$name] declares an invalid dependency on parent profile [$name]")
             }
             return parent
         }

grails-test-suite-uber/src/test/groovy/grails/validation/SomeJavaClass.java

@@ -0,0 +1,7 @@
+package grails.validation;
+
+
+// https://github.com/grails/grails-core/issues/9774
+public class SomeJavaClass {
+    MyValidateable someValidateable;
+}

grails-test-suite-uber/src/test/groovy/grails/validation/ValidateableMockSpec.groovy

@@ -0,0 +1,29 @@
+package grails.validation
+
+import spock.lang.Issue
+import spock.lang.Specification
+
+class ValidateableMockSpec extends Specification {
+
+    @Issue('grails/grails-core#9761')
+    void 'ensure command is mocked properly'(){
+        given:
+        SomeCommand command = GroovyMock()
+        1 * command.validate() >> true
+        1 * command.validate() >> false
+        1 * command.validate() >> true
+        1 * command.validate(_ as List) >> true
+        1 * command.validate(_ as Map) >> false
+        1 * command.validate(_ as List, _ as Map) >> true
+
+        expect:
+        command.validate()
+        !command.validate()
+        command.validate()
+        command.validate([])
+        !command.validate([:])
+        command.validate([], [:])
+    }
+}
+
+class SomeCommand implements Validateable {}

grails-test-suite-uber/src/test/groovy/grails/validation/ValidateableTraitSpec.groovy

@@ -278,6 +278,24 @@ class ValidateableTraitSpec extends Specification {
         validateable.errors['superName']?.code == 'nullable'
         validateable.errors['subName']?.code == 'nullable'
     }
+
+    @Issue('grails/grails-core#9774')
+    void 'test a Java class which references a Groovy class marked with @Validateable'() {
+        given:
+        def obj = new SomeJavaClass()
+
+        when:
+        obj.someValidateable = new MyValidateable(name: 'jeff')
+
+        then:
+        !obj.someValidateable.validate(['name'])
+
+        when:
+        obj.someValidateable = new MyValidateable(name: 'Jeff')
+
+        then:
+        obj.someValidateable.validate(['name'])
+    }
 }
 
 class MyValidateable implements Validateable {