Merge branch '3.1.x' into 3.2.x

Author: jeffscottbrown

grails-core/src/main/groovy/grails/util/GrailsClassUtils.java

@@ -734,11 +734,50 @@ public static boolean isGetter(String name, Class<?>[] args) {
 
         if (name.startsWith("get")) {
             name = name.substring(3);
-            if (name.length() > 0 && Character.isUpperCase(name.charAt(0))) return true;
+            if (isPropertyMethodSuffix(name)) return true;
         }
         else if (name.startsWith("is")) {
             name = name.substring(2);
-            if (name.length() > 0 && Character.isUpperCase(name.charAt(0))) return true;
+            if (isPropertyMethodSuffix(name)) return true;
+        }
+        return false;
+    }
+
+    /**
+     * This method is used when interrogating a method name to determine if the
+     * method represents a property getter.  For example, if a method is named
+     * <code>getSomeProperty</code>, the value <code>"SomeProperty"</code> could
+     * be passed to this method to determine that the method should be considered
+     * a property getter.  Examples of suffixes that would be considered property
+     * getters:
+     * <ul>
+     *     <li>SomeProperty</li>
+     *     <li>Word</li>
+     *     <li>aProperty</li>
+     *     <li>S</li>
+     * </ul>
+     *
+     * Example sof suffixes that would not be considered property getters:
+     * <ul>
+     *     <li>someProperty</li>
+     *     <li>word</li>
+     *     <li>s</li>
+     * </ul>
+     * @param suffix The suffix to inspect
+     * @return true if suffix indicates a property name
+     */
+    protected static boolean isPropertyMethodSuffix(String suffix) {
+        if (suffix.length() > 0) {
+            if(suffix.length() == 1) {
+                if(Character.isUpperCase(suffix.charAt(0))) {
+                    return true;
+                }
+            } else {
+                if(Character.isUpperCase(suffix.charAt(0)) ||
+                   (Character.isUpperCase(suffix.charAt(1)) && Character.isLowerCase(suffix.charAt(0)))) {
+                    return true;
+                }
+            }
         }
         return false;
     }

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

@@ -39,7 +39,7 @@ class DomainClassValidationSpec extends Specification {
 
     void 'Test validate can be invoked in a unit test with no special configuration'() {
         when: 'an object is valid'
-        def domainClass = new MyDomainClass(name: 'Kirk', age: 47, town: 'STL')
+        def domainClass = new MyDomainClass(name: 'Kirk', age: 47, town: 'STL', aString: 'Woot!')
 
         then: 'validate() returns true and there are no errors'
         domainClass.validate()
@@ -85,6 +85,7 @@ class DomainClassValidationSpec extends Specification {
         domainClass.errors.getFieldError('age').rejectedValue == 'type mismatched'
 
         when:
+        domainClass.aString = 'Woot!'
         domainClass.name = 'lower case'
         domainClass.age = -1  // invalid value
         domainClass.town = ''
@@ -111,6 +112,7 @@ class DomainClassValidationSpec extends Specification {
         domainClass.errors.getFieldError('age').rejectedValue == 'any validation failure'
 
         when:
+        domainClass.aString = 'Woot!'
         domainClass.name = 'lower case'
         domainClass.age = -1  // invalid value
         domainClass.town = ''
@@ -137,17 +139,19 @@ class DomainClassValidationSpec extends Specification {
         def constraints = getAssociatedDomainClassFromApplication(new MyDomainClass()).getConstrainedProperties()
 
         then:
-        constraints.size() == 4
+        constraints.size() == 5
         constraints.containsKey 'name'
         constraints.containsKey 'town'
         constraints.containsKey 'age'
         constraints.containsKey 'someProperty'
+        constraints.containsKey 'aString'
 
         and:
         constraints.name.appliedConstraints.size() == 2
         constraints.age.appliedConstraints.size() == 2
         constraints.town.appliedConstraints.size() == 1
         constraints.someProperty.appliedConstraints.size() == 1
+        constraints.aString.appliedConstraints.size() == 1
 
         and:
         constraints.name.hasAppliedConstraint 'matches'
@@ -156,12 +160,14 @@ class DomainClassValidationSpec extends Specification {
         constraints.age.hasAppliedConstraint 'nullable'
         constraints.town.hasAppliedConstraint 'nullable'
         constraints.someProperty.hasAppliedConstraint 'nullable'
+        constraints.aString.hasAppliedConstraint 'nullable'
 
         and: 'implicit defaultNullable is nullable:false'
         !constraints.name.nullable
         !constraints.age.nullable
         !constraints.town.nullable
         !constraints.someProperty.nullable
+        !constraints.aString.nullable
     }
 
     @Ignore('defaultNullable is not supported yet')
@@ -307,6 +313,7 @@ class MyDomainClass {
     String name
     Integer age
     String town
+    String aString
     private String _someProperty = 'default value'
 
     void setSomeOtherProperty(String s) {}

grails-test-suite-uber/src/test/groovy/org/grails/commons/GrailsClassUtilsTests.java

@@ -16,6 +16,7 @@
 
 import grails.util.GrailsClassUtils;
 import junit.framework.TestCase;
+import spock.lang.Issue;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
@@ -311,6 +312,14 @@ public void testIsPropertyGetter() throws Exception {
         assertFalse(GrailsClassUtils.isPropertyGetter(ClassHavingPropertyGetters.class.getDeclaredMethod("getFilename", String.class)));
         assertFalse(GrailsClassUtils.isPropertyGetter(ClassHavingPropertyGetters.class.getDeclaredMethod("getTitle", null)));
     }
+
+    @Issue("https://github.com/grails/grails-core/issues/10343")
+    public void testPropertiesBeginningWithSingleLowerCaseLetter() throws Exception {
+        assertTrue(GrailsClassUtils.isPropertyGetter(SomeGroovyClass.class.getDeclaredMethod("getaString", null)));
+        assertTrue(GrailsClassUtils.isPropertyGetter(SomeGroovyClass.class.getDeclaredMethod("isaBoolean", null)));
+        assertTrue(GrailsClassUtils.isPropertyGetter(SomeGroovyClass.class.getDeclaredMethod("getS", null)));
+        assertTrue(GrailsClassUtils.isPropertyGetter(SomeGroovyClass.class.getDeclaredMethod("isB", null)));
+    }
 }
 
 class ClassWithStaticFieldAndStaticPropertyWithSameName {

grails-test-suite-uber/src/test/groovy/org/grails/commons/SomeGroovyClass.groovy

@@ -0,0 +1,14 @@
+package org.grails.commons
+
+class SomeGroovyClass {
+    String s
+    String aString
+
+    boolean isaBoolean() {
+        true
+    }
+
+    boolean isB() {
+        true
+    }
+}