Make unsafe list methods non-public

--
MOS_MIGRATED_REVID=110838816

4 files changed, 5 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
index d94d10e217..8c3ec362ba 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/EvalUtils.java
@@ -384,7 +384,7 @@ public final class EvalUtils {
     if (o instanceof Collection) {
       return (Collection<?>) o;
     } else if (o instanceof SkylarkList) {
-      return ((SkylarkList) o).getList();
+      return ((SkylarkList) o).getImmutableList();
     } else if (o instanceof Map) {
       // For dictionaries we iterate through the keys only
       // For determinism, we sort the keys.
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java b/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
index 50d85a9067..b6405f6ade 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/MethodLibrary.java
@@ -896,7 +896,7 @@ public class MethodLibrary {
     @SuppressWarnings("unused")
     public String invoke(String self, SkylarkList args, Map<String, Object> kwargs, Location loc)
         throws ConversionException, EvalException {
-      return new FormatParser(loc).format(self, args.getList(), kwargs);
+      return new FormatParser(loc).format(self, args.getImmutableList(), kwargs);
     }
   };
 
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
index 1f88c4b0e5..5c66f81dd1 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/SkylarkList.java
@@ -41,8 +41,7 @@ public abstract class SkylarkList implements Iterable<Object>, SkylarkValue {
    * Returns the List object underlying this SkylarkList.
    * Mutating it (if mutable) will actually mutate the contents of the list.
    */
-  // TODO(bazel-team): make this public no more.
-  public abstract List<Object> getList();
+  protected abstract List<Object> getList();
 
   /**
    * Returns an ImmutableList object with the current underlying contents of this SkylarkList.
@@ -56,7 +55,7 @@ public abstract class SkylarkList implements Iterable<Object>, SkylarkValue {
    */
   // TODO(bazel-team): move GlobList out of Skylark, into an extension,
   // and maybe get rid of this method?
-  public abstract List<Object> getContents();
+  protected abstract List<Object> getContents();
 
   /**
    * Returns true if this list is a tuple.
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Type.java b/src/main/java/com/google/devtools/build/lib/syntax/Type.java
index 342c9006e1..e543315251 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Type.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Type.java
@@ -618,7 +618,7 @@ public abstract class Type<T> {
     public List<Object> convert(Object x, String what, Object context)
         throws ConversionException {
       if (x instanceof SkylarkList) {
-        return ((SkylarkList) x).getList();
+        return ((SkylarkList) x).getImmutableList();
       } else if (x instanceof List) {
         return (List<Object>) x;
       } else if (x instanceof Iterable) {