Copy tags from additional query options (#276)

Signed-off-by: Alban Dericbourg <[email protected]>
rickfast · Nov 30, 2017 · d04ad93 · d04ad93
1 parent 41d49b3
commit d04ad93
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/com/orbitz/consul/cache/ConsulCache.java b/src/main/java/com/orbitz/consul/cache/ConsulCache.java
@@ -221,13 +221,16 @@ protected static QueryOptions watchParams(final BigInteger index, final int bloc
         checkArgument(!queryOptions.getIndex().isPresent() && !queryOptions.getWait().isPresent(),
                 "Index and wait cannot be overridden");
 
-        return ImmutableQueryOptions.builder()
+        ImmutableQueryOptions.Builder builder =  ImmutableQueryOptions.builder()
                 .from(watchDefaultParams(index, blockSeconds))
                 .token(queryOptions.getToken())
                 .consistencyMode(queryOptions.getConsistencyMode())
                 .near(queryOptions.getNear())
-                .datacenter(queryOptions.getDatacenter())
-                .build();
+                .datacenter(queryOptions.getDatacenter());
+        for (String tag : queryOptions.getTag()) {
+            builder.addTag(tag);
+        }
+        return builder.build();
     }
 
     private static QueryOptions watchDefaultParams(final BigInteger index, final int blockSeconds) {

diff --git a/src/test/java/com/orbitz/consul/cache/ConsulCacheTest.java b/src/test/java/com/orbitz/consul/cache/ConsulCacheTest.java
@@ -386,6 +386,7 @@ public void testWatchParamsWithAdditionalOptions() {
         BigInteger index = new BigInteger("12");
         QueryOptions additionalOptions = ImmutableQueryOptions.builder()
                 .consistencyMode(ConsistencyMode.STALE)
+                .addTag("someTag")
                 .token("186596")
                 .near("156892")
                 .build();
@@ -394,6 +395,7 @@ public void testWatchParamsWithAdditionalOptions() {
                 .index(index)
                 .wait("10s")
                 .consistencyMode(ConsistencyMode.STALE)
+                .addTag("someTag")
                 .token("186596")
                 .near("156892")
                 .build();