Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-02 19:15:27 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #990 from Simulant87/984-refactor-cognitive-complexity-populateMap

Browse Source 
Refactor JSONObject populateMap() per SonarQube
This commit is contained in:
Sean Leary 2025-07-01 07:13:18 -05:00 committed by GitHub
commit 197afddbfb
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 67 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
src/main/java/org/json/JSONObject.java
View File

@ -1780,46 +1780,30 @@ public class JSONObject {
Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods(); Method[] methods = includeSuperClass ? klass.getMethods() : klass.getDeclaredMethods();
for (final Method method : methods) { for (final Method method : methods) {
final int modifiers = method.getModifiers(); final String key = getKeyNameFromMethod(method);
if (Modifier.isPublic(modifiers) if (key != null && !key.isEmpty()) {
&& !Modifier.isStatic(modifiers) try {
&& method.getParameterTypes().length == 0 final Object result = method.invoke(bean);
&& !method.isBridge() if (result != null || jsonParserConfiguration.isUseNativeNulls()) {
&& method.getReturnType() != Void.TYPE // check cyclic dependency and throw error if needed
&& isValidMethodName(method.getName())) { // the wrap and populateMap combination method is
final String key = getKeyNameFromMethod(method); // itself DFS recursive
if (key != null && !key.isEmpty()) { if (objectsRecord.contains(result)) {
try { throw recursivelyDefinedObjectException(key);
final Object result = method.invoke(bean);
if (result != null || jsonParserConfiguration.isUseNativeNulls()) {
// check cyclic dependency and throw error if needed
// the wrap and populateMap combination method is
// itself DFS recursive
if (objectsRecord.contains(result)) {
throw recursivelyDefinedObjectException(key);
}
objectsRecord.add(result);
testValidity(result);
this.map.put(key, wrap(result, objectsRecord));
objectsRecord.remove(result);
// we don't use the result anywhere outside of wrap
// if it's a resource we should be sure to close it
// after calling toString
if (result instanceof Closeable) {
try {
((Closeable) result).close();
} catch (IOException ignore) {
}
}
} }
} catch (IllegalAccessException ignore) {
} catch (IllegalArgumentException ignore) { objectsRecord.add(result);
} catch (InvocationTargetException ignore) {
testValidity(result);
this.map.put(key, wrap(result, objectsRecord));
objectsRecord.remove(result);
closeClosable(result);
} }
} catch (IllegalAccessException ignore) {
} catch (IllegalArgumentException ignore) {
} catch (InvocationTargetException ignore) {
} }
} }
} }
@ -1830,6 +1814,10 @@ public class JSONObject {
} }
private static String getKeyNameFromMethod(Method method) { private static String getKeyNameFromMethod(Method method) {
if (!isValidMethod(method)) {
return null;
}
final int ignoreDepth = getAnnotationDepth(method, JSONPropertyIgnore.class); final int ignoreDepth = getAnnotationDepth(method, JSONPropertyIgnore.class);
if (ignoreDepth > 0) { if (ignoreDepth > 0) {
final int forcedNameDepth = getAnnotationDepth(method, JSONPropertyName.class); final int forcedNameDepth = getAnnotationDepth(method, JSONPropertyName.class);
@ -1840,7 +1828,7 @@ public class JSONObject {
} }
} }
JSONPropertyName annotation = getAnnotation(method, JSONPropertyName.class); JSONPropertyName annotation = getAnnotation(method, JSONPropertyName.class);
if (annotation != null && annotation.value() != null && !annotation.value().isEmpty()) { if (annotationValueNotEmpty(annotation)) {
return annotation.value(); return annotation.value();
} }
String key; String key;
@ -1866,6 +1854,46 @@ public class JSONObject {
return key; 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
* @return true, if valid, false otherwise.
*/
private static boolean isValidMethod(Method method) {
final int modifiers = method.getModifiers();
return Modifier.isPublic(modifiers)
&& !Modifier.isStatic(modifiers)
&& method.getParameterTypes().length == 0
&& !method.isBridge()
&& method.getReturnType() != Void.TYPE
&& isValidMethodName(method.getName());
}
/**
* calls {@link Closeable#close()} on the input, if it is an instance of Closable.
* @param input the input to close, if possible.
*/
private static void closeClosable(Object input) {
// we don't use the result anywhere outside of wrap
// if it's a resource we should be sure to close it
// after calling toString
if (input instanceof Closeable) {
try {
((Closeable) input).close();
} catch (IOException ignore) {
}
}
}
/** /**
* Searches the class hierarchy to see if the method or it's super * Searches the class hierarchy to see if the method or it's super
* implementations and interfaces has the annotation. * implementations and interfaces has the annotation.