Merge pull request #720 from ronshapiro/ClassName_simpleNames

Memoize ClassName.simpleNames()

1 files changed, 13 insertions, 4 deletions

diff --git a/src/main/java/com/squareup/javapoet/ClassName.java b/src/main/java/com/squareup/javapoet/ClassName.java
index e044985..b8dbd31 100644
--- a/src/main/java/com/squareup/javapoet/ClassName.java
+++ b/src/main/java/com/squareup/javapoet/ClassName.java
@@ -41,6 +41,8 @@ public final class ClassName extends TypeName implements Comparable<ClassName> {
   /** This class name, like "Entry" for java.util.Map.Entry. */
   final String simpleName;
 
+  private List<String> simpleNames;
+
   /** The full class name like "java.util.Map.Entry". */
   final String canonicalName;
 
@@ -108,11 +110,18 @@ public final class ClassName extends TypeName implements Comparable<ClassName> {
   }
 
   public List<String> simpleNames() {
-    List<String> simpleNames = new ArrayList<>();
-    if (enclosingClassName != null) {
-      simpleNames.addAll(enclosingClassName().simpleNames());
+    if (simpleNames != null) {
+      return simpleNames;
+    }
+
+    if (enclosingClassName == null) {
+      simpleNames = Collections.singletonList(simpleName);
+    } else {
+      List<String> mutableNames = new ArrayList<>();
+      mutableNames.addAll(enclosingClassName().simpleNames());
+      mutableNames.add(simpleName);
+      simpleNames = Collections.unmodifiableList(mutableNames);
     }
-    simpleNames.add(simpleName);
     return simpleNames;
   }