SONARJAVA-5657 S6541: use NODV metric instead of NOAV

Author: asya-vorobeva

java-frontend/src/main/java/org/sonar/java/ast/visitors/NumberOfDefinedVariablesVisitor.java

@@ -28,7 +28,7 @@ public void visitVariable(VariableTree tree) {
     numberOfDefinedVariables++;
   }
 
-  public int getNumberOfAccessedVariables(MethodTree tree) {
+  public int getNumberOfDefinedVariables(MethodTree tree) {
     numberOfDefinedVariables = 0;
     scan(tree);
     return numberOfDefinedVariables;

java-frontend/src/main/java/org/sonar/java/metrics/MetricsComputer.java

@@ -57,7 +57,7 @@ public CognitiveComplexityVisitor.Result getMethodComplexity(MethodTree tree) {
   NumberOfDefinedVariablesVisitor methodBodyVisitor = new NumberOfDefinedVariablesVisitor();
 
   public int getNumberOfDefinedVariables(MethodTree tree) {
-    return methodNumberOfDefinedVariables.computeIfAbsent(tree.hashCode(), k -> methodBodyVisitor.getNumberOfAccessedVariables(tree));
+    return methodNumberOfDefinedVariables.computeIfAbsent(tree.hashCode(), k -> methodBodyVisitor.getNumberOfDefinedVariables(tree));
   }
 
   LinesOfCodeVisitor linesOfCodeVisitor = new LinesOfCodeVisitor();

java-frontend/src/test/java/org/sonar/java/ast/visitors/NumberOfDefinedVariablesVisitorTest.java

@@ -32,7 +32,7 @@ void zeroVariables() {
       " private Object foo(){ }" +
       "}");
     MethodTree methodTree = (MethodTree) ((ClassTree) cut.types().get(0)).members().get(0);
-    int numberOfVariables = new NumberOfDefinedVariablesVisitor().getNumberOfAccessedVariables(methodTree);
+    int numberOfVariables = new NumberOfDefinedVariablesVisitor().getNumberOfDefinedVariables(methodTree);
     assertThat(numberOfVariables).isZero();
   }
 
@@ -45,7 +45,7 @@ void threeVariables() {
       + "}" +
       "}");
     MethodTree methodTree = (MethodTree) ((ClassTree) cut.types().get(0)).members().get(0);
-    int numberOfVariables = new NumberOfDefinedVariablesVisitor().getNumberOfAccessedVariables(methodTree);
+    int numberOfVariables = new NumberOfDefinedVariablesVisitor().getNumberOfDefinedVariables(methodTree);
     assertThat(numberOfVariables).isEqualTo(3);
   }
 
@@ -60,7 +60,7 @@ void multipleAccessesOnSameVariableDoNotCount() {
       + "}" +
       "}");
     MethodTree methodTree = (MethodTree) ((ClassTree) cut.types().get(0)).members().get(0);
-    int numberOfVariables = new NumberOfDefinedVariablesVisitor().getNumberOfAccessedVariables(methodTree);
+    int numberOfVariables = new NumberOfDefinedVariablesVisitor().getNumberOfDefinedVariables(methodTree);
     assertThat(numberOfVariables).isEqualTo(2);
   }