Merge "Sonar Fix- URIParser.java"