What problem does this code solve?
Sonarqube issues in JSONObject

Does the code still compile with Java6?
Yes

Risks
Low

Changes to the API?
No

Will this require a new release?
No

Should the documentation be updated?
No

Does it break the unit tests?
No

Was any code refactored in this commit?
Yes, the entire PR is a refactor. No functionality was changed.

Review status
APPROVED

Starting 3-day comment window