From 81c8bb2209eaec683ac2f538bb6a768bde9b1dc6 Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Wed, 17 Jan 2018 16:24:10 +0100 Subject: Encode and decode bucket space --- .../documentapi/messagebus/protocol/RoutableFactories51.java | 4 ++-- .../documentapi/messagebus/protocol/RoutableFactories60.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories51.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories51.java index 1754209fc06..a99902c1d13 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories51.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories51.java @@ -62,7 +62,7 @@ public abstract class RoutableFactories51 extends RoutableFactories50 { return msg; } - protected boolean encodeBucketSpace(String bucketSpace) { + protected boolean encodeBucketSpace(String bucketSpace, DocumentSerializer buf) { // TODO fixed space repo return "default".equals(bucketSpace); } @@ -103,7 +103,7 @@ public abstract class RoutableFactories51 extends RoutableFactories50 { buf.putInt(null, msg.getVisitorOrdering()); buf.putInt(null, msg.getMaxBucketsPerVisitor()); - return encodeBucketSpace(msg.getBucketSpace()); + return encodeBucketSpace(msg.getBucketSpace(), buf); } } diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java index 11a707c44de..ef63fe8b295 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java @@ -1,6 +1,7 @@ // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.documentapi.messagebus.protocol; +import com.yahoo.document.serialization.DocumentSerializer; import com.yahoo.vespa.objects.Deserializer; public class RoutableFactories60 extends RoutableFactories52 { @@ -8,14 +9,13 @@ public class RoutableFactories60 extends RoutableFactories52 { public static class CreateVisitorMessageFactory extends RoutableFactories52.CreateVisitorMessageFactory { @Override protected String decodeBucketSpace(Deserializer deserializer) { - // TODO le test~ - return super.decodeBucketSpace(deserializer); + return decodeString(deserializer); } @Override - protected boolean encodeBucketSpace(String bucketSpace) { - // TODO le test~ - return super.encodeBucketSpace(bucketSpace); + protected boolean encodeBucketSpace(String bucketSpace, DocumentSerializer buf) { + encodeString(bucketSpace, buf); + return true; } } -- cgit v1.2.3