Sonarqube: Reduce visibility of mutable members

Author: timfel

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/MROMergeState.java

@@ -27,14 +27,18 @@
 
 class MROMergeState {
 
+    MROMergeState(PythonAbstractClass[] mro) {
+        this.mro = mro;
+    }
+
     /** The mro of the base type we're representing. */
-    public PythonAbstractClass[] mro;
+    private final PythonAbstractClass[] mro;
 
     /**
      * The index of the next item to be merged from mro, or mro.length if this base has been
      * completely merged.
      */
-    public int next;
+    private int next;
 
     public boolean isMerged() {
         return mro.length == next;
@@ -64,5 +68,4 @@ public boolean pastnextContains(PythonAbstractClass candidate) {
         }
         return false;
     }
-
 }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/type/TypeNodes.java

@@ -719,12 +719,10 @@ private static PythonAbstractClass[] computeMethodResolutionOrder(PythonAbstract
                 MROMergeState[] toMerge = new MROMergeState[baseClasses.length + 1];
 
                 for (int i = 0; i < baseClasses.length; i++) {
-                    toMerge[i] = new MROMergeState();
-                    toMerge[i].mro = GetMroNode.getUncached().execute(baseClasses[i]);
+                    toMerge[i] = new MROMergeState(GetMroNode.getUncached().execute(baseClasses[i]));
                 }
 
-                toMerge[baseClasses.length] = new MROMergeState();
-                toMerge[baseClasses.length].mro = baseClasses;
+                toMerge[baseClasses.length] = new MROMergeState(baseClasses);
                 ArrayList<PythonAbstractClass> mro = new ArrayList<>();
                 mro.add(cls);
                 currentMRO = mergeMROs(toMerge, mro);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/zipimporter/PZipImporter.java

@@ -75,22 +75,22 @@ private static enum EntryType {
 
     private static class SearchOrderEntry {
 
-        public String suffix;
-        public EnumSet<EntryType> type;
+        String suffix;
+        EnumSet<EntryType> type;
 
-        public SearchOrderEntry(String suffix, EnumSet<EntryType> type) {
+        SearchOrderEntry(String suffix, EnumSet<EntryType> type) {
             this.suffix = suffix;
             this.type = type;
         }
     }
 
     protected static class ModuleCodeData {
 
-        public String code;
-        public boolean isPackage;
-        public String path;
+        String code;
+        boolean isPackage;
+        String path;
 
-        public ModuleCodeData(String code, boolean isPackage, String path) {
+        ModuleCodeData(String code, boolean isPackage, String path) {
             this.code = code;
             this.isPackage = isPackage;
             this.path = path;

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/parser/ArgListCompiler.java

@@ -45,8 +45,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.antlr.v4.runtime.ParserRuleContext;
-
 import com.oracle.graal.python.parser.antlr.Python3BaseVisitor;
 import com.oracle.graal.python.parser.antlr.Python3Parser.DefparameterContext;
 import com.oracle.graal.python.parser.antlr.Python3Parser.KwargsparameterContext;
@@ -56,8 +54,10 @@
 import com.oracle.graal.python.parser.antlr.Python3Parser.VsplatparameterContext;
 import com.oracle.graal.python.runtime.PythonParser.ParserErrorCallback;
 
+import org.antlr.v4.runtime.ParserRuleContext;
+
 public class ArgListCompiler<T> extends Python3BaseVisitor<T> {
-    public boolean arglist, keywordlist;
+    private boolean arglist, keywordlist;
     public final List<String> names;
     public final List<String> fpnames;
     public final List<ParserRuleContext> init_code;