Remove the overloading of option category to cover documentation level.

This prevents having to parse the category, and allows the category to potentially be used in the future for information about all options, included undocumented, hidden, or internal options.

Also rename DocumentationLevel to OptionUsageRestrictions, since INTERNAL was not really documentation related.

PiperOrigin-RevId: 153367769

2 files changed, 23 insertions, 11 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/TransitiveOptionDetailsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/TransitiveOptionDetailsTest.java
index 8359c4e984..6d8f5a98aa 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/TransitiveOptionDetailsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/TransitiveOptionDetailsTest.java
@@ -22,6 +22,7 @@ import com.google.devtools.common.options.Converter;
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParser;
+import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -77,13 +78,17 @@ public class TransitiveOptionDetailsTest {
     @Option(name = "multi_option", defaultValue = "n/a (allows multiple)", allowMultiple = true)
     public List<String> multiOption;
 
-    @Option(name = "internal option", defaultValue = "secret", category = "internal")
+    @Option(
+      name = "internal option",
+      defaultValue = "secret",
+      optionUsageRestrictions = OptionUsageRestrictions.INTERNAL
+    )
     public String internalOption;
 
     @Option(
       name = "internal multi option",
       defaultValue = "n/a",
-      category = "internal",
+      optionUsageRestrictions = OptionUsageRestrictions.INTERNAL,
       allowMultiple = true
     )
     public List<String> internalMultiOption;
diff --git a/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java b/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java
index 84030ad481..d1761b8f0b 100644
--- a/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/util/OptionsUtilsTest.java
@@ -26,6 +26,7 @@ import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionPriority;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParser;
+import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions;
 import java.util.Arrays;
 import java.util.List;
 import org.junit.Test;
@@ -49,19 +50,25 @@ public class OptionsUtilsTest {
             defaultValue = "beta")
     public String beta;
 
-    @Option(name = "gamma",
-            category = "undocumented",
-            defaultValue = "gamma")
+    @Option(
+      name = "gamma",
+      optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED,
+      defaultValue = "gamma"
+    )
     public String gamma;
 
-    @Option(name = "delta",
-            category = "undocumented",
-            defaultValue = "delta")
+    @Option(
+      name = "delta",
+      optionUsageRestrictions = OptionUsageRestrictions.UNDOCUMENTED,
+      defaultValue = "delta"
+    )
     public String delta;
 
-    @Option(name = "echo",
-            category = "hidden",
-            defaultValue = "echo")
+    @Option(
+      name = "echo",
+      optionUsageRestrictions = OptionUsageRestrictions.HIDDEN,
+      defaultValue = "echo"
+    )
     public String echo;
   }