Fix User.toJson() json issue
Fix checkstyle issues