Sonarqube: Reduce visibility of final String[] and provide accessors

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/TruffleCextBuiltins.java

@@ -496,7 +496,7 @@ PString run(PString str) {
     @GenerateNodeFactory
     abstract static class RichCompareNode extends PythonBuiltinNode {
         protected static BinaryComparisonNode create(int op) {
-            return BinaryComparisonNode.create(SpecialMethodNames.COMPARE_OPNAMES[op], SpecialMethodNames.COMPARE_REVERSALS[op], SpecialMethodNames.COMPARE_OPSTRINGS[op]);
+            return BinaryComparisonNode.create(SpecialMethodNames.getCompareName(op), SpecialMethodNames.getCompareReversal(op), SpecialMethodNames.getCompareOpString(op));
         }
 
         @Specialization(guards = "op == 0")

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/CExtNodes.java

@@ -984,8 +984,8 @@ public boolean execute(@SuppressWarnings("unused") String opName, PythonNativeVo
         }
 
         public static int findOp(String specialMethodName) {
-            for (int i = 0; i < SpecialMethodNames.COMPARE_OPNAMES.length; i++) {
-                if (SpecialMethodNames.COMPARE_OPNAMES[i].equals(specialMethodName)) {
+            for (int i = 0; i < SpecialMethodNames.COMPARE_OP_COUNT; i++) {
+                if (SpecialMethodNames.getCompareName(i).equals(specialMethodName)) {
                     return i;
                 }
             }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/SpecialMethodNames.java

@@ -40,6 +40,8 @@
  */
 package com.oracle.graal.python.nodes;
 
+import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
+
 public abstract class SpecialMethodNames {
 
     public static final String __NEW__ = "__new__";
@@ -168,7 +170,20 @@ public abstract class SpecialMethodNames {
 
     // (tfel): The order of these matches the one in CPython, and thus is assumed to remain the same
     // in various places
-    public static final String[] COMPARE_OPSTRINGS = new String[]{"<", "<=", "==", "!=", ">", ">="};
-    public static final String[] COMPARE_OPNAMES = new String[]{__LT__, __LE__, __EQ__, __NE__, __GT__, __GE__};
-    public static final String[] COMPARE_REVERSALS = new String[]{__GT__, __GE__, __EQ__, __NE__, __GT__, __GE__};
+    @CompilationFinal(dimensions = 1) private static final String[] COMPARE_OPSTRINGS = new String[]{"<", "<=", "==", "!=", ">", ">="};
+    @CompilationFinal(dimensions = 1) private static final String[] COMPARE_OPNAMES = new String[]{__LT__, __LE__, __EQ__, __NE__, __GT__, __GE__};
+    @CompilationFinal(dimensions = 1) private static final String[] COMPARE_REVERSALS = new String[]{__GT__, __GE__, __EQ__, __NE__, __GT__, __GE__};
+    public static final int COMPARE_OP_COUNT = COMPARE_OPNAMES.length;
+
+    public static String getCompareOpString(int op) {
+        return COMPARE_OPSTRINGS[op];
+    }
+
+    public static String getCompareName(int op) {
+        return COMPARE_OPNAMES[op];
+    }
+
+    public static String getCompareReversal(int op) {
+        return COMPARE_REVERSALS[op];
+    }
 }