Add code to throw ListException for ListBuckets and timeseries ListKeys

Author: Luke Bakken

src/main/java/com/basho/riak/client/api/commands/buckets/ListBuckets.java

@@ -16,6 +16,7 @@
 package com.basho.riak.client.api.commands.buckets;
 
 import com.basho.riak.client.api.commands.ChunkedResponseIterator;
+import com.basho.riak.client.api.ListException;
 import com.basho.riak.client.api.StreamableRiakCommand;
 import com.basho.riak.client.core.FutureOperation;
 import com.basho.riak.client.core.StreamingRiakFuture;
@@ -68,10 +69,15 @@ public final class ListBuckets extends StreamableRiakCommand.StreamableRiakComma
     private final int timeout;
     private final BinaryValue type;
 
-    ListBuckets(Builder builder)
+    ListBuckets(Builder builder) throws ListException
     {
         this.timeout = builder.timeout;
         this.type = builder.type;
+
+        if (builder.allowListing == false)
+        {
+            throw new ListException();
+        }
     }
 
     @Override
@@ -170,6 +176,7 @@ public static class Builder
     {
         private int timeout;
         private final BinaryValue type;
+        private boolean allowListing;
 
         /**
          * Construct a Builder for a ListBuckets command.
@@ -180,6 +187,21 @@ public Builder(String type)
             this.type = BinaryValue.create(type);
         }
 
+        /**
+         * Allow this listing command
+         * <p>
+         * Bucket and key list operations are expensive and should not
+         * be used in production, however using this method will allow
+         * the command to be built.
+         * </p>
+         * @return a reference to this object.
+         */
+            public Builder withAllowListing()
+        {
+            this.allowListing = true;
+            return this;
+        }
+
         /**
          * Construct a Builder for a ListBuckets command.
          * @param type the bucket type.
@@ -208,7 +230,7 @@ public Builder withTimeout(int timeout)
          * Construct a new ListBuckets command.
          * @return a new ListBuckets command.
          */
-        public ListBuckets build()
+        public ListBuckets build() throws ListException
         {
             return new ListBuckets(this);
         }

src/main/java/com/basho/riak/client/api/commands/timeseries/ListKeys.java

@@ -1,5 +1,6 @@
 package com.basho.riak.client.api.commands.timeseries;
 
+import com.basho.riak.client.api.ListException;
 import com.basho.riak.client.api.AsIsRiakCommand;
 import com.basho.riak.client.core.operations.ts.ListKeysOperation;
 import com.basho.riak.client.core.query.timeseries.QueryResult;
@@ -17,10 +18,15 @@ public class ListKeys extends AsIsRiakCommand<QueryResult, String>
     private final String tableName;
     private final int timeout;
 
-    private ListKeys(ListKeys.Builder builder)
+    private ListKeys(ListKeys.Builder builder) throws ListException
     {
         this.tableName = builder.tableName;
         this.timeout = builder.timeout;
+
+        if (builder.allowListing == false)
+        {
+            throw new ListException();
+        }
     }
 
     @Override
@@ -43,6 +49,7 @@ public static class Builder
     {
         private final String tableName;
         private int timeout;
+        private boolean allowListing;
 
         /**
          * Construct a Builder for a Time Series ListKeys command.
@@ -53,6 +60,21 @@ public Builder(String tableName)
             this.tableName = tableName;
         }
 
+        /**
+         * Allow this listing command
+         * <p>
+         * Bucket and key list operations are expensive and should not
+         * be used in production, however using this method will allow
+         * the command to be built.
+         * </p>
+         * @return a reference to this object.
+         */
+            public Builder withAllowListing()
+        {
+            this.allowListing = true;
+            return this;
+        }
+
         /**
          * Set the Riak-side timeout value.
          * <p>
@@ -77,7 +99,7 @@ public Builder withTimeout(int timeout)
          * Construct a Time Series ListKeys object.
          * @return a new Time Series ListKeys instance.
          */
-        public ListKeys build()
+        public ListKeys build() throws ListException
         {
             return new ListKeys(this);
         }

src/test/java/com/basho/riak/client/api/commands/buckets/ListBucketsTest.java

@@ -1,5 +1,6 @@
 package com.basho.riak.client.api.commands.buckets;
 
+import com.basho.riak.client.api.ListException;
 import com.basho.riak.client.api.RiakClient;
 import com.basho.riak.client.core.*;
 import com.basho.riak.client.core.operations.ListBucketsOperation;
@@ -56,7 +57,7 @@ public void init() throws Exception
     private void testListBuckets(String bucketType) throws Exception
     {
         final BinaryValue type = BinaryValue.createFromUtf8(bucketType);
-        ListBuckets.Builder list = new ListBuckets.Builder(type);
+        ListBuckets.Builder list = new ListBuckets.Builder(type).withAllowListing();
         client.execute(list.build());
 
         ArgumentCaptor<FutureOperation> captor =
@@ -70,6 +71,24 @@ private void testListBuckets(String bucketType) throws Exception
         Assert.assertEquals(ByteString.copyFrom(type.unsafeGetValue()), builder.getType());
     }
 
+    @Test
+    public void listBucketsThrowsListException()
+    {
+        boolean sawException = false;
+
+        ListBuckets.Builder b = new ListBuckets.Builder("bucket_type");
+        try
+        {
+            b.build();
+        }
+        catch (ListException ex)
+        {
+            sawException = true;
+        }
+
+        Assert.assertTrue(sawException);
+    }
+
     @Test
     public void bucketTypeBuiltCorrectly() throws Exception
     {

src/test/java/com/basho/riak/client/api/commands/buckets/itest/ITestListBuckets.java

@@ -16,6 +16,7 @@
 
 package com.basho.riak.client.api.commands.buckets.itest;
 
+import com.basho.riak.client.api.ListException;
 import com.basho.riak.client.api.RiakClient;
 import com.basho.riak.client.api.commands.buckets.ListBuckets;
 import com.basho.riak.client.api.commands.kv.StoreValue;
@@ -35,6 +36,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
 /**
@@ -91,7 +93,15 @@ public void testListBucketsStreamingTestType() throws InterruptedException, Exec
 
     private void testListBuckets(Namespace namespace) throws InterruptedException, ExecutionException
     {
-        ListBuckets listBucketsCommand = new ListBuckets.Builder(namespace.getBucketType()).build();
+        ListBuckets listBucketsCommand = null;
+        try
+        {
+            listBucketsCommand = new ListBuckets.Builder(namespace.getBucketType()).withAllowListing().build();
+        }
+        catch (ListException ex)
+        {
+            fail(ex.getMessage());
+        }
 
         final ListBuckets.Response listResponse = client.execute(listBucketsCommand);
 
@@ -109,7 +119,15 @@ private void testListBuckets(Namespace namespace) throws InterruptedException, E
 
     private void testListBucketsStreaming(Namespace namespace) throws InterruptedException, ExecutionException
     {
-        ListBuckets listBucketsCommand = new ListBuckets.Builder(namespace.getBucketType()).build();
+        ListBuckets listBucketsCommand = null;
+        try
+        {
+            listBucketsCommand = new ListBuckets.Builder(namespace.getBucketType()).withAllowListing().build();
+        }
+        catch (ListException ex)
+        {
+            fail(ex.getMessage());
+        }
 
         final RiakFuture<ListBuckets.Response, BinaryValue> streamingFuture =
                 client.executeAsyncStreaming(listBucketsCommand, 500);

src/test/java/com/basho/riak/client/api/commands/buckets/itest/ITestListKeys.java

@@ -35,6 +35,7 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeTrue;
 
 /**
@@ -66,11 +67,19 @@ public static void cleanup() throws ExecutionException, InterruptedException
     }
 
     @Test
-    public void testLargeStreamingListKeys() throws ListException, ExecutionException, InterruptedException
+    public void testLargeStreamingListKeys() throws ExecutionException, InterruptedException
     {
         assumeTrue(testBucketType);
 
-        ListKeys lk = new ListKeys.Builder(typedNamespace).withAllowListing().build();
+        ListKeys lk = null;
+        try
+        {
+            lk = new ListKeys.Builder(typedNamespace).withAllowListing().build();
+        }
+        catch (ListException ex)
+        {
+            fail(ex.getMessage());
+        }
 
         final RiakFuture<ListKeys.Response, Namespace> streamFuture =
                 client.executeAsyncStreaming(lk, 200);

src/test/java/com/basho/riak/client/api/commands/itest/ITestTimeSeries.java

@@ -1,5 +1,6 @@
 package com.basho.riak.client.api.commands.itest;
 
+import com.basho.riak.client.api.ListException;
 import com.basho.riak.client.api.RiakClient;
 import com.basho.riak.client.api.commands.buckets.FetchBucketProperties;
 import com.basho.riak.client.api.commands.buckets.StoreBucketProperties;
@@ -121,7 +122,15 @@ public void test_d_TestListingKeysReturnsThem() throws ExecutionException, Inter
     {
         RiakClient client = new RiakClient(cluster);
 
-        ListKeys listKeys = new ListKeys.Builder(tableName).build();
+        ListKeys listKeys = null;
+        try
+        {
+            listKeys = new ListKeys.Builder(tableName).withAllowListing().build();
+        }
+        catch (ListException ex)
+        {
+            fail(ex.getMessage());
+        }
 
         final RiakFuture<QueryResult, String> listKeysFuture = client.executeAsync(listKeys);