Remove GlobList formatting logic

Isn't strictly necessary, remove it before anyone decides they want to use it.

--
MOS_MIGRATED_REVID=127585617

3 files changed, 7 insertions, 38 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java b/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java
index 54a223fbe8..44623f7ef6 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/AttributeFormatter.java
@@ -49,15 +49,11 @@ import com.google.devtools.build.lib.query2.proto.proto2api.Build.LabelListDictE
 import com.google.devtools.build.lib.query2.proto.proto2api.Build.StringDictEntry;
 import com.google.devtools.build.lib.query2.proto.proto2api.Build.StringDictUnaryEntry;
 import com.google.devtools.build.lib.query2.proto.proto2api.Build.StringListDictEntry;
-import com.google.devtools.build.lib.syntax.GlobCriteria;
-import com.google.devtools.build.lib.syntax.GlobList;
 import com.google.devtools.build.lib.syntax.Type;
-
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
-
 import javax.annotation.Nullable;
 
 /** Common utilities for serializing {@link Attribute}s as protocol buffers. */
@@ -78,9 +74,6 @@ public class AttributeFormatter {
    * <p>If {@param value} is null, only the {@code name}, {@code explicitlySpecified}, {@code
    * nodep} (if applicable), and {@code type} fields will be included in the proto message.
    *
-   * <p>If {@param includeGlobs} is true then {@link GlobCriteria} will be included in the proto
-   * message if present.
-   *
    * <p>If {@param encodeBooleanAndTriStateAsIntegerAndString} is true then boolean and tristate
    * values are also encoded as integers and strings.
    */
@@ -88,14 +81,12 @@ public class AttributeFormatter {
       Attribute attr,
       @Nullable Object value,
       boolean explicitlySpecified,
-      boolean includeGlobs,
       boolean encodeBooleanAndTriStateAsIntegerAndString) {
     return getAttributeProto(
         attr.getName(),
         attr.getType(),
         value,
         explicitlySpecified,
-        includeGlobs,
         encodeBooleanAndTriStateAsIntegerAndString);
   }
 
@@ -105,7 +96,6 @@ public class AttributeFormatter {
       Type<?> type,
       @Nullable Object value,
       boolean explicitlySpecified,
-      boolean includeGlobs,
       boolean encodeBooleanAndTriStateAsIntegerAndString) {
     Build.Attribute.Builder attrPb = Build.Attribute.newBuilder();
     attrPb.setName(name);
@@ -114,13 +104,13 @@ public class AttributeFormatter {
 
     if (value instanceof SelectorList<?>) {
       attrPb.setType(Discriminator.SELECTOR_LIST);
-      writeSelectorListToBuilder(attrPb, type, (SelectorList<?>) value, includeGlobs);
+      writeSelectorListToBuilder(attrPb, type, (SelectorList<?>) value);
     } else {
       attrPb.setType(ProtoUtils.getDiscriminatorFromType(type));
       if (value != null) {
         AttributeBuilderAdapter adapter =
             new AttributeBuilderAdapter(attrPb, encodeBooleanAndTriStateAsIntegerAndString);
-        writeAttributeValueToBuilder(adapter, type, value, includeGlobs);
+        writeAttributeValueToBuilder(adapter, type, value);
       }
     }
 
@@ -138,8 +128,7 @@ public class AttributeFormatter {
   private static void writeSelectorListToBuilder(
       Build.Attribute.Builder attrPb,
       Type<?> type,
-      SelectorList<?> selectorList,
-      boolean includeGlobs) {
+      SelectorList<?> selectorList) {
     Build.Attribute.SelectorList.Builder selectorListBuilder =
         Build.Attribute.SelectorList.newBuilder();
     selectorListBuilder.setType(ProtoUtils.getDiscriminatorFromType(type));
@@ -161,8 +150,7 @@ public class AttributeFormatter {
           writeAttributeValueToBuilder(
               new SelectorEntryBuilderAdapter(selectorEntryBuilder),
               type,
-              conditionValue,
-              includeGlobs);
+              conditionValue);
         }
         selectorBuilder.addEntries(selectorEntryBuilder);
       }
@@ -177,7 +165,7 @@ public class AttributeFormatter {
    */
   @SuppressWarnings("unchecked")
   private static void writeAttributeValueToBuilder(
-      AttributeValueBuilderAdapter builder, Type<?> type, Object value, boolean includeGlobs) {
+      AttributeValueBuilderAdapter builder, Type<?> type, Object value) {
     if (type == INTEGER) {
       builder.setIntValue((Integer) value);
     } else if (type == STRING || type == LABEL || type == NODEP_LABEL || type == OUTPUT) {
@@ -270,23 +258,6 @@ public class AttributeFormatter {
     } else {
       throw new AssertionError("Unknown type: " + type);
     }
-
-    if (includeGlobs && value instanceof GlobList<?>) {
-      GlobList<?> globList = (GlobList<?>) value;
-
-      for (GlobCriteria criteria : globList.getCriteria()) {
-        Build.GlobCriteria.Builder criteriaPb =
-            Build.GlobCriteria.newBuilder().setGlob(criteria.isGlob());
-        for (String include : criteria.getIncludePatterns()) {
-          criteriaPb.addInclude(include);
-        }
-        for (String exclude : criteria.getExcludePatterns()) {
-          criteriaPb.addExclude(exclude);
-        }
-
-        builder.addGlobCriteria(criteriaPb);
-      }
-    }
   }
 
   private static Tristate triStateToProto(TriState value) {
@@ -370,6 +341,7 @@ public class AttributeFormatter {
       this.encodeBooleanAndTriStateAsIntegerAndString = encodeBooleanAndTriStateAsIntegerAndString;
     }
 
+    @Override
     public void addStringListValue(String s) {
       attributeBuilder.addStringListValue(s);
     }
@@ -495,6 +467,7 @@ public class AttributeFormatter {
       this.selectorEntryBuilder = Preconditions.checkNotNull(selectorEntryBuilder);
     }
 
+    @Override
     public void addStringListValue(String s) {
       selectorEntryBuilder.addStringListValue(s);
     }
diff --git a/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java b/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
index 4154818818..c22fc39215 100644
--- a/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/packages/RuleFormatter.java
@@ -80,7 +80,6 @@ public class RuleFormatter {
               attr,
               valueToSerialize,
               isExplicit,
-              /*includeGlobs=*/ true,
               /*encodeBooleanAndTriStateAsIntegerAndString=*/ false));
     }
     return builder;
diff --git a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
index 472ae201e6..4f8c709ee9 100644
--- a/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
+++ b/src/main/java/com/google/devtools/build/lib/query2/output/ProtoOutputFormatter.java
@@ -46,7 +46,6 @@ import com.google.devtools.build.lib.query2.proto.proto2api.Build.GeneratedFile;
 import com.google.devtools.build.lib.query2.proto.proto2api.Build.QueryResult.Builder;
 import com.google.devtools.build.lib.query2.proto.proto2api.Build.SourceFile;
 import com.google.devtools.build.lib.syntax.Environment;
-
 import java.io.IOException;
 import java.io.PrintStream;
 import java.util.Collection;
@@ -155,7 +154,6 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter {
                 attr,
                 flattenedAttributeValue,
                 rule.isAttributeValueExplicitlySpecified(attr),
-                /*includeGlobs=*/ false,
                 /*encodeBooleanAndTriStateAsIntegerAndString=*/ true);
         rulePb.addAttribute(serializedAttribute);
         serializedAttributes.put(attr, serializedAttribute);
@@ -190,7 +188,6 @@ public class ProtoOutputFormatter extends AbstractUnorderedFormatter {
                 attribute,
                 attributeValue,
                 /*explicitlySpecified=*/ false,
-                /*includeGlobs=*/ false,
                 /*encodeBooleanAndTriStateAsIntegerAndString=*/ true);
         rulePb.addAttribute(serializedAttribute);
       }