1 files changed, 41 insertions, 29 deletions

diff --git a/container-core/src/main/java/com/yahoo/processing/request/CompoundName.java b/container-core/src/main/java/com/yahoo/processing/request/CompoundName.java
index b4536a1c56b..440df4f9be9 100644
--- a/container-core/src/main/java/com/yahoo/processing/request/CompoundName.java
+++ b/container-core/src/main/java/com/yahoo/processing/request/CompoundName.java
@@ -8,6 +8,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import static com.yahoo.text.Lowercase.toLowerCase;
 
@@ -74,41 +75,52 @@ public final class CompoundName {
      * @param compounds the compounds of this name
      */
     private CompoundName(String name, String [] compounds, boolean useCache) {
-        if (name == null) throw new NullPointerException("Name can not be null");
-
-        this.name = name;
+        this.name = Objects.requireNonNull(name, "Name can not be null");
         this.lowerCasedName = toLowerCase(name);
-        if (compounds.length == 1 && compounds[0].isEmpty()) {
-            this.compounds = List.of();
-            this.hashCode = 0;
-            rest = this;
-            first = this;
+        if (compounds.length == 1) {
+            if (compounds[0].isEmpty()) {
+                this.compounds = List.of();
+                this.hashCode = 0;
+                rest = first = this;
+                return;
+            }
+            this.compounds = new ImmutableArrayList(compounds);
+            this.hashCode = this.compounds.hashCode();
+            rest = first = empty;
             return;
         }
-        this.compounds = new ImmutableArrayList(compounds);
-        this.hashCode = this.compounds.hashCode();
-
-        if (compounds.length > 1) {
-            String restName = name.substring(compounds[0].length()+1);
-            if (useCache) {
-                rest = cache.computeIfAbsent(restName, (key) -> new CompoundName(key, Arrays.copyOfRange(compounds, 1, compounds.length), useCache));
-            } else {
-                rest = new CompoundName(restName, Arrays.copyOfRange(compounds, 1, compounds.length), useCache);
+        CompoundName[] children = new CompoundName[compounds.length];
+        for (int i = 0; i + 1 < children.length; i++) {
+            int start = 0, end = i == 0 ? -1 : children[0].name.length();
+            for (int j = 0; j + i < children.length; j++) {
+                end += compounds[j + i].length() + 1;
+                if (end == start) throw new IllegalArgumentException("'" + name + "' is not a legal compound name. " +
+                                                                     "Consecutive, leading or trailing dots are not allowed.");
+                String subName = this.name.substring(start, end);
+                CompoundName cached = cache.get(subName);
+                children[j] = cached != null ? cached
+                                             : new CompoundName(subName,
+                                                                this.lowerCasedName.substring(start, end),
+                                                                Arrays.copyOfRange(compounds, j, j + i + 1),
+                                                                i == 0 ? empty : children[j + 1],
+                                                                i == 0 ? empty : children[j]);
+                if (useCache && cached == null) cache.put(subName, children[j]);
+                start += compounds[j].length() + 1;
             }
-        } else {
-            rest = empty;
         }
+        this.compounds = new ImmutableArrayList(compounds);
+        this.hashCode = this.compounds.hashCode();
+        this.rest = children[1];
+        this.first = children[0];
+    }
 
-        if (compounds.length > 1) {
-            String firstName = name.substring(0, name.length() - (compounds[compounds.length-1].length()+1));
-            if (useCache) {
-                first = cache.computeIfAbsent(firstName, (key) -> new CompoundName(key, Arrays.copyOfRange(compounds, 0, compounds.length-1), useCache));
-            } else {
-                first = new CompoundName(firstName, Arrays.copyOfRange(compounds, 0, compounds.length-1), useCache);
-            }
-        } else {
-            first = empty;
-        }
+    private CompoundName(String name, String lowerCasedName, String[] compounds, CompoundName rest, CompoundName first) {
+        this.name = name;
+        this.lowerCasedName = lowerCasedName;
+        this.compounds = new ImmutableArrayList(compounds);
+        this.hashCode = this.compounds.hashCode();
+        this.rest = rest;
+        this.first = first;
     }
 
     private static List<String> parse(String s) {