improved annotation search performance

Thomas Gress · Thomas Gress · commit 23ac2e7bcaf6 · 2023-12-29T12:28:24.000+01:00
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
@@ -1865,6 +1865,10 @@ private static <A extends Annotation> A getAnnotation(final Method m, final Clas
             }
         }
 
+        //If the superclass is Object, no annotations will be found any more
+        if (c.getSuperclass().equals(Object.class))
+            return null;
+
         try {
             return getAnnotation(
                     c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()),
@@ -1919,6 +1923,10 @@ private static int getAnnotationDepth(final Method m, final Class<? extends Anno
             }
         }
 
+        //If the superclass is Object, no annotations will be found any more
+        if (c.getSuperclass().equals(Object.class))
+            return -1;
+
         try {
             int d = getAnnotationDepth(
                     c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()),

Original file line number	Diff line number	Diff line change
`@@ -1865,6 +1865,10 @@ private static <A extends Annotation> A getAnnotation(final Method m, final Clas`
`1865`	`1865`	`}`
`1866`	`1866`	`}`
`1867`	`1867`
	`1868`	`+ //If the superclass is Object, no annotations will be found any more`
	`1869`	`+ if (c.getSuperclass().equals(Object.class))`
	`1870`	`+ return null;`
	`1871`	`+`
`1868`	`1872`	`try {`
`1869`	`1873`	`return getAnnotation(`
`1870`	`1874`	`c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()),`
`@@ -1919,6 +1923,10 @@ private static int getAnnotationDepth(final Method m, final Class<? extends Anno`
`1919`	`1923`	`}`
`1920`	`1924`	`}`
`1921`	`1925`
	`1926`	`+ //If the superclass is Object, no annotations will be found any more`
	`1927`	`+ if (c.getSuperclass().equals(Object.class))`
	`1928`	`+ return -1;`
	`1929`	`+`
`1922`	`1930`	`try {`
`1923`	`1931`	`int d = getAnnotationDepth(`
`1924`	`1932`	`c.getSuperclass().getMethod(m.getName(), m.getParameterTypes()),`