SONARJAVA-193 Update the rule's behavior according to feedback