Finish changeover of groovy to java