aboutsummaryrefslogtreecommitdiffstats
path: root/documentapi/src
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2018-03-12 12:46:56 +0000
committerTor Egge <Tor.Egge@oath.com>2018-03-12 12:59:55 +0000
commit7326629c08629d59c904eea8e7d50c6332c0ac45 (patch)
tree48bd19d0690f1bce6cf9070dff2b1731ffdc2e78 /documentapi/src
parent86a54b6abe2130d36f29a3f3f9f7ace66ab41a2f (diff)
Enable new document api protocol.
Diffstat (limited to 'documentapi/src')
-rwxr-xr-xdocumentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java2
-rw-r--r--documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java2
-rw-r--r--documentapi/src/tests/messages/messages60test.h3
-rw-r--r--documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp2
4 files changed, 4 insertions, 5 deletions
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
index 312f8a65364..c8f798d6ddf 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java
@@ -306,7 +306,7 @@ public class DocumentProtocol implements Protocol {
VersionSpecification version50 = new VersionSpecification(5, 0);
VersionSpecification version51 = new VersionSpecification(5, 1);
VersionSpecification version52 = new VersionSpecification(5, 115);
- VersionSpecification version6 = new VersionSpecification(6, 999); // TODO change once stable protocol
+ VersionSpecification version6 = new VersionSpecification(6, 221);
List<VersionSpecification> from50 = Arrays.asList(version50, version51, version52, version6);
List<VersionSpecification> from51 = Arrays.asList(version51, version52, version6);
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
index b522147124c..4d914c03a2b 100644
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/protocol/test/Messages60TestCase.java
@@ -18,7 +18,7 @@ public class Messages60TestCase extends Messages52TestCase {
@Override
protected Version version() {
- return new Version(6, 999); // TODO finalize version
+ return new Version(6, 221);
}
@Override
diff --git a/documentapi/src/tests/messages/messages60test.h b/documentapi/src/tests/messages/messages60test.h
index 597eace067b..78224e5a808 100644
--- a/documentapi/src/tests/messages/messages60test.h
+++ b/documentapi/src/tests/messages/messages60test.h
@@ -5,8 +5,7 @@
class Messages60Test : public Messages52Test {
protected:
- // TODO finalize version
- const vespalib::Version getVersion() const override { return vespalib::Version(6, 999); }
+ const vespalib::Version getVersion() const override { return vespalib::Version(6, 221); }
public:
Messages60Test();
bool testCreateVisitorMessage();
diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp
index dd2e73c9d9b..fa3a8280f95 100644
--- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp
+++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp
@@ -50,7 +50,7 @@ DocumentProtocol::DocumentProtocol(const LoadTypeSet& loadTypes,
vespalib::VersionSpecification version50(5, 0);
vespalib::VersionSpecification version51(5, 1);
vespalib::VersionSpecification version52(5, 115);
- vespalib::VersionSpecification version6(6, 999); // TODO finalize version
+ vespalib::VersionSpecification version6(6, 221);
std::vector<vespalib::VersionSpecification> from50 = { version50, version51, version52, version6 };
std::vector<vespalib::VersionSpecification> from51 = { version51, version52, version6 };