Issue #1135 - Avoid allocations from Method.getParameterTypes() if po…

…ssible Signed-off-by: dreis2211 <christoph.dreis@freenet.de> (cherry picked from commit 16334c1)
jetty · Nov 29, 2016 · 9b0f6b1 · 9b0f6b1
1 parent dd76ed2
commit 9b0f6b1
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/...notations/src/main/java/org/eclipse/jetty/annotations/PostConstructAnnotationHandler.java b/...notations/src/main/java/org/eclipse/jetty/annotations/PostConstructAnnotationHandler.java
@@ -52,7 +52,7 @@ public void doHandle(Class clazz)
                 Method m = (Method)methods[i];
                 if (m.isAnnotationPresent(PostConstruct.class))
                 {
-                    if (m.getParameterTypes().length != 0)
+                    if (m.getParameterCount() != 0)
                         throw new IllegalStateException(m+" has parameters");
                     if (m.getReturnType() != Void.TYPE)
                         throw new IllegalStateException(m+" is not void");

diff --git a/...-annotations/src/main/java/org/eclipse/jetty/annotations/PreDestroyAnnotationHandler.java b/...-annotations/src/main/java/org/eclipse/jetty/annotations/PreDestroyAnnotationHandler.java
@@ -51,7 +51,7 @@ public void doHandle(Class clazz)
                 Method m = (Method)methods[i];
                 if (m.isAnnotationPresent(PreDestroy.class))
                 {
-                    if (m.getParameterTypes().length != 0)
+                    if (m.getParameterCount() != 0)
                         throw new IllegalStateException(m+" has parameters");
                     if (m.getReturnType() != Void.TYPE)
                         throw new IllegalStateException(m+" is not void");

diff --git a/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java b/jetty-annotations/src/main/java/org/eclipse/jetty/annotations/ResourceAnnotationHandler.java
@@ -257,7 +257,7 @@ public void handleMethod(Class<?> clazz, Method method)
                 return;
             }
 
-            if (method.getParameterTypes().length != 1)
+            if (method.getParameterCount() != 1)
             {
                 LOG.warn("Skipping Resource annotation on "+clazz.getName()+"."+method.getName()+": invalid java bean, not single argument to method");
                 return;

diff --git a/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java b/jetty-jmx/src/main/java/org/eclipse/jetty/jmx/ObjectMBean.java
@@ -663,7 +663,7 @@ public MBeanAttributeInfo defineAttribute(Method method, ManagedAttribute attrib
                 {
 
                     // look for a declared setter
-                    if (methods[m].getName().equals(declaredSetter) && methods[m].getParameterTypes().length == 1)
+                    if (methods[m].getName().equals(declaredSetter) && methods[m].getParameterCount() == 1)
                     {
                         if (setter != null)
                         {
@@ -682,7 +682,7 @@ public MBeanAttributeInfo defineAttribute(Method method, ManagedAttribute attrib
                 }
 
                 // look for a setter
-                if ( methods[m].getName().equals("set" + uName) && methods[m].getParameterTypes().length == 1)
+                if ( methods[m].getName().equals("set" + uName) && methods[m].getParameterCount() == 1)
                 {
                     if (setter != null)
                     {

diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONObjectConvertor.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONObjectConvertor.java
@@ -80,7 +80,7 @@ public void toJSON(Object obj, Output out)
             {
                 Method m=methods[i];
                 if (!Modifier.isStatic(m.getModifiers()) &&  
-                        m.getParameterTypes().length==0 && 
+                        m.getParameterCount()==0 &&
                         m.getReturnType()!=null &&
                         m.getDeclaringClass()!=Object.class)
                 {

diff --git a/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java b/jetty-util-ajax/src/main/java/org/eclipse/jetty/util/ajax/JSONPojoConvertor.java
@@ -116,7 +116,7 @@ protected void init()
             if (!Modifier.isStatic(m.getModifiers()) && m.getDeclaringClass()!=Object.class)
             {
                 String name=m.getName();
-                switch(m.getParameterTypes().length)
+                switch(m.getParameterCount())
                 {
                     case 0:
 

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/IntrospectionUtil.java b/jetty-util/src/main/java/org/eclipse/jetty/util/IntrospectionUtil.java
@@ -44,7 +44,7 @@ public static boolean isJavaBeanCompliantSetter (Method method)
         if (!method.getName().startsWith("set"))
             return false;
 
-        if (method.getParameterTypes().length != 1)
+        if (method.getParameterCount() != 1)
             return false;
 
         return true;

diff --git a/jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java b/jetty-util/src/main/java/org/eclipse/jetty/util/TypeUtil.java
@@ -511,7 +511,7 @@ public static Object call(Class<?> oClass, String methodName, Object obj, Object
         {
             if (!method.getName().equals(methodName))
                 continue;            
-            if (method.getParameterTypes().length != arg.length)
+            if (method.getParameterCount() != arg.length)
                 continue;
             if (Modifier.isStatic(method.getModifiers()) != (obj == null))
                 continue;
@@ -535,7 +535,7 @@ public static Object call(Class<?> oClass, String methodName, Object obj, Object
         {
             if (!method.getName().equals(methodName))
                 continue;            
-            if (method.getParameterTypes().length != arg.length+1)
+            if (method.getParameterCount() != arg.length+1)
                 continue;
             if (!method.getParameterTypes()[arg.length].isArray())
                 continue;
@@ -569,10 +569,10 @@ public static Object construct(Class<?> klass, Object[] arguments) throws Invoca
             if (arguments == null)
             {
                 // null arguments in .newInstance() is allowed
-                if (constructor.getParameterTypes().length != 0)
+                if (constructor.getParameterCount() != 0)
                     continue;
             }
-            else if (constructor.getParameterTypes().length != arguments.length)
+            else if (constructor.getParameterCount() != arguments.length)
                 continue;
 
             try
@@ -597,10 +597,10 @@ public static Object construct(Class<?> klass, Object[] arguments, Map<String, O
             if (arguments == null)
             {
                 // null arguments in .newInstance() is allowed
-                if (constructor.getParameterTypes().length != 0)
+                if (constructor.getParameterCount() != 0)
                     continue;
             }
-            else if (constructor.getParameterTypes().length != arguments.length)
+            else if (constructor.getParameterCount() != arguments.length)
                 continue;
 
             try