Merge "Sonar Fix: HttpMethod.java"