diff options
3 files changed, 23 insertions, 10 deletions
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index 9b80279fa29..34530788732 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -916,15 +916,28 @@ "public static final enum com.yahoo.prelude.query.MultiRangeItem$Limit EXCLUSIVE" ] }, - "com.yahoo.prelude.query.MultiRangeItem": { - "superClass": "com.yahoo.prelude.query.MultiTermItem", - "interfaces": [], - "attributes": [ + "com.yahoo.prelude.query.MultiRangeItem$NumberType" : { + "superClass" : "java.lang.Object", + "interfaces" : [ ], + "attributes" : [ "public" ], - "methods": [ - "public static com.yahoo.prelude.query.MultiRangeItem overRanges(java.lang.String, com.yahoo.prelude.query.MultiRangeItem$Limit, java.lang.String, com.yahoo.prelude.query.MultiRangeItem$Limit)", - "public static com.yahoo.prelude.query.MultiRangeItem overPoints(java.lang.String, com.yahoo.prelude.query.MultiRangeItem$Limit, com.yahoo.prelude.query.MultiRangeItem$Limit)", + "methods" : [ ], + "fields" : [ + "public static final com.yahoo.prelude.query.MultiRangeItem$NumberType INTEGER", + "public static final com.yahoo.prelude.query.MultiRangeItem$NumberType LONG", + "public static final com.yahoo.prelude.query.MultiRangeItem$NumberType DOUBLE" + ] + }, + "com.yahoo.prelude.query.MultiRangeItem" : { + "superClass" : "com.yahoo.prelude.query.MultiTermItem", + "interfaces" : [ ], + "attributes" : [ + "public" + ], + "methods" : [ + "public static com.yahoo.prelude.query.MultiRangeItem overRanges(com.yahoo.prelude.query.MultiRangeItem$NumberType, java.lang.String, com.yahoo.prelude.query.MultiRangeItem$Limit, java.lang.String, com.yahoo.prelude.query.MultiRangeItem$Limit)", + "public static com.yahoo.prelude.query.MultiRangeItem overPoints(com.yahoo.prelude.query.MultiRangeItem$NumberType, java.lang.String, com.yahoo.prelude.query.MultiRangeItem$Limit, com.yahoo.prelude.query.MultiRangeItem$Limit)", "public com.yahoo.prelude.query.MultiRangeItem addPoint(java.lang.Number)", "public com.yahoo.prelude.query.MultiRangeItem addRange(java.lang.Number, java.lang.Number)", "public void setIndexName(java.lang.String)", @@ -935,7 +948,7 @@ "public int hashCode()", "public bridge synthetic java.lang.Object clone()" ], - "fields": [] + "fields" : [ ] }, "com.yahoo.prelude.query.NearItem" : { "superClass" : "com.yahoo.prelude.query.CompositeItem", diff --git a/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java b/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java index ff40b6f66bc..7ba7a13936f 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/MultiRangeItem.java @@ -324,7 +324,7 @@ public class MultiRangeItem<Type extends Number> extends MultiTermItem { } @Override - protected Item asCompositeItem() { + Item asCompositeItem() { OrItem root = new OrItem(); if (startIndex.equals(endIndex)) { for (Range<Type> range : sortedRanges()) { diff --git a/container-search/src/main/java/com/yahoo/prelude/query/MultiTermItem.java b/container-search/src/main/java/com/yahoo/prelude/query/MultiTermItem.java index 801eb861940..a7ca62d153c 100644 --- a/container-search/src/main/java/com/yahoo/prelude/query/MultiTermItem.java +++ b/container-search/src/main/java/com/yahoo/prelude/query/MultiTermItem.java @@ -48,7 +48,7 @@ abstract class MultiTermItem extends SimpleTaggableItem { /** Encode all wrapped terms to the buffer. */ abstract void encodeTerms(ByteBuffer buffer); - abstract protected Item asCompositeItem(); + abstract Item asCompositeItem(); @Override public final ItemType getItemType() { |