Use Comparators.lexicographical instead of Ordering.from in DeclaredMembers

Author: therepanic

core/src/com/google/inject/internal/DeclaredMembers.java

@@ -15,7 +15,7 @@
  */
 package com.google.inject.internal;
 
-import com.google.common.collect.Ordering;
+import com.google.common.collect.Comparators;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -34,26 +34,26 @@
  */
 public final class DeclaredMembers {
 
-  private DeclaredMembers() {}
+    private DeclaredMembers() {}
 
-  public static Field[] getDeclaredFields(Class<?> type) {
-    return Arrays.stream(type.getDeclaredFields())
-        .sorted(
-            Comparator.comparing(Field::getName)
-                .thenComparing(Field::getType, Comparator.comparing(Class::getName)))
-        .toArray(Field[]::new);
-  }
+    public static Field[] getDeclaredFields(Class<?> type) {
+        return Arrays.stream(type.getDeclaredFields())
+                .sorted(
+                        Comparator.comparing(Field::getName)
+                                .thenComparing(Field::getType, Comparator.comparing(Class::getName)))
+                .toArray(Field[]::new);
+    }
 
-  public static Method[] getDeclaredMethods(Class<?> type) {
-    return Arrays.stream(type.getDeclaredMethods())
-        .sorted(
-            Comparator.comparing(Method::getName)
-                .thenComparing(Method::getReturnType, Comparator.comparing(Class::getName))
-                .thenComparing(
-                    method -> Arrays.asList(method.getParameterTypes()),
-                    // TODO: use Comparators.lexicographical when it's not @Beta.
-                    Ordering.<Class<?>>from(Comparator.comparing(Class::getName))
-                        .lexicographical()))
-        .toArray(Method[]::new);
-  }
+    public static Method[] getDeclaredMethods(Class<?> type) {
+        return Arrays.stream(type.getDeclaredMethods())
+                .sorted(
+                        Comparator.comparing(Method::getName)
+                                .thenComparing(Method::getReturnType, Comparator.comparing(Class::getName))
+                                .thenComparing(
+                                        method -> Arrays.asList(method.getParameterTypes()),
+                                        Comparators.lexicographical(Comparator.comparing(Class::getName))
+                                )
+                )
+                .toArray(Method[]::new);
+    }
 }