Merge pull request #24471 from vespa-engine/bratseth/restore-signature

Bratseth/restore signature

6 files changed, 20 insertions, 17 deletions

diff --git a/document/src/main/java/com/yahoo/document/json/JsonReader.java b/document/src/main/java/com/yahoo/document/json/JsonReader.java
index f8de0fb959e..86023d52b63 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonReader.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonReader.java
@@ -60,7 +60,7 @@ public class JsonReader {
      * @param docIdString document ID
      * @return the parsed document operation
      */
-    public ParsedDocumentOperation readSingleDocument(DocumentOperationType operationType, String docIdString) {
+    public ParsedDocumentOperation readOperation(DocumentOperationType operationType, String docIdString) {
         DocumentId docId = new DocumentId(docIdString);
         DocumentParseInfo documentParseInfo;
         try {
@@ -78,6 +78,11 @@ public class JsonReader {
         return operation;
     }
 
+    @Deprecated // Use readOperation instead
+    public DocumentOperation readSingleDocument(DocumentOperationType operationType, String docIdString) {
+        return readOperation(operationType, docIdString).operation();
+    }
+
     /** Returns the next document operation, or null if we have reached the end */
     public DocumentOperation next() {
         switch (state) {
diff --git a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java
index 7bdb526bb1c..070ede480ac 100644
--- a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java
+++ b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java
@@ -96,7 +96,7 @@ public class DocumentUpdateJsonSerializerTest {
     private static DocumentUpdate jsonToDocumentUpdate(String jsonDoc, String docId) {
         final InputStream rawDoc = new ByteArrayInputStream(Utf8.toBytes(jsonDoc));
         JsonReader reader = new JsonReader(types, rawDoc, parserFactory);
-        return (DocumentUpdate) reader.readSingleDocument(DocumentOperationType.UPDATE, docId).operation();
+        return (DocumentUpdate) reader.readOperation(DocumentOperationType.UPDATE, docId).operation();
     }
 
     private static String documentUpdateToJson(DocumentUpdate update) {
diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
index 97422217857..bee2adb10a0 100644
--- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
@@ -218,8 +218,8 @@ public class JsonReaderTestCase {
                 "    'nalle': 'bamse'",
                 "  }",
                 "}"));
-        DocumentPut put = (DocumentPut) r.readSingleDocument(DocumentOperationType.PUT,
-                                                             "id:unittest:smoke::doc1").operation();
+        DocumentPut put = (DocumentPut) r.readOperation(DocumentOperationType.PUT,
+                                                        "id:unittest:smoke::doc1").operation();
         smokeTestDoc(put.getDocument());
     }
 
@@ -229,7 +229,7 @@ public class JsonReaderTestCase {
                 "  'fields': {",
                 "    'something': {",
                 "      'assign': 'orOther' }}}"));
-        DocumentUpdate doc = (DocumentUpdate) r.readSingleDocument(DocumentOperationType.UPDATE, "id:unittest:smoke::whee").operation();
+        DocumentUpdate doc = (DocumentUpdate) r.readOperation(DocumentOperationType.UPDATE, "id:unittest:smoke::whee").operation();
         FieldUpdate f = doc.getFieldUpdate("something");
         assertEquals(1, f.size());
         assertTrue(f.getValueUpdate(0) instanceof AssignValueUpdate);
@@ -241,7 +241,7 @@ public class JsonReaderTestCase {
                 "  'fields': {",
                 "    'int1': {",
                 "      'assign': null }}}"));
-        DocumentUpdate doc = (DocumentUpdate) r.readSingleDocument(DocumentOperationType.UPDATE, "id:unittest:smoke::whee").operation();
+        DocumentUpdate doc = (DocumentUpdate) r.readOperation(DocumentOperationType.UPDATE, "id:unittest:smoke::whee").operation();
         FieldUpdate f = doc.getFieldUpdate("int1");
         assertEquals(1, f.size());
         assertTrue(f.getValueUpdate(0) instanceof ClearValueUpdate);
@@ -1339,8 +1339,8 @@ public class JsonReaderTestCase {
                 "    'tensorfield': null",
                 "  }",
                 "}"));
-        DocumentPut put = (DocumentPut) r.readSingleDocument(DocumentOperationType.PUT,
-                                                             "id:unittest:testnull::doc1").operation();
+        DocumentPut put = (DocumentPut) r.readOperation(DocumentOperationType.PUT,
+                                                        "id:unittest:testnull::doc1").operation();
         Document doc = put.getDocument();
         assertFieldValueNull(doc, "intfield");
         assertFieldValueNull(doc, "stringfield");
@@ -1357,7 +1357,7 @@ public class JsonReaderTestCase {
                 "    'arrayfield': [ null ]",
                 "  }",
                 "}"));
-        r.readSingleDocument(DocumentOperationType.PUT, "id:unittest:testnull::doc1");
+        r.readOperation(DocumentOperationType.PUT, "id:unittest:testnull::doc1");
         fail();
     }
 
@@ -1639,7 +1639,7 @@ public class JsonReaderTestCase {
                                                        "  'fields': {",
                                                        "    'something': {",
                                                        "      'modify': {} }}}"));
-            reader.readSingleDocument(DocumentOperationType.UPDATE, "id:unittest:smoke::doc1");
+            reader.readOperation(DocumentOperationType.UPDATE, "id:unittest:smoke::doc1");
             fail("Expected exception");
         }
         catch (IllegalArgumentException e) {
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 19f6df2bf97..6317d1256f1 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,10 +36,9 @@ public class BooleanPredicate extends PredicateValue {
         if (obj == this) {
             return true;
         }
-        if (!(obj instanceof BooleanPredicate)) {
+        if (!(obj instanceof BooleanPredicate rhs)) {
             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 496e84fd4a5..15b6d5d3d62 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 List<RangePartition> partitions;
-    private List<RangeEdgePartition> edgePartitions;
+    private final List<RangePartition> partitions;
+    private final List<RangeEdgePartition> edgePartitions;
 
     public FeatureRange(String key) {
         this(key, null, null);
@@ -98,10 +98,9 @@ public class FeatureRange extends PredicateValue {
         if (obj == this) {
             return true;
         }
-        if (!(obj instanceof FeatureRange)) {
+        if (!(obj instanceof FeatureRange rhs)) {
             return false;
         }
-        FeatureRange rhs = (FeatureRange)obj;
         if (!key.equals(rhs.key)) {
             return false;
         }
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
index 06cdccd17fc..66154ec1c28 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
@@ -1042,7 +1042,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
         }
 
         private ParsedDocumentOperation parse(InputStream inputStream, String docId, DocumentOperationType operation) {
-            return new JsonReader(manager, inputStream, jsonFactory).readSingleDocument(operation, docId);
+            return new JsonReader(manager, inputStream, jsonFactory).readOperation(operation, docId);
         }
 
     }