Merge branch 'master' of ssh://llg00ana.uk.oracle.com:29418/jersey

Author: jerseyrobot

core-common/src/main/java/org/glassfish/jersey/internal/util/ReflectionHelper.java

@@ -905,9 +905,9 @@ public static boolean isGetter(final Method method) {
                 && Modifier.isPublic(method.getModifiers())) {
             final String methodName = method.getName();
 
-            if (methodName.startsWith("get")) {
+            if (methodName.startsWith("get") && methodName.length() > 3) {
                 return !void.class.equals(method.getReturnType());
-            } else if (methodName.startsWith("is")) {
+            } else if (methodName.startsWith("is") && methodName.length() > 2) {
                 return boolean.class.equals(method.getReturnType()) || Boolean.class.equals(method.getReturnType());
             }
         }

core-common/src/test/java/org/glassfish/jersey/internal/util/ReflectionHelperTest.java

@@ -46,6 +46,7 @@
 import java.security.PrivilegedAction;
 
 import org.junit.Test;
+
 import static org.hamcrest.CoreMatchers.is;
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -187,4 +188,47 @@ public void testGetFromStringStringMethodNegative() throws Exception {
 
         assertThat("Invalid valueOf method found.", methodPA.run(), nullValue());
     }
+
+    public static class IsGetterTester {
+
+        public int get() {
+            return 0;
+        }
+
+        public boolean is() {
+            return true;
+        }
+
+        public int getSomething() {
+            return 0;
+        }
+
+        public boolean isSomething() {
+            return true;
+        }
+    }
+
+    @Test
+    public void testIsGetterWithGetOnlyNegative() throws Exception {
+        assertThat("isGetter should have returned false for method named 'get'",
+                ReflectionHelper.isGetter(IsGetterTester.class.getMethod("get")), is(false));
+    }
+
+    @Test
+    public void testIsGetterWithIsOnlyNegative() throws Exception {
+        assertThat("isGetter should have returned false for method named 'is'",
+                ReflectionHelper.isGetter(IsGetterTester.class.getMethod("is")), is(false));
+    }
+
+    @Test
+    public void testIsGetterWithRealGetterPositive() throws Exception {
+        assertThat("isGetter should have returned true for method named 'getSomething'",
+                ReflectionHelper.isGetter(IsGetterTester.class.getMethod("getSomething")), is(true));
+    }
+
+    @Test
+    public void testIsGetterWithRealIsPositive() throws Exception {
+        assertThat("isGetter should have returned true for method named 'isSomething'",
+                ReflectionHelper.isGetter(IsGetterTester.class.getMethod("isSomething")), is(true));
+    }
 }