stleary#984 extract method for annotation value check

Simulant87 · Simulant87 · commit 5063d314a553 · 2025-06-25T23:08:01.000+02:00
diff --git a/src/main/java/org/json/JSONObject.java b/src/main/java/org/json/JSONObject.java
@@ -1828,7 +1828,7 @@ private static String getKeyNameFromMethod(Method method) {
             }
         }
         JSONPropertyName annotation = getAnnotation(method, JSONPropertyName.class);
-        if (annotation != null && annotation.value() != null && !annotation.value().isEmpty()) {
+        if (annotationValueNotEmpty(annotation)) {
             return annotation.value();
         }
         String key;
@@ -1854,6 +1854,15 @@ private static String getKeyNameFromMethod(Method method) {
         return key;
     }
 
+    /**
+     * checks if the annotation is not null and the {@link JSONPropertyName#value()} is not null and is not empty.
+     * @param annotation the annotation to check
+     * @return true if the annotation and the value is not null and not empty, false otherwise.
+     */
+    private static boolean annotationValueNotEmpty(JSONPropertyName annotation) {
+        return annotation != null && annotation.value() != null && !annotation.value().isEmpty();
+    }
+
     /**
      * Checks if the method is valid for the {@link #populateMap(Object, Set, JSONParserConfiguration)} use case
      * @param method the Method to check

Original file line number	Diff line number	Diff line change
`@@ -1828,7 +1828,7 @@ private static String getKeyNameFromMethod(Method method) {`
`1828`	`1828`	`}`
`1829`	`1829`	`}`
`1830`	`1830`	`JSONPropertyName annotation = getAnnotation(method, JSONPropertyName.class);`
`1831`		`- if (annotation != null && annotation.value() != null && !annotation.value().isEmpty()) {`
	`1831`	`+ if (annotationValueNotEmpty(annotation)) {`
`1832`	`1832`	`return annotation.value();`
`1833`	`1833`	`}`
`1834`	`1834`	`String key;`
`@@ -1854,6 +1854,15 @@ private static String getKeyNameFromMethod(Method method) {`
`1854`	`1854`	`return key;`
`1855`	`1855`	`}`
`1856`	`1856`
	`1857`	`+ /**`
	`1858`	`+ * checks if the annotation is not null and the {@link JSONPropertyName#value()} is not null and is not empty.`
	`1859`	`+ * @param annotation the annotation to check`
	`1860`	`+ * @return true if the annotation and the value is not null and not empty, false otherwise.`
	`1861`	`+ */`
	`1862`	`+ private static boolean annotationValueNotEmpty(JSONPropertyName annotation) {`
	`1863`	`+ return annotation != null && annotation.value() != null && !annotation.value().isEmpty();`
	`1864`	`+ }`
	`1865`	`+`
`1857`	`1866`	`/**`
`1858`	`1867`	`* Checks if the method is valid for the {@link #populateMap(Object, Set, JSONParserConfiguration)} use case`
`1859`	`1868`	`* @param method the Method to check`