Merge "OAUTHService.java-sonar fix"