[Java] Refactoring and review WS client component handling