Address java (8/22)

Address java