Minor memory and performance fixes for Guice.

- Use char where available - Replace usage of LinkedHashMap with ImmutableSet PiperOrigin-RevId: 398739059
google · Sep 24, 2021 · 25fe439 · 25fe439
1 parent ffd9d01
commit 25fe439
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 18 deletions.
diff --git a/core/src/com/google/inject/Key.java b/core/src/com/google/inject/Key.java
@@ -208,7 +208,7 @@ public final String toString() {
     // method.
     String local = toString;
     if (local == null) {
-      local = "Key[type=" + typeLiteral + ", annotation=" + annotationStrategy + "]";
+      local = "Key[type=" + typeLiteral + ", annotation=" + annotationStrategy + ']';
       toString = local;
     }
     return local;
@@ -513,7 +513,7 @@ public int hashCode() {
 
     @Override
     public String toString() {
-      return "@" + annotationType.getName();
+      return '@' + annotationType.getName();
     }
   }
 }
diff --git a/core/src/com/google/inject/internal/Annotations.java b/core/src/com/google/inject/internal/Annotations.java
@@ -158,7 +158,7 @@ private static int annotationHashCode(
   /** Implements {@link Annotation#toString}. */
   private static String annotationToString(
       Class<? extends Annotation> type, Map<String, Object> members) throws Exception {
-    StringBuilder sb = new StringBuilder().append("@").append(type.getName()).append("(");
+    StringBuilder sb = new StringBuilder().append('@').append(type.getName()).append('(');
     JOINER.appendTo(
         sb,
         Maps.transformValues(
@@ -167,7 +167,7 @@ private static String annotationToString(
               String s = Arrays.deepToString(new Object[] {arg});
               return s.substring(1, s.length() - 1); // cut off brackets
             }));
-    return sb.append(")").toString();
+    return sb.append(')').toString();
   }
 
   /** Returns true if the given annotation is retained at runtime. */
@@ -413,7 +413,7 @@ public static String nameOf(Key<?> key) {
     if (annotation != null && !isMarker(annotationType)) {
       return key.getAnnotation().toString();
     } else if (key.getAnnotationType() != null) {
-      return "@" + key.getAnnotationType().getName();
+      return '@' + key.getAnnotationType().getName();
     } else {
       return "";
     }

diff --git a/core/src/com/google/inject/internal/MoreTypes.java b/core/src/com/google/inject/internal/MoreTypes.java
@@ -448,11 +448,11 @@ public String toString() {
         return stringBuilder.toString();
       }
 
-      stringBuilder.append("<").append(typeToString(typeArguments[0]));
+      stringBuilder.append('<').append(typeToString(typeArguments[0]));
       for (int i = 1; i < typeArguments.length; i++) {
         stringBuilder.append(", ").append(typeToString(typeArguments[i]));
       }
-      return stringBuilder.append(">").toString();
+      return stringBuilder.append('>').toString();
     }
 
     private static void ensureOwnerType(Type ownerType, Type rawType) {

diff --git a/core/src/com/google/inject/internal/UniqueAnnotations.java b/core/src/com/google/inject/internal/UniqueAnnotations.java
@@ -51,11 +51,11 @@ public Class<? extends Annotation> annotationType() {
 
       @Override
       public String toString() {
-        return "@"
+        return '@'
             + Internal.class.getName()
-            + "("
+            + '('
             + Annotations.memberValueString("value", value)
-            + ")";
+            + ')';
       }
 
       @Override

diff --git a/core/src/com/google/inject/internal/util/Classes.java b/core/src/com/google/inject/internal/util/Classes.java
@@ -44,9 +44,9 @@ public static String toString(Member member) {
     Class<? extends Member> memberType = Classes.memberType(member);
 
     if (memberType == Method.class) {
-      return member.getDeclaringClass().getName() + "." + member.getName() + "()";
+      return member.getDeclaringClass().getName() + '.' + member.getName() + "()";
     } else if (memberType == Field.class) {
-      return member.getDeclaringClass().getName() + "." + member.getName();
+      return member.getDeclaringClass().getName() + '.' + member.getName();
     } else if (memberType == Constructor.class) {
       return member.getDeclaringClass().getName() + ".<init>()";
     } else {

diff --git a/core/src/com/google/inject/name/NamedImpl.java b/core/src/com/google/inject/name/NamedImpl.java
@@ -53,7 +53,7 @@ public boolean equals(Object o) {
 
   @Override
   public String toString() {
-    return "@" + Named.class.getName() + "(" + Annotations.memberValueString("value", value) + ")";
+    return '@' + Named.class.getName() + '(' + Annotations.memberValueString("value", value) + ')';
   }
 
   @Override

diff --git a/core/src/com/google/inject/spi/Dependency.java b/core/src/com/google/inject/spi/Dependency.java
@@ -115,9 +115,9 @@ public String toString() {
     StringBuilder builder = new StringBuilder();
     builder.append(key);
     if (injectionPoint != null) {
-      builder.append("@").append(injectionPoint);
+      builder.append('@').append(injectionPoint);
       if (parameterIndex != -1) {
-        builder.append("[").append(parameterIndex).append("]");
+        builder.append('[').append(parameterIndex).append(']');
       }
     }
     return builder.toString();

diff --git a/core/src/com/google/inject/util/Modules.java b/core/src/com/google/inject/util/Modules.java
@@ -41,7 +41,6 @@
 import com.google.inject.spi.ScopeBinding;
 import java.lang.annotation.Annotation;
 import java.util.Arrays;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -231,7 +230,7 @@ public void configure() {
       }
 
       final Binder binder = baseBinder.skipSources(this.getClass());
-      final LinkedHashSet<Element> elements = new LinkedHashSet<>(baseElements);
+      final ImmutableSet<Element> elements = ImmutableSet.copyOf(baseElements);
       final Module scannersModule = extractScanners(elements);
       final List<Element> overrideElements =
           Elements.getElements(

diff --git a/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java b/extensions/assistedinject/src/com/google/inject/assistedinject/Parameter.java
@@ -64,7 +64,7 @@ public String toString() {
       result.append("@Assisted ");
     }
     if (bindingAnnotation != null) {
-      result.append(bindingAnnotation).append(" ");
+      result.append(bindingAnnotation).append(' ');
     }
     return result.append(type).toString();
   }