Refactor Job Search Service : remove null check and use Java 8 Optional instead