From ba71c97878bccd6a3a1605610312749db043916f Mon Sep 17 00:00:00 2001
From: Tor Brede Vekterli <vekterli@oath.com>
Date: Wed, 23 May 2018 13:21:14 +0200
Subject: 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.
---
 .../main/java/com/yahoo/vespastat/BucketStatsRetriever.java  | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

(limited to 'vespaclient-java/src/main/java/com/yahoo')

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));
-- 
cgit v1.2.3