Fix some sonar issue in rest interface