Split out option usage restriction from option category.

These are two different concepts. Do not remove category overload compatibility in this CL, to keep this change limited to converting the current uses of category.

With some flyby formatting fixes on affected OptionsBases.

RELNOTES: None.
PiperOrigin-RevId: 153390002

1 files changed, 13 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BuildEventStreamOptions.java b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BuildEventStreamOptions.java
index 67618a3fbb..da3805e22a 100644
--- a/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BuildEventStreamOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/buildeventstream/transports/BuildEventStreamOptions.java
@@ -16,6 +16,7 @@ package com.google.devtools.build.lib.buildeventstream.transports;
 
 import com.google.devtools.common.options.Option;
 import com.google.devtools.common.options.OptionsBase;
+import com.google.devtools.common.options.OptionsParser.OptionUsageRestrictions;
 
 /** Options used to configure BuildEventStreamer and its BuildEventTransports. */
 public class BuildEventStreamOptions extends OptionsBase {
@@ -23,7 +24,7 @@ public class BuildEventStreamOptions extends OptionsBase {
   @Option(
     name = "experimental_build_event_text_file",
     defaultValue = "",
-    category = "hidden",
+    optionUsageRestrictions = OptionUsageRestrictions.HIDDEN,
     help = "If non-empty, write a textual representation of the build event protocol to that file"
   )
   public String buildEventTextFile;
@@ -31,7 +32,7 @@ public class BuildEventStreamOptions extends OptionsBase {
   @Option(
     name = "experimental_build_event_binary_file",
     defaultValue = "",
-    category = "hidden",
+    optionUsageRestrictions = OptionUsageRestrictions.HIDDEN,
     help =
         "If non-empty, write a varint delimited binary representation of representation of the"
             + " build event protocol to that file."
@@ -41,20 +42,22 @@ public class BuildEventStreamOptions extends OptionsBase {
   @Option(
     name = "experimental_build_event_text_file_path_conversion",
     defaultValue = "true",
-    category = "hidden",
-    help = "Convert paths in the text file representation of the build event protocol to more"
-        + " globally valid URIs whenever possible; if disabled, the file:// uri scheme will always"
-        + " be used"
+    optionUsageRestrictions = OptionUsageRestrictions.HIDDEN,
+    help =
+        "Convert paths in the text file representation of the build event protocol to more "
+            + "globally valid URIs whenever possible; if disabled, the file:// uri scheme will "
+            + "always be used"
   )
   public boolean buildEventTextFilePathConversion;
 
   @Option(
     name = "experimental_build_event_binary_file_path_conversion",
     defaultValue = "true",
-    category = "hidden",
-    help = "Convert paths in the binary file representation of the build event protocol to more"
-        + " globally valid URIs whenever possible; if disabled, the file:// uri scheme will always"
-        + " be used"
+    optionUsageRestrictions = OptionUsageRestrictions.HIDDEN,
+    help =
+        "Convert paths in the binary file representation of the build event protocol to more "
+            + "globally valid URIs whenever possible; if disabled, the file:// uri scheme will "
+            + "always be used"
   )
   public boolean buildEventBinaryFilePathConversion;