Remove on Vespa 8

3 files changed, 0 insertions, 55 deletions

diff --git a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
index a9d34fc78d8..d33cc8078dd 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonSerializationHelper.java
@@ -183,11 +183,6 @@ public class JsonSerializationHelper {
 
     public static void serializeStructField(FieldWriter fieldWriter, JsonGenerator generator, FieldBase field, Struct value) {
         DataType dt = value.getDataType();
-        // TODO remove in Vespa 8:
-        if (dt == PositionDataType.INSTANCE) {
-            serializeString(generator, field, PositionDataType.renderAsString(value));
-            return;
-        }
         if (dt instanceof GeoPosType) {
             var gpt = (GeoPosType)dt;
             if (gpt.renderJsonAsVespa8()) {
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 039880185ce..e396fe8912b 100644
--- a/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java
+++ b/document/src/test/java/com/yahoo/document/json/DocumentUpdateJsonSerializerTest.java
@@ -529,26 +529,6 @@ public class DocumentUpdateJsonSerializerTest {
     }
 
     @Test
-    public void testSimultaneousFieldsAndFieldPathsUpdate() {
-        roundtripSerializeJsonAndMatch(inputJson(
-                "{",
-                "   'update': 'DOCUMENT_ID',",
-                "   'fields': {",
-                "       'singlepos_field': {",
-                "           'assign': 'N60.222333;E10.12'",
-                "       },",
-                "       'deep_map{my_field}': {",
-                "           'assign': {",
-                "               'my_key': 'my value',",
-                "               'new_key': 'new value'",
-                "           }",
-                "       }",
-                "   }",
-                "}"
-        ));
-    }
-
-    @Test
     public void testAssignFieldPathUpdate() {
         roundtripSerializeJsonAndMatch(inputJson(
                 "{",
@@ -637,34 +617,6 @@ public class DocumentUpdateJsonSerializerTest {
     }
 
     @Test
-    public void testAssignSinglePos() {
-        roundtripSerializeJsonAndMatch(inputJson(
-                "{",
-                "    'update': 'DOCUMENT_ID',",
-                "    'fields': {",
-                "        'singlepos_field': {",
-                "            'assign': 'N60.222333;E10.12'",
-                "        }",
-                "    }",
-                "}"
-        ));
-    }
-
-    @Test
-    public void testAssignMultiPos() {
-        roundtripSerializeJsonAndMatch(inputJson(
-                "{",
-                "    'update': 'DOCUMENT_ID',",
-                "    'fields': {",
-                "        'multipos_field': {",
-                "            'assign': [ 'N0.0;E0.0', 'S1.1;W1.1', 'N10.2;W122.2' ]",
-                "        }",
-                "    }",
-                "}"
-        ));
-    }
-
-    @Test
     public void testClearField() {
         roundtripSerializeJsonAndMatch(inputJson(
                 "{",
diff --git a/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java
index b7f24368ad7..92f28d8f219 100644
--- a/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java
+++ b/document/src/test/java/com/yahoo/document/json/JsonWriterTestCase.java
@@ -215,13 +215,11 @@ public class JsonWriterTestCase {
 
     @Test
     public void singlePosTest() throws IOException {
-        roundTripEquality("id:unittest:testsinglepos::bamf", "{ \"singlepos\": \"N60.222333;E10.12\" }");
         roundTripEquality("id:unittest:testsinglepos::bamf", "{ \"geopos\": { \"lat\": 60.222333, \"lng\": 10.12 } }");
     }
 
     @Test
     public void multiPosTest() throws IOException {
-        roundTripEquality("id:unittest:testmultipos::bamf", "{ \"multipos\": [ \"N0.0;E0.0\", \"S1.1;W1.1\", \"N10.2;W122.2\" ] }");
         roundTripEquality("id:unittest:testmultipos::bamf", "{ \"geopos\": [ {  \"lat\": -1.5, \"lng\": -1.5 }, {  \"lat\": 63.4, \"lng\": 10.4 }, { \"lat\": 0.0, \"lng\": 0.0 } ] }");
     }