Merge "fixed sonar issues in RestServiceImpl.java"