Rename some ClassObject/Provider-related methods

The terminology "field" is preferred over "key" for the components of a struct or struct-like object.

RELNOTES: None
PiperOrigin-RevId: 180269374

1 files changed, 8 insertions, 8 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
index 1879227a38..e27d47963e 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkRuleClassFunctions.java
@@ -1062,11 +1062,11 @@ public class SkylarkRuleClassFunctions {
 
         private void printProtoTextMessage(
             ClassObject object, StringBuilder sb, int indent, Location loc) throws EvalException {
-          // For determinism sort the keys alphabetically
-          List<String> keys = new ArrayList<>(object.getKeys());
-          Collections.sort(keys);
-          for (String key : keys) {
-            printProtoTextMessage(key, object.getValue(key), sb, indent, loc);
+          // For determinism sort the fields alphabetically.
+          List<String> fields = new ArrayList<>(object.getFieldNames());
+          Collections.sort(fields);
+          for (String field : fields) {
+            printProtoTextMessage(field, object.getValue(field), sb, indent, loc);
           }
         }
 
@@ -1175,13 +1175,13 @@ public class SkylarkRuleClassFunctions {
             sb.append("{");
 
             String join = "";
-            for (String subKey : ((ClassObject) value).getKeys()) {
+            for (String field : ((ClassObject) value).getFieldNames()) {
               sb.append(join);
               join = ",";
               sb.append("\"");
-              sb.append(subKey);
+              sb.append(field);
               sb.append("\":");
-              printJson(((ClassObject) value).getValue(subKey), sb, loc, "struct field", subKey);
+              printJson(((ClassObject) value).getValue(field), sb, loc, "struct field", field);
             }
             sb.append("}");
           } else if (value instanceof List) {