diff options
author | Tor Brede Vekterli <vekterli@oath.com> | 2018-05-23 13:21:14 +0200 |
---|---|---|
committer | Tor Brede Vekterli <vekterli@oath.com> | 2018-05-23 13:21:14 +0200 |
commit | ba71c97878bccd6a3a1605610312749db043916f (patch) | |
tree | 5cdc4172756196599d566b5bb74930210c630f78 /vespaclient-java/src/main/java/com | |
parent | bbfa8456064e99c65ea4e78902d4fb02591ee7f3 (diff) |
Set route on send session instead of individual messages
Session route is "default" unless otherwise specified, which overrides
per-message routes. This means that the route parameter has not worked
as expected.
Diffstat (limited to 'vespaclient-java/src/main/java/com')
-rw-r--r-- | vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsRetriever.java | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsRetriever.java b/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsRetriever.java index 1c855455a37..d42faf418a1 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsRetriever.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespastat/BucketStatsRetriever.java @@ -33,7 +33,6 @@ public class BucketStatsRetriever { private final MessageBusSyncSession session; private final MessageBusDocumentAccess documentAccess; - private final String route; public BucketStatsRetriever( DocumentAccessFactory documentAccessFactory, @@ -42,7 +41,7 @@ public class BucketStatsRetriever { registerShutdownHook(registrar); this.documentAccess = documentAccessFactory.createDocumentAccess(); this.session = documentAccess.createSyncSession(new SyncParameters.Builder().build()); - this.route = route; + this.session.setRoute(route); } private void registerShutdownHook(ShutdownHookRegistrar registrar) { @@ -102,19 +101,10 @@ public class BucketStatsRetriever { private <T extends Reply> T sendMessage(DocumentMessage msg, Class<T> expectedReply) throws BucketStatsException { - setRoute(msg, route); Reply reply = session.syncSend(msg); return validateReply(reply, expectedReply); } - private static void setRoute(DocumentMessage msg, String route) throws BucketStatsException { - try { - msg.setRoute(Route.parse(route)); - } catch (Exception e) { - throw new BucketStatsException(String.format("Invalid route: '%s'.", route)); - } - } - private static <T extends Reply> T validateReply(Reply reply, Class<T> type) throws BucketStatsException { if (reply.hasErrors()) { throw new BucketStatsException(makeErrorMessage(reply)); |