Update abi-spec, and some more non-functional changes

3 files changed, 10 insertions, 20 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 0e45aa59421..915245cda2c 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -441,7 +441,7 @@
       "protected void encodeThis(java.nio.ByteBuffer)",
       "protected int encodingArity()",
       "protected void appendBodyString(java.lang.StringBuilder)",
-      "protected boolean shouldParenthize()",
+      "protected boolean shouldParenthesize()",
       "public com.yahoo.prelude.query.CompositeItem clone()",
       "public int hashCode()",
       "public boolean equals(java.lang.Object)",
@@ -779,7 +779,7 @@
       "public static void putBytes(byte[], java.nio.ByteBuffer)",
       "public abstract int getTermCount()",
       "public java.lang.String toString()",
-      "protected boolean shouldParenthize()",
+      "protected boolean shouldParenthesize()",
       "protected void appendHeadingString(java.lang.StringBuilder)",
       "protected abstract void appendBodyString(java.lang.StringBuilder)",
       "public com.yahoo.prelude.query.Item clone()",
@@ -1027,7 +1027,7 @@
       "public com.yahoo.prelude.query.BlockItem getBlockItem(int)",
       "protected void encodeThis(java.nio.ByteBuffer)",
       "public int encode(java.nio.ByteBuffer)",
-      "protected boolean shouldParenthize()",
+      "protected boolean shouldParenthesize()",
       "protected void appendHeadingString(java.lang.StringBuilder)",
       "protected void appendBodyString(java.lang.StringBuilder)",
       "public java.lang.String getIndexedString()",
@@ -1060,7 +1060,7 @@
       "protected void encodeThis(java.nio.ByteBuffer)",
       "public int encode(java.nio.ByteBuffer)",
       "public int encodeContent(java.nio.ByteBuffer)",
-      "protected boolean shouldParenthize()",
+      "protected boolean shouldParenthesize()",
       "protected void appendHeadingString(java.lang.StringBuilder)",
       "protected void appendBodyString(java.lang.StringBuilder)",
       "public java.lang.String getIndexedString()",
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/Item.java b/container-search/src/main/java/com/yahoo/prelude/query/Item.java
index 175b3bc0062..5031e1cd581 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/Item.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/Item.java
@@ -296,7 +296,7 @@ public abstract class Item implements Cloneable {
 
 
     /** Utility method for turning a string into utf-8 bytes */
-    protected static final byte[] getBytes(String string) {
+    protected static byte[] getBytes(String string) {
         return Utf8.toBytes(string);
     }
     public static void putString(String s, ByteBuffer buffer) {
diff --git a/container-search/src/main/java/com/yahoo/prelude/query/WeightedSetItem.java b/container-search/src/main/java/com/yahoo/prelude/query/WeightedSetItem.java
index a988753d699..a5903f24cbd 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/WeightedSetItem.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/WeightedSetItem.java
@@ -10,6 +10,8 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.Objects;
 
+import static java.util.Objects.requireNonNullElse;
+
 /**
  * A term which contains a weighted set.
  *
@@ -30,20 +32,12 @@ public class WeightedSetItem extends SimpleTaggableItem {
 
     /** Creates an empty weighted set; note you must provide an index name up front */
     public WeightedSetItem(String indexName) {
-        if (indexName == null) {
-            this.indexName = "";
-        } else {
-            this.indexName = indexName;
-        }
+        this.indexName = requireNonNullElse(indexName, "");
         set = new CopyOnWriteHashMap<>(1000);
     }
 
     public WeightedSetItem(String indexName, Map<Object, Integer> map) {
-        if (indexName == null) {
-            this.indexName = "";
-        } else {
-            this.indexName = indexName;
-        }
+        this.indexName = requireNonNullElse(indexName, "");
         set = new CopyOnWriteHashMap<>(map);
     }
 
@@ -96,11 +90,7 @@ public class WeightedSetItem extends SimpleTaggableItem {
 
     @Override
     public void setIndexName(String index) {
-        if (index == null) {
-            this.indexName = "";
-        } else {
-            this.indexName = index;
-        }
+        this.indexName = requireNonNullElse(index, "");
     }
 
     public String getIndexName() {