Use CompoundName.from in tests and construction of static objects.

4 files changed, 8 insertions, 8 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/query/Model.java b/container-search/src/main/java/com/yahoo/search/query/Model.java
index 190ad675015..09b2f394f20 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Model.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Model.java
@@ -71,13 +71,13 @@ public class Model implements Cloneable {
         argumentType.addField(new FieldDescription(SEARCH_PATH, "string", "searchpath"));
         argumentType.addField(new FieldDescription(RESTRICT, "string", "restrict"));
         argumentType.freeze();
-        argumentTypeName = new CompoundName(argumentType.getId().getName());
+        argumentTypeName = CompoundName.from(argumentType.getId().getName());
     }
 
     public static QueryProfileType getArgumentType() { return argumentType; }
 
     /** The name of the query property used for generating hit count estimate queries. */
-    public static final CompoundName ESTIMATE = new CompoundName("hitcountestimate"); // TODO: Cleanup
+    public static final CompoundName ESTIMATE = CompoundName.from("hitcountestimate"); // TODO: Cleanup
 
     private String encoding = null;
     private String queryString = "";
diff --git a/container-search/src/main/java/com/yahoo/search/query/Ranking.java b/container-search/src/main/java/com/yahoo/search/query/Ranking.java
index e8738a19412..5426268d173 100644
--- a/container-search/src/main/java/com/yahoo/search/query/Ranking.java
+++ b/container-search/src/main/java/com/yahoo/search/query/Ranking.java
@@ -27,7 +27,7 @@ import java.util.Objects;
 public class Ranking implements Cloneable {
 
     /** An alias for listing features */
-    public static final CompoundName RANKFEATURES = new CompoundName("rankfeatures");
+    public static final CompoundName RANKFEATURES = CompoundName.from("rankfeatures");
 
     /** The type representing the property arguments consumed by this */
     private static final QueryProfileType argumentType;
@@ -70,7 +70,7 @@ public class Ranking implements Cloneable {
         argumentType.addField(new FieldDescription(FEATURES, "query-profile", "rankfeature input")); // Repeated at the end of RankFeatures
         argumentType.addField(new FieldDescription(PROPERTIES, "query-profile", "rankproperty"));
         argumentType.freeze();
-        argumentTypeName = new CompoundName(argumentType.getId().getName());
+        argumentTypeName = CompoundName.from(argumentType.getId().getName());
     }
     public static QueryProfileType getArgumentType() { return argumentType; }
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/properties/DefaultProperties.java b/container-search/src/main/java/com/yahoo/search/query/properties/DefaultProperties.java
index 221368afeb6..6ccf4792efb 100644
--- a/container-search/src/main/java/com/yahoo/search/query/properties/DefaultProperties.java
+++ b/container-search/src/main/java/com/yahoo/search/query/properties/DefaultProperties.java
@@ -16,9 +16,9 @@ import java.util.Map;
  */
 public final class DefaultProperties extends Properties  {
 
-    public static final CompoundName MAX_OFFSET = new CompoundName("maxOffset");
-    public static final CompoundName MAX_HITS = new CompoundName("maxHits");
-    public static final CompoundName MAX_QUERY_ITEMS = new CompoundName("maxQueryItems");
+    public static final CompoundName MAX_OFFSET = CompoundName.from("maxOffset");
+    public static final CompoundName MAX_HITS = CompoundName.from("maxHits");
+    public static final CompoundName MAX_QUERY_ITEMS = CompoundName.from("maxQueryItems");
 
     public static final QueryProfileType argumentType = new QueryProfileType("DefaultProperties");
 
diff --git a/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterConstants.java b/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterConstants.java
index b0fce45de46..eeb8b675ae1 100644
--- a/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterConstants.java
+++ b/container-search/src/main/java/com/yahoo/search/query/rewrite/RewriterConstants.java
@@ -42,7 +42,7 @@ public class RewriterConstants {
     public static final String REWRITER_CHAIN = "QRWChain";
 
     /** Name for rewrite metadata retrieval from query properties */
-    public static final CompoundName REWRITE_META = new CompoundName("RewriteMeta");
+    public static final CompoundName REWRITE_META = CompoundName.from("RewriteMeta");
 
     /** Name for rewritten field retrieval from query properties */
     public static final String REWRITTEN = "Rewritten";