Automated conversion to Java 8

With a few manual fixes for readability.

RELNOTES: None.
PiperOrigin-RevId: 160582556

5 files changed, 8 insertions, 97 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/util/CommandFailureUtils.java b/src/main/java/com/google/devtools/build/lib/util/CommandFailureUtils.java
index ef787de045..9fb0c835b8 100644
--- a/src/main/java/com/google/devtools/build/lib/util/CommandFailureUtils.java
+++ b/src/main/java/com/google/devtools/build/lib/util/CommandFailureUtils.java
@@ -14,13 +14,13 @@
 
 package com.google.devtools.build.lib.util;
 
-import com.google.common.collect.Ordering;
+import static java.util.Map.Entry.comparingByKey;
 
+import com.google.common.collect.Ordering;
 import java.io.File;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Map;
-
 import javax.annotation.Nullable;
 
 /**
@@ -127,15 +127,6 @@ public class CommandFailureUtils {
 
   private CommandFailureUtils() {} // Prevent instantiation.
 
-  private static Comparator<Map.Entry<String, String>> mapEntryComparator =
-      new Comparator<Map.Entry<String, String>>() {
-        @Override
-        public int compare(Map.Entry<String, String> x, Map.Entry<String, String> y) {
-          // A map can never have two keys with the same value, so we only need to compare the keys.
-          return x.getKey().compareTo(y.getKey());
-        }
-      };
-
   /**
    * Construct a string that describes the command.
    * Currently this returns a message of the form "foo bar baz",
@@ -191,6 +182,8 @@ public class CommandFailureUtils {
        */
       if (environment != null) {
         describeCommandImpl.describeCommandEnvPrefix(message);
+        // A map can never have two keys with the same value, so we only need to compare the keys.
+        Comparator<Map.Entry<String, String>> mapEntryComparator = comparingByKey();
         for (Map.Entry<String, String> entry :
             Ordering.from(mapEntryComparator).sortedCopy(environment.entrySet())) {
           message.append("  ");
diff --git a/src/main/java/com/google/devtools/build/lib/util/FileType.java b/src/main/java/com/google/devtools/build/lib/util/FileType.java
index b984e98d70..2eef5afdbf 100644
--- a/src/main/java/com/google/devtools/build/lib/util/FileType.java
+++ b/src/main/java/com/google/devtools/build/lib/util/FileType.java
@@ -14,18 +14,15 @@
 
 package com.google.devtools.build.lib.util;
 
-import com.google.common.base.Function;
 import com.google.common.base.Predicate;
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
 import com.google.devtools.build.lib.vfs.Path;
 import com.google.devtools.build.lib.vfs.PathFragment;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
-
 import javax.annotation.concurrent.Immutable;
 
 /**
@@ -130,14 +127,6 @@ public abstract class FileType implements Predicate<String> {
     String getFilename();
   }
 
-  public static final Function<HasFilename, String> TO_FILENAME =
-      new Function<HasFilename, String>() {
-        @Override
-        public String apply(HasFilename input) {
-          return input.getFilename();
-        }
-      };
-
   /**
    * Checks whether an Iterable<? extends HasFileType> contains any of the specified file types.
    *
@@ -167,32 +156,17 @@ public abstract class FileType implements Predicate<String> {
 
   private static <T extends HasFilename> Predicate<T> typeMatchingPredicateFor(
       final FileType matchingType) {
-    return new Predicate<T>() {
-      @Override
-      public boolean apply(T item) {
-        return matchingType.matches(item.getFilename());
-      }
-    };
+    return item -> matchingType.matches(item.getFilename());
   }
 
   private static <T extends HasFilename> Predicate<T> typeMatchingPredicateFor(
       final FileTypeSet matchingTypes) {
-    return new Predicate<T>() {
-      @Override
-      public boolean apply(T item) {
-        return matchingTypes.matches(item.getFilename());
-      }
-    };
+    return item -> matchingTypes.matches(item.getFilename());
   }
 
   private static <T extends HasFilename> Predicate<T> typeMatchingPredicateFrom(
       final Predicate<String> fileTypePredicate) {
-    return new Predicate<T>() {
-      @Override
-      public boolean apply(T item) {
-        return fileTypePredicate.apply(item.getFilename());
-      }
-    };
+    return item -> fileTypePredicate.apply(item.getFilename());
   }
 
   /**
diff --git a/src/main/java/com/google/devtools/build/lib/util/Pair.java b/src/main/java/com/google/devtools/build/lib/util/Pair.java
index 91d04c62f1..943f8c97f2 100644
--- a/src/main/java/com/google/devtools/build/lib/util/Pair.java
+++ b/src/main/java/com/google/devtools/build/lib/util/Pair.java
@@ -13,11 +13,7 @@
 // limitations under the License.
 package com.google.devtools.build.lib.util;
 
-import com.google.common.base.Function;
-
-import java.util.Comparator;
 import java.util.Objects;
-
 import javax.annotation.Nullable;
 
 /**
@@ -85,40 +81,4 @@ public final class Pair<A, B> {
     int hash2 = second == null ? 0 : second.hashCode();
     return 31 * hash1 + hash2;
   }
-
-  /**
-   * A function that maps to the first element in a pair.
-   */
-  public static <A, B> Function<Pair<A, B>, A> firstFunction() {
-    return new Function<Pair<A, B>, A>() {
-      @Override
-      public A apply(Pair<A, B> pair) {
-        return pair.first;
-      }
-    };
-  }
-
-  /**
-   * A function that maps to the second element in a pair.
-   */
-  public static <A, B> Function<Pair<A, B>, B> secondFunction() {
-    return new Function<Pair<A, B>, B>() {
-      @Override
-      public B apply(Pair<A, B> pair) {
-        return pair.second;
-      }
-    };
-  }
-
-  /**
-   * A comparator that compares pairs by comparing the first element.
-   */
-  public static <T extends Comparable<T>, B> Comparator<Pair<T, B>> compareByFirst() {
-    return new Comparator<Pair<T, B>>() {
-      @Override
-      public int compare(Pair<T, B> o1, Pair<T, B> o2) {
-        return o1.first.compareTo(o2.first);
-      }
-    };
-  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/util/StringCanonicalizer.java b/src/main/java/com/google/devtools/build/lib/util/StringCanonicalizer.java
index 8a850972f0..18ac47a754 100644
--- a/src/main/java/com/google/devtools/build/lib/util/StringCanonicalizer.java
+++ b/src/main/java/com/google/devtools/build/lib/util/StringCanonicalizer.java
@@ -13,7 +13,6 @@
 // limitations under the License.
 package com.google.devtools.build.lib.util;
 
-import com.google.common.base.Function;
 import com.google.common.collect.Interner;
 import com.google.devtools.build.lib.concurrent.BlazeInterners;
 
@@ -25,14 +24,6 @@ public final class StringCanonicalizer {
 
   private static final Interner<String> interner = BlazeInterners.newWeakInterner();
 
-  /** Functional interface, for use with e.g. transform */
-  public static final Function<String, String> INTERN = new Function<String, String>() {
-    @Override
-    public String apply(String x) {
-      return intern(x);
-    }
-  };
-
   private StringCanonicalizer() {
   }
 
diff --git a/src/main/java/com/google/devtools/build/lib/util/StringUtil.java b/src/main/java/com/google/devtools/build/lib/util/StringUtil.java
index ff9b61f826..567f26f17d 100644
--- a/src/main/java/com/google/devtools/build/lib/util/StringUtil.java
+++ b/src/main/java/com/google/devtools/build/lib/util/StringUtil.java
@@ -13,11 +13,9 @@
 // limitations under the License.
 package com.google.devtools.build.lib.util;
 
-import com.google.common.base.Function;
 import com.google.common.base.Joiner;
 import com.google.common.base.Splitter;
 import com.google.common.collect.Iterables;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
@@ -127,12 +125,7 @@ public class StringUtil {
    */
   public static Iterable<String> append(Iterable<String> values, final String prefix,
       final String suffix) {
-  return Iterables.transform(values, new Function<String, String>() {
-      @Override
-      public String apply(String input) {
-        return prefix + input + suffix;
-      }
-    });
+    return Iterables.transform(values, input -> prefix + input + suffix);
   }
 
   /**