Previously the JSON modules didn't use Spring's Assert. This commit changes the assertions to use Spring's Assert and does some minor restructuring. Issue gh-3736
Previously the JSON modules didn't use Spring's Assert. This commit changes the assertions to use Spring's Assert and does some minor restructuring. Issue gh-3736