Merge branch '3.1.x' into 3.2.x

Author: graemerocher

grails-core/src/main/groovy/org/grails/compiler/ValidateableTypeCheckingExtension.groovy

@@ -57,7 +57,7 @@ class ValidateableTypeCheckingExtension extends TypeCheckingDSL {
         methodNotFound { ClassNode receiver, String name, ArgumentListExpression argList, ClassNode[] argTypes, MethodCall call ->
             def dynamicCall
             if(currentScope.constraintsClosureCode && currentScope.checkingConstraintsClosure) {
-                if(receiver.getField(name)) {
+                if(receiver.getField(name) || 'importFrom' == name) {
                     dynamicCall = makeDynamic (call)
                 }
             }

grails-test-suite-uber/src/test/groovy/grails/compiler/GrailsCompileStaticCompilationErrorsSpec.groovy

@@ -1,13 +1,11 @@
 package grails.compiler
-import grails.persistence.Entity
 
+import grails.persistence.Entity
 import org.codehaus.groovy.control.MultipleCompilationErrorsException
-
 import spock.lang.Ignore
 import spock.lang.Issue
 import spock.lang.Specification
 
-
 class GrailsCompileStaticCompilationErrorsSpec extends Specification {
 
     @Issue('GRAILS-11056')
@@ -469,6 +467,62 @@ class SomeService {
         e.message.contains 'Cannot find matching method java.lang.String#lastName()'
 
     }
+
+    @Issue('grails/grails-core#10157')
+    void 'Test constraints block which imports from a non-existent class'() {
+        given:
+        def gcl = new GroovyClassLoader()
+
+        when: 'a class marked with @GrailsCompileStatic imports constraints from a non-existent class'
+        gcl.parseClass('''
+package grails.compiler
+
+import grails.validation.Validateable
+
+@GrailsCompileStatic
+class SomeValidateableClassWithInvalidImport implements Validateable {
+    String name
+
+    static constraints = {
+        importFrom SomeNonExistentClass
+    }
+}
+''')
+        then: 'an error is thrown'
+        thrown(MultipleCompilationErrorsException)
+    }
+
+    @Issue('grails/grails-core#10157')
+    void 'Test constraints block which imports constraints'() {
+        given:
+        def gcl = new GroovyClassLoader()
+
+        when: 'a class marked with @GrailsCompileStatic imports constraints from a non-existent class'
+        def c = gcl.parseClass('''
+package grails.compiler
+
+import grails.validation.Validateable
+
+@GrailsCompileStatic
+class SomeValidateableClassWithValidImport implements Validateable {
+    String name
+
+    static constraints = {
+        importFrom SomeOtherValidateableClass
+    }
+}
+
+class SomeOtherValidateableClass implements Validateable {
+    String name
+    static constraints = {
+        name size: 3..15
+    }
+}
+''')
+
+        then: 'the constraints were properly imported'
+        gcl.loadClass('grails.compiler.SomeValidateableClassWithValidImport').constraintsMap['name'].getAppliedConstraint('size').range == 3..15
+    }
 }
 
 @Entity

grails-web-sitemesh/src/main/groovy/org/grails/web/sitemesh/GrailsContentBufferingResponse.java

@@ -56,6 +56,9 @@ public void setContentType(String contentType) {
         this.contentProcessor = contentProcessor;
         this.webAppContext = webAppContext;
         pageResponseWrapper = (GrailsPageResponseWrapper) getResponse();
+        if (response.getContentType() != null) {
+            webAppContext.setContentType(response.getContentType());
+        }
     }
 
     public HttpServletResponse getTargetResponse() {