From 510e8a63255d2cbead2c768aa147e77eed69f2c8 Mon Sep 17 00:00:00 2001
From: Ulf Adams <ulfjack@google.com>
Date: Mon, 27 Feb 2017 09:40:20 +0000
Subject: Remove the deprecated com.google.devtools.build.lib.vfs.FileSystems
 class

--
PiperOrigin-RevId: 148625618
MOS_MIGRATED_REVID=148625618
---
 .../google/devtools/build/lib/vfs/FileSystems.java | 59 ----------------------
 .../devtools/build/benchmark/BazelBuildCase.java   |  4 +-
 2 files changed, 2 insertions(+), 61 deletions(-)
 delete mode 100644 src/main/java/com/google/devtools/build/lib/vfs/FileSystems.java

(limited to 'src')

diff --git a/src/main/java/com/google/devtools/build/lib/vfs/FileSystems.java b/src/main/java/com/google/devtools/build/lib/vfs/FileSystems.java
deleted file mode 100644
index d90859ed95..0000000000
--- a/src/main/java/com/google/devtools/build/lib/vfs/FileSystems.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2014 The Bazel Authors. All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package com.google.devtools.build.lib.vfs;
-
-import com.google.devtools.build.lib.concurrent.ThreadSafety.ThreadSafe;
-
-/**
- * This static file system singleton manages access to a single default
- * {@link FileSystem} instance created within the methods of this class.
- */
-@ThreadSafe
-@Deprecated // Instantiate and inject FileSystem instances directly, or use
-            // com.google.devtools.build.lib.vfs.util.FileSystems in tests.
-public final class FileSystems {
-
-  private FileSystems() {}
-
-  private static FileSystem defaultFileSystem;
-
-  /**
-   * Initializes the default {@link FileSystem} instance as a platform native
-   * (Unix) file system, creating one iff needed, and returns the instance.
-   *
-   * <p>This method is idempotent as long as the initialization is of the same
-   * type (Native/JavaIo/Union).
-   */
-  public static synchronized FileSystem initDefaultAsNative() {
-    if (!(defaultFileSystem instanceof UnixFileSystem)) {
-      defaultFileSystem = new UnixFileSystem();
-    }
-    return defaultFileSystem;
-  }
-
-  /**
-   * Initializes the default {@link FileSystem} instance as a java.io.File
-   * file system, creating one iff needed, and returns the instance.
-   *
-   * <p>This method is idempotent as long as the initialization is of the same
-   * type (Native/JavaIo/Union).
-   */
-  public static synchronized FileSystem initDefaultAsJavaIo() {
-    if (!(defaultFileSystem instanceof JavaIoFileSystem)) {
-      defaultFileSystem = new JavaIoFileSystem();
-    }
-    return defaultFileSystem;
-  }
-}
diff --git a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BazelBuildCase.java b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BazelBuildCase.java
index 3e610fd67e..825d7d84f5 100644
--- a/src/tools/benchmark/java/com/google/devtools/build/benchmark/BazelBuildCase.java
+++ b/src/tools/benchmark/java/com/google/devtools/build/benchmark/BazelBuildCase.java
@@ -20,7 +20,7 @@ import com.google.devtools.build.benchmark.codegenerator.JavaCodeGenerator;
 import com.google.devtools.build.lib.shell.CommandException;
 import com.google.devtools.build.lib.vfs.FileSystem;
 import com.google.devtools.build.lib.vfs.FileSystemUtils;
-import com.google.devtools.build.lib.vfs.FileSystems;
+import com.google.devtools.build.lib.vfs.JavaIoFileSystem;
 import java.io.IOException;
 import java.nio.file.Path;
 
@@ -56,7 +56,7 @@ final class BazelBuildCase implements BuildCase {
   private static final ImmutableList<BuildEnvConfig> BUILD_ENV_CONFIGS =
       ImmutableList.of(FULL_CLEAN_BUILD_CONFIG, INCREMENTAL_BUILD_CONFIG);
 
-  private static final FileSystem fileSystem = FileSystems.initDefaultAsJavaIo();
+  private static final FileSystem fileSystem = new JavaIoFileSystem();
 
   @Override
   public ImmutableList<BuildTargetConfig> getBuildTargetConfigs() {
-- 
cgit v1.2.3