commit 1dce09721f8361240bbf056fd508f1ac5fdcfd32
author ccalvarin <ccalvarin@google.com> Mon Sep 11 20:03:02 2017 +0200
committer Philipp Wollermann <philwo@google.com> Tue Sep 12 14:05:08 2017 +0200
tree 2406d3ab794db15d509adc842121bfa9f6c6eb84
parent 5a77f426e0896031973ce1dc965f05e014ee9a24

Replace referrals to options by their name to option definitions.

Now that we have a standard way of referring to an option, remove all of the places that we were referring to them by their name. Since options can have multiple names, this is more clear and provides the additional information needed to understand the option. It also stops the habit of requesting unqualified strings, which was hard to read.

RELNOTES: None.
PiperOrigin-RevId: 168254584

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 f0414df..711c176 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
@@ -877,10 +877,13 @@
     parser.parse(OptionPriority.COMMAND_LINE, null, args);
     Map<String, String> optionSources =
         parser.getOptions(BlazeServerStartupOptions.class).optionSources;
-    Function<String, String> sourceFunction = option ->
-        !optionSources.containsKey(option) ? "default"
-            : optionSources.get(option).isEmpty() ? "command line"
-            : optionSources.get(option);
+    Function<OptionDefinition, String> sourceFunction =
+        option ->
+            !optionSources.containsKey(option.getOptionName())
+                ? "default"
+                : optionSources.get(option.getOptionName()).isEmpty()
+                    ? "command line"
+                    : optionSources.get(option.getOptionName());
 
     // Then parse the command line again, this time with the correct option sources
     parser = OptionsParser.newOptionsParser(optionClasses);