Rename treeSize function

5 files changed, 6 insertions, 6 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 40783c3ce27..36f62c0bd5f 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -5285,7 +5285,7 @@
       "public boolean isEmpty()",
       "public com.yahoo.prelude.query.Item and(com.yahoo.prelude.query.Item)",
       "public static java.util.List getPositiveTerms(com.yahoo.prelude.query.Item)",
-      "public int getTreeSize()",
+      "public int treeSize()",
       "public bridge synthetic com.yahoo.prelude.query.CompositeItem clone()",
       "public bridge synthetic com.yahoo.prelude.query.Item clone()",
       "public bridge synthetic java.lang.Object clone()"
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java b/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java
index 693c5e98b57..d9af7f14ac3 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/QueryCanonicalizer.java
@@ -51,7 +51,7 @@ public class QueryCanonicalizer {
         ListIterator<Item> rootItemIterator = query.getItemIterator();
         CanonicalizationResult result = recursivelyCanonicalize(rootItemIterator.next(), rootItemIterator);
         if (query.isEmpty() && ! result.isError()) result = CanonicalizationResult.error("No query");
-        int itemCount = query.getTreeSize();
+        int itemCount = query.treeSize();
         if (itemCount > maxQueryItems) result = CanonicalizationResult.error(String.format("Query tree exceeds allowed item count. Configured limit: %d - Item count: %d", maxQueryItems, itemCount));
         return result.error().orElse(null); // preserve old API, unfortunately
     }
diff --git a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
index 2f3c066279d..6fae5c97cd2 100644
--- a/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/statistics/StatisticsSearcher.java
@@ -400,7 +400,7 @@ public class StatisticsSearcher extends Searcher {
     }
 
     private void addItemCountMetric(Query query, Metric.Context context) {
-        metric.set(QUERY_ITEM_COUNT, query.getModel().getQueryTree().getTreeSize(), context);
+        metric.set(QUERY_ITEM_COUNT, query.getModel().getQueryTree().treeSize(), context);
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/query/QueryTree.java b/container-search/src/main/java/com/yahoo/search/query/QueryTree.java
index 35b46c2872d..115a2f6dbdc 100644
--- a/container-search/src/main/java/com/yahoo/search/query/QueryTree.java
+++ b/container-search/src/main/java/com/yahoo/search/query/QueryTree.java
@@ -183,7 +183,7 @@ public class QueryTree extends CompositeItem {
     /**
      * Returns the total number of items in this query tree.
      */
-    public int getTreeSize() {
+    public int treeSize() {
         if (isEmpty()) return 0;
         return(countItemsRecursively(getItemIterator().next()));
     }
diff --git a/container-search/src/test/java/com/yahoo/search/query/QueryTreeTest.java b/container-search/src/test/java/com/yahoo/search/query/QueryTreeTest.java
index 2bff9ba1707..6c73937f4fa 100644
--- a/container-search/src/test/java/com/yahoo/search/query/QueryTreeTest.java
+++ b/container-search/src/test/java/com/yahoo/search/query/QueryTreeTest.java
@@ -45,7 +45,7 @@ public class QueryTreeTest {
      @Test
      public void getCorrectTreeSize() {
         QueryTree nullTree = new QueryTree(new NullItem());
-        assertEquals(0, nullTree.getTreeSize());
+        assertEquals(0, nullTree.treeSize());
 
          NotItem not1 = new NotItem();
          not1.addPositiveItem(new WordItem("p1"));
@@ -60,7 +60,7 @@ public class QueryTreeTest {
          QueryTree tree = new QueryTree(not1);
          tree.and(not2);
 
-         assertEquals(8, tree.getTreeSize());
+         assertEquals(8, tree.treeSize());
      }
 
 }