Revert "Bratseth/restore signature"

2 files changed, 6 insertions, 4 deletions

diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/BooleanPredicate.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/BooleanPredicate.java
index 6317d1256f1..19f6df2bf97 100644
--- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/BooleanPredicate.java
+++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/BooleanPredicate.java
@@ -36,9 +36,10 @@ public class BooleanPredicate extends PredicateValue {
         if (obj == this) {
             return true;
         }
-        if (!(obj instanceof BooleanPredicate rhs)) {
+        if (!(obj instanceof BooleanPredicate)) {
             return false;
         }
+        BooleanPredicate rhs = (BooleanPredicate)obj;
         if (value != rhs.value) {
             return false;
         }
diff --git a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java
index 15b6d5d3d62..496e84fd4a5 100644
--- a/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java
+++ b/predicate-search-core/src/main/java/com/yahoo/document/predicate/FeatureRange.java
@@ -13,8 +13,8 @@ public class FeatureRange extends PredicateValue {
     private String key;
     private Long from;
     private Long to;
-    private final List<RangePartition> partitions;
-    private final List<RangeEdgePartition> edgePartitions;
+    private List<RangePartition> partitions;
+    private List<RangeEdgePartition> edgePartitions;
 
     public FeatureRange(String key) {
         this(key, null, null);
@@ -98,9 +98,10 @@ public class FeatureRange extends PredicateValue {
         if (obj == this) {
             return true;
         }
-        if (!(obj instanceof FeatureRange rhs)) {
+        if (!(obj instanceof FeatureRange)) {
             return false;
         }
+        FeatureRange rhs = (FeatureRange)obj;
         if (!key.equals(rhs.key)) {
             return false;
         }