Fix some whitespace, simplify some test code

basho · Feb 21, 2017 · 83f7779 · lukebakken · Feb 21, 2017 · 83f7779
1 parent 3036f40
commit 83f7779
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 22 deletions.
diff --git a/src/main/java/com/basho/riak/client/api/commands/buckets/ListBuckets.java b/src/main/java/com/basho/riak/client/api/commands/buckets/ListBuckets.java
@@ -74,7 +74,7 @@ public final class ListBuckets extends StreamableRiakCommand.StreamableRiakComma
         this.timeout = builder.timeout;
         this.type = builder.type;
 
-        if (builder.allowListing == false)
+        if (!builder.allowListing)
         {
             throw new ListException();
         }
@@ -196,7 +196,7 @@ public Builder(String type)
          * </p>
          * @return a reference to this object.
          */
-            public Builder withAllowListing()
+        public Builder withAllowListing()
         {
             this.allowListing = true;
             return this;

diff --git a/src/main/java/com/basho/riak/client/api/commands/kv/ListKeys.java b/src/main/java/com/basho/riak/client/api/commands/kv/ListKeys.java
@@ -84,7 +84,7 @@ public final class ListKeys extends StreamableRiakCommand.StreamableRiakCommandW
         this.namespace = builder.namespace;
         this.timeout = builder.timeout;
 
-        if (builder.allowListing == false)
+        if (!builder.allowListing)
         {
             throw new ListException();
         }
@@ -193,7 +193,7 @@ public Builder(Namespace namespace)
          * </p>
          * @return a reference to this object.
          */
-            public Builder withAllowListing()
+        public Builder withAllowListing()
         {
             this.allowListing = true;
             return this;

diff --git a/src/main/java/com/basho/riak/client/api/commands/mapreduce/BucketMapReduce.java b/src/main/java/com/basho/riak/client/api/commands/mapreduce/BucketMapReduce.java
@@ -18,7 +18,7 @@ protected BucketMapReduce(BucketInput input, Builder builder) throws ListExcepti
     {
         super(input, builder);
 
-        if (builder.allowListing == false)
+        if (!builder.allowListing)
         {
             throw new ListException();
         }
@@ -48,7 +48,7 @@ protected Builder self()
          * </p>
          * @return a reference to this object.
          */
-            public Builder withAllowListing()
+        public Builder withAllowListing()
         {
             this.allowListing = true;
             return this;

diff --git a/src/main/java/com/basho/riak/client/api/commands/timeseries/ListKeys.java b/src/main/java/com/basho/riak/client/api/commands/timeseries/ListKeys.java
@@ -23,7 +23,7 @@ private ListKeys(ListKeys.Builder builder) throws ListException
         this.tableName = builder.tableName;
         this.timeout = builder.timeout;
 
-        if (builder.allowListing == false)
+        if (!builder.allowListing)
         {
             throw new ListException();
         }
@@ -69,7 +69,7 @@ public Builder(String tableName)
          * </p>
          * @return a reference to this object.
          */
-            public Builder withAllowListing()
+        public Builder withAllowListing()
         {
             this.allowListing = true;
             return this;

diff --git a/src/test/java/com/basho/riak/client/api/commands/buckets/ListBucketsTest.java b/src/test/java/com/basho/riak/client/api/commands/buckets/ListBucketsTest.java
@@ -71,22 +71,11 @@ private void testListBuckets(String bucketType) throws Exception
         Assert.assertEquals(ByteString.copyFrom(type.unsafeGetValue()), builder.getType());
     }
 
-    @Test
-    public void listBucketsThrowsListException()
+    @Test(expected = ListException.class)
+    public void listBucketsThrowsListException() throws ListException
     {
-        boolean sawException = false;
-
         ListBuckets.Builder b = new ListBuckets.Builder("bucket_type");
-        try
-        {
-            b.build();
-        }
-        catch (ListException ex)
-        {
-            sawException = true;
-        }
-
-        Assert.assertTrue(sawException);
+        b.build();
     }
 
     @Test