Resolve java (7/8)

Resolve java