commit 706a22e62329f78f356cfafdc1c97cb710667c5b
author jcater <jcater@google.com> Mon Jun 17 09:56:03 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Jun 17 09:57:53 2019 -0700
tree 401e7808f024116f87a40c27ddfa8b2bf7f7a129
parent 45ae709eb6868fb5c61d819d0cb1454767e4acad

Fix classes that create OptionsParser instances to directly use the Builder.

PiperOrigin-RevId: 253601285

src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
index 601b8b4..290ae1c 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandDispatcher.java
@@ -651,7 +651,11 @@
     }
     Command annotation = command.getClass().getAnnotation(Command.class);
     OptionsParser parser =
-        OptionsParser.newOptionsParser(optionsData, "--//", annotation.allowResidue());
+        OptionsParser.builder()
+            .optionsData(optionsData)
+            .skippedPrefix("--//")
+            .allowResidue(annotation.allowResidue())
+            .build();
     return parser;
   }
 

src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
index 4982415..41469c44 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeCommandUtils.java
@@ -123,7 +123,7 @@
       Collection<Class<? extends OptionsBase>> options,
       OptionsParser.HelpVerbosity helpVerbosity,
       String productName) {
-    OptionsParser parser = OptionsParser.newOptionsParser(options);
+    OptionsParser parser = OptionsParser.builder().optionsClasses(options).build();
 
     String template;
     if (help.startsWith("resource:")) {

src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
index f05338b..718a3dc 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BlazeRuntime.java
@@ -1147,7 +1147,8 @@
         BlazeCommandUtils.getStartupOptions(modules);
 
     // First parse the command line so that we get the option_sources argument
-    OptionsParser parser = OptionsParser.newOptionsParser(false, optionClasses);
+    OptionsParser parser =
+        OptionsParser.builder().optionsClasses(optionClasses).allowResidue(false).build();
     parser.parse(PriorityCategory.COMMAND_LINE, null, args);
     Map<String, String> optionSources =
         parser.getOptions(BlazeServerStartupOptions.class).optionSources;
@@ -1160,7 +1161,7 @@
                     : optionSources.get(option.getOptionName());
 
     // Then parse the command line again, this time with the correct option sources
-    parser = OptionsParser.newOptionsParser(false, optionClasses);
+    parser = OptionsParser.builder().optionsClasses(optionClasses).allowResidue(false).build();
     parser.parseWithSourceFunction(PriorityCategory.COMMAND_LINE, sourceFunction, args);
     return parser;
   }

src/main/java/com/google/devtools/build/lib/runtime/CommandLineEvent.java

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/CommandLineEvent.java b/src/main/java/com/google/devtools/build/lib/runtime/CommandLineEvent.java
index 5eff056..97a6e92 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/CommandLineEvent.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/CommandLineEvent.java
@@ -317,7 +317,8 @@
     private CommandLineSection getCanonicalStartupOptions() {
       List<Option> unfilteredOptions = getActiveStartupOptions().getOptionList().getOptionList();
       // Create the fake ones to prevent reapplication of the original rc file contents.
-      OptionsParser fakeOptions = OptionsParser.newOptionsParser(BlazeServerStartupOptions.class);
+      OptionsParser fakeOptions =
+          OptionsParser.builder().optionsClasses(BlazeServerStartupOptions.class).build();
       try {
         fakeOptions.parse("--ignore_all_rc_files");
       } catch (OptionsParsingException e) {