8242208: Use Method.getParameterCount where applicable

dreis2211 · cl4es · commit 08b90285b299 · 2020-04-06T13:46:09.000+02:00
Reviewed-by: redestad, chegar
diff --git a/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java b/src/java.base/share/classes/java/lang/invoke/MethodHandleProxies.java
@@ -276,13 +276,13 @@ private static boolean isObjectMethod(Method m) {
         switch (m.getName()) {
         case "toString":
             return (m.getReturnType() == String.class
-                    && m.getParameterTypes().length == 0);
+                    && m.getParameterCount() == 0);
         case "hashCode":
             return (m.getReturnType() == int.class
-                    && m.getParameterTypes().length == 0);
+                    && m.getParameterCount() == 0);
         case "equals":
             return (m.getReturnType() == boolean.class
-                    && m.getParameterTypes().length == 1
+                    && m.getParameterCount() == 1
                     && m.getParameterTypes()[0] == Object.class);
         }
         return false;
diff --git a/src/java.base/share/classes/java/lang/reflect/Executable.java b/src/java.base/share/classes/java/lang/reflect/Executable.java
@@ -378,7 +378,7 @@ private Parameter[] synthesizeAllParams() {
     private void verifyParameters(final Parameter[] parameters) {
         final int mask = Modifier.FINAL | Modifier.SYNTHETIC | Modifier.MANDATED;
 
-        if (getParameterTypes().length != parameters.length)
+        if (getParameterCount() != parameters.length)
             throw new MalformedParametersException("Wrong number of parameters in MethodParameters attribute");
 
         for (Parameter parameter : parameters) {
diff --git a/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java b/src/java.base/share/classes/sun/reflect/annotation/AnnotationType.java
@@ -121,7 +121,7 @@ public Method[] run() {
             if (Modifier.isPublic(method.getModifiers()) &&
                 Modifier.isAbstract(method.getModifiers()) &&
                 !method.isSynthetic()) {
-                if (method.getParameterTypes().length != 0) {
+                if (method.getParameterCount() != 0) {
                     throw new IllegalArgumentException(method + " has params");
                 }
                 String name = method.getName();

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ public Method[] run() {`
`121`	`121`	`if (Modifier.isPublic(method.getModifiers()) &&`
`122`	`122`	`Modifier.isAbstract(method.getModifiers()) &&`
`123`	`123`	`!method.isSynthetic()) {`
`124`		`- if (method.getParameterTypes().length != 0) {`
	`124`	`+ if (method.getParameterCount() != 0) {`
`125`	`125`	`throw new IllegalArgumentException(method + " has params");`
`126`	`126`	`}`
`127`	`127`	`String name = method.getName();`