diff options
Diffstat (limited to 'messagebus/src')
| -rw-r--r-- | messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java | 4 | ||||
| -rwxr-xr-x | messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java | 16 |
2 files changed, 17 insertions, 3 deletions
diff --git a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java index d42e396452a..b70b61d4f57 100644 --- a/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java +++ b/messagebus/src/main/java/com/yahoo/messagebus/network/rpc/RPCNetwork.java @@ -184,7 +184,7 @@ public class RPCNetwork implements Network, MethodHandler { RPCSendAdapter adapter1 = new RPCSendV1(); RPCSendAdapter adapter2 = new RPCSendV2(); addSendAdapter(new Version(5), adapter1); - addSendAdapter(new Version(6,142), adapter2); + addSendAdapter(new Version(6,148), adapter2); } @Override @@ -345,7 +345,7 @@ public class RPCNetwork implements Network, MethodHandler { * @param version The version for which to return an adapter. * @return The compatible adapter. */ - private RPCSendAdapter getSendAdapter(Version version) { + public RPCSendAdapter getSendAdapter(Version version) { Map.Entry<Version, RPCSendAdapter> lower = sendAdapters.floorEntry(version); return (lower != null) ? lower.getValue() : null; } diff --git a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java index 5a88db8c19b..ee90939a61b 100755 --- a/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java +++ b/messagebus/src/test/java/com/yahoo/messagebus/network/rpc/SendAdapterTestCase.java @@ -79,8 +79,22 @@ public class SendAdapterTestCase { //////////////////////////////////////////////////////////////////////////////// @Test + public void requireCorrectVersionSelection() { + assertNull(srcServer.net.getSendAdapter(new Version(4,999))); + assertTrue(srcServer.net.getSendAdapter(new Version(5,0)) instanceof RPCSendV1); + assertTrue(srcServer.net.getSendAdapter(new Version(6,147)) instanceof RPCSendV1); + assertTrue(srcServer.net.getSendAdapter(new Version(6,148)) instanceof RPCSendV2); + assertTrue(srcServer.net.getSendAdapter(new Version(9,9999)) instanceof RPCSendV2); + } + + @Test public void requireThatMessagesCanBeSentAcrossAllSupportedVersions() throws Exception { - List<Version> versions = Arrays.asList(new Version(5, 0), new Version(5, 1)); + List<Version> versions = Arrays.asList( + new Version(5, 0), + new Version(6, 147), + new Version(6, 148) + ); + for (Version srcVersion : versions) { for (Version itrVersion : versions) { for (Version dstVersion : versions) { |