Move to using javax.json to generate json values