Version that dumps correct java data

Signed-off-by: Thomas Bachman <tbachman@yahoo.com>
Fixed formatting and builder bug.

Signed-off-by: Thomas Bachman <tbachman@yahoo.com>