commit e91a450e2fd6bd9cfe46c8cfbf3e755a87cdb95e
author juliexxia <juliexxia@google.com> Wed Aug 15 14:42:29 2018 -0700
committer Copybara-Service <copybara-piper@google.com> Wed Aug 15 14:44:27 2018 -0700
tree 9e50c86d37fff882eb33113259ec81310f0c38b4
parent 5a6fc8deb863696e121ef8e6fc65361c0e35e5f8

Change the name of the OptionsProvider class -> OptionsParsingResult. This is CL 1/3 in order to add a <code>getSkylarkOptions()</code> method to the top level OptionsProvider which is currently known as OptionsClassProvider.

OptionsClassProvider will be renamed to OptionsProvider in CL 2/3 in this series to better reflect the fact that the class will be a more general options provider instead of specifically an options ~class~ provider. This requires changing the current OptionsProvider class to something else, which is what this CL is doing.

PiperOrigin-RevId: 208885826

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

diff --git a/src/main/java/com/google/devtools/build/lib/runtime/BazelFileSystemModule.java b/src/main/java/com/google/devtools/build/lib/runtime/BazelFileSystemModule.java
index 9e57bf8..db26f14 100644
--- a/src/main/java/com/google/devtools/build/lib/runtime/BazelFileSystemModule.java
+++ b/src/main/java/com/google/devtools/build/lib/runtime/BazelFileSystemModule.java
@@ -25,7 +25,7 @@
 import com.google.devtools.build.lib.vfs.JavaIoFileSystem;
 import com.google.devtools.build.lib.windows.WindowsFileSystem;
 import com.google.devtools.common.options.OptionsParsingException;
-import com.google.devtools.common.options.OptionsProvider;
+import com.google.devtools.common.options.OptionsParsingResult;
 
 /**
  * Module to provide a {@link FileSystem} instance that uses {@code SHA256} as the default hash
@@ -36,7 +36,7 @@
 public class BazelFileSystemModule extends BlazeModule {
 
   @Override
-  public void globalInit(OptionsProvider startupOptionsProvider) throws AbruptExitException {
+  public void globalInit(OptionsParsingResult startupOptionsProvider) throws AbruptExitException {
     BlazeServerStartupOptions startupOptions =
         Preconditions.checkNotNull(
             startupOptionsProvider.getOptions(BlazeServerStartupOptions.class));
@@ -60,7 +60,7 @@
   }
 
   @Override
-  public FileSystem getFileSystem(OptionsProvider startupOptions) {
+  public FileSystem getFileSystem(OptionsParsingResult startupOptions) {
     if ("0".equals(System.getProperty("io.bazel.EnableJni"))) {
       // Ignore UnixFileSystem, to be used for bootstrapping.
       return OS.getCurrent() == OS.WINDOWS ? new WindowsFileSystem() : new JavaIoFileSystem();