SONARJAVA-1604 Do not take static final field into account (#1166)

SonarSource · Jan 3, 2017 · 2703cce · 2703cce
1 parent 10302ab
commit 2703cce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/its/ruling/src/test/resources/sonar-server/squid-S3066.json b/its/ruling/src/test/resources/sonar-server/squid-S3066.json
diff --git a/java-checks/src/main/java/org/sonar/java/checks/EnumMutableFieldCheck.java b/java-checks/src/main/java/org/sonar/java/checks/EnumMutableFieldCheck.java
@@ -71,7 +71,8 @@ private static boolean isNotStaticOrFinal(ModifiersTree modifiersTree) {
   }
 
   private static boolean isMutableFinalMember(VariableTree variableTree) {
-    return ModifiersUtils.hasModifier(variableTree.modifiers(), Modifier.FINAL) && isMutableMember(variableTree);
+    ModifiersTree modifiersTree = variableTree.modifiers();
+    return !ModifiersUtils.hasModifier(modifiersTree, Modifier.STATIC) && ModifiersUtils.hasModifier(modifiersTree, Modifier.FINAL) && isMutableMember(variableTree);
   }
 
   private static boolean isMutableMember(VariableTree variableTree) {

diff --git a/java-checks/src/test/files/checks/EnumMutableFieldCheck.java b/java-checks/src/test/files/checks/EnumMutableFieldCheck.java
@@ -50,7 +50,8 @@ public enum Continent3 {
   private int landMass;
   public final String[] regions; // Noncompliant {{Lower the visibility of this field.}}
   public final java.util.Date date; // Noncompliant {{Lower the visibility of this field.}}
-
+  public static final String[] regions2;
+
   Continent3(int countryCount, int landMass) {
     this.countryCount = countryCount;
     this.landMass = landMass;