Remove v6 and v7 from java side.

2 files changed, 1 insertions, 18 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java
index 04f2188a594..27684e20aff 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableRepository.java
@@ -49,13 +49,8 @@ final class RoutableRepository {
             log.log(LogLevel.ERROR, "Received empty byte array for deserialization.");
             return null;
         }
-        DocumentDeserializer in;
+        DocumentDeserializer in = DocumentDeserializerFactory.createHead(docMan, GrowableByteBuffer.wrap(data));
 
-        if (version.getMajor() >= 5) {
-            in = DocumentDeserializerFactory.createHead(docMan, GrowableByteBuffer.wrap(data));
-        } else {
-            in = DocumentDeserializerFactory.create42(docMan, GrowableByteBuffer.wrap(data));
-        }
 
         int type = in.getInt(null);
         RoutableFactory factory = getFactory(version, type);
diff --git a/documentapi/test/cfg/testdoctypes.cfg b/documentapi/test/cfg/testdoctypes.cfg
index db071076fc4..e5098f9492a 100644
--- a/documentapi/test/cfg/testdoctypes.cfg
+++ b/documentapi/test/cfg/testdoctypes.cfg
@@ -25,7 +25,6 @@ documenttype[0].datatype[0].sstruct.compression.minsize 0
 documenttype[0].datatype[0].sstruct.field[1]
 documenttype[0].datatype[0].sstruct.field[0].name "longfield"
 documenttype[0].datatype[0].sstruct.field[0].id 1589309697
-documenttype[0].datatype[0].sstruct.field[0].id_v6 477609536
 documenttype[0].datatype[0].sstruct.field[0].datatype 4
 documenttype[0].datatype[1].id -1636745577
 documenttype[0].datatype[1].type STRUCT
@@ -45,19 +44,15 @@ documenttype[0].datatype[1].sstruct.compression.minsize 0
 documenttype[0].datatype[1].sstruct.field[4]
 documenttype[0].datatype[1].sstruct.field[0].name "floatfield"
 documenttype[0].datatype[1].sstruct.field[0].id 1055999199
-documenttype[0].datatype[1].sstruct.field[0].id_v6 657399019
 documenttype[0].datatype[1].sstruct.field[0].datatype 1
 documenttype[0].datatype[1].sstruct.field[1].name "longfield"
 documenttype[0].datatype[1].sstruct.field[1].id 1589309697
-documenttype[0].datatype[1].sstruct.field[1].id_v6 477609536
 documenttype[0].datatype[1].sstruct.field[1].datatype 4
 documenttype[0].datatype[1].sstruct.field[2].name "stringfield"
 documenttype[0].datatype[1].sstruct.field[2].id 1182460484
-documenttype[0].datatype[1].sstruct.field[2].id_v6 779638844
 documenttype[0].datatype[1].sstruct.field[2].datatype 2
 documenttype[0].datatype[1].sstruct.field[3].name "urifield"
 documenttype[0].datatype[1].sstruct.field[3].id 628407450
-documenttype[0].datatype[1].sstruct.field[3].id_v6 756285986
 documenttype[0].datatype[1].sstruct.field[3].datatype 10
 documenttype[0].datatype[2].id 1878320748
 documenttype[0].datatype[2].type STRUCT
@@ -77,23 +72,18 @@ documenttype[0].datatype[2].sstruct.compression.minsize 0
 documenttype[0].datatype[2].sstruct.field[5]
 documenttype[0].datatype[2].sstruct.field[0].name "bytefield"
 documenttype[0].datatype[2].sstruct.field[0].id 1924064342
-documenttype[0].datatype[2].sstruct.field[0].id_v6 2050488857
 documenttype[0].datatype[2].sstruct.field[0].datatype 16
 documenttype[0].datatype[2].sstruct.field[1].name "doublefield"
 documenttype[0].datatype[2].sstruct.field[1].id 421343958
-documenttype[0].datatype[2].sstruct.field[1].id_v6 944141865
 documenttype[0].datatype[2].sstruct.field[1].datatype 5
 documenttype[0].datatype[2].sstruct.field[2].name "foo"
 documenttype[0].datatype[2].sstruct.field[2].id 1747747633
-documenttype[0].datatype[2].sstruct.field[2].id_v6 2143417350
 documenttype[0].datatype[2].sstruct.field[2].datatype 666999
 documenttype[0].datatype[2].sstruct.field[3].name "intfield"
 documenttype[0].datatype[2].sstruct.field[3].id 435380425
-documenttype[0].datatype[2].sstruct.field[3].id_v6 545156740
 documenttype[0].datatype[2].sstruct.field[3].datatype 0
 documenttype[0].datatype[2].sstruct.field[4].name "rawfield"
 documenttype[0].datatype[2].sstruct.field[4].id 172982133
-documenttype[0].datatype[2].sstruct.field[4].id_v6 84029972
 documenttype[0].datatype[2].sstruct.field[4].datatype 3
 documenttype[0].annotationtype[0]
 documenttype[1].id -1146158894
@@ -121,7 +111,6 @@ documenttype[1].datatype[0].sstruct.compression.minsize 0
 documenttype[1].datatype[0].sstruct.field[1]
 documenttype[1].datatype[0].sstruct.field[0].name "longfield"
 documenttype[1].datatype[0].sstruct.field[0].id 1589309697
-documenttype[1].datatype[0].sstruct.field[0].id_v6 477609536
 documenttype[1].datatype[0].sstruct.field[0].datatype 4
 documenttype[1].datatype[1].id 192273965
 documenttype[1].datatype[1].type STRUCT
@@ -157,6 +146,5 @@ documenttype[1].datatype[2].sstruct.compression.minsize 0
 documenttype[1].datatype[2].sstruct.field[1]
 documenttype[1].datatype[2].sstruct.field[0].name "intfield"
 documenttype[1].datatype[2].sstruct.field[0].id 435380425
-documenttype[1].datatype[2].sstruct.field[0].id_v6 545156740
 documenttype[1].datatype[2].sstruct.field[0].datatype 0
 documenttype[1].annotationtype[0]