Use Json.newObject() to create JSON object

Signed-off-by: Markus Jura <markus.jura@gmail.com>
Use Java Stream API

Signed-off-by: Markus Jura <markus.jura@gmail.com>