From 6c5effcdb1bfa1e65cdc2d2ea1b8d2fc545851a5 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Tue, 5 Nov 2013 14:00:47 -0800 Subject: [PATCH] Address error-prone empty statement warnings --- .../ParseImageListFromJsonResponseTest.java | 2 +- .../options/CreateServerOptionsTest.java | 2 +- .../options/CreateSharedIpGroupOptionsTest.java | 2 +- .../options/RebuildServerOptionsTest.java | 2 +- ...lockDeviceMappingToIndexedFormParamsTest.java | 2 +- .../BindBundleIdsToIndexedFormParamsTest.java | 2 +- .../BindFiltersToIndexedFormParamsTest.java | 2 +- .../BindGroupNamesToIndexedFormParamsTest.java | 2 +- .../BindInstanceIdsToIndexedFormParamsTest.java | 2 +- .../BindKeyNamesToIndexedFormParamsTest.java | 2 +- .../BindProductCodesToIndexedFormParamsTest.java | 2 +- .../BindPublicIpsToIndexedFormParamsTest.java | 2 +- .../BindResourceIdsToIndexedFormParamsTest.java | 2 +- .../BindUserGroupsToIndexedFormParamsTest.java | 2 +- ...pPairToSourceSecurityGroupFormParamsTest.java | 2 +- .../BindUserIdsToIndexedFormParamsTest.java | 2 +- .../BindVolumeIdsToIndexedFormParamsTest.java | 2 +- ...tNullBindAvailabilityZoneToFormParamTest.java | 2 +- .../org/jclouds/filesystem/utils/TestUtils.java | 2 +- .../nova/v2_0/features/ImageApiExpectTest.java | 6 +++--- .../nova/v2_0/features/ServerApiExpectTest.java | 16 ++++++++-------- .../BindS3ObjectMetadataToRequestTest.java | 2 +- .../BindSwiftObjectMetadataToRequestTest.java | 2 +- .../binders/BindBlobToMultipartFormTest.java | 2 +- .../binders/BindMapToHeadersWithPrefixTest.java | 2 +- .../BindUserMetadataToHeadersWithPrefixTest.java | 2 +- .../src/test/java/org/jclouds/apis/ApisTest.java | 2 +- .../org/jclouds/http/functions/ParseSaxTest.java | 2 +- .../org/jclouds/json/GsonExperimentsTest.java | 4 ++-- .../org/jclouds/providers/ProvidersTest.java | 2 +- .../binders/BindTagsToIndexedFormParamsTest.java | 2 +- .../binders/BindObjectMetadataToRequestTest.java | 2 +- .../BindAzureBlobMetadataToRequestTest.java | 2 +- 33 files changed, 43 insertions(+), 43 deletions(-) diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java index b6a9435df7..1bb4a5baac 100644 --- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/functions/ParseImageListFromJsonResponseTest.java @@ -89,7 +89,7 @@ public class ParseImageListFromJsonResponseTest { assertEquals(response.get(1).getId(), 743); assertEquals(response.get(1).getName(), "My Server Backup"); assertEquals(response.get(1).getCreated(), dateService.iso8601SecondsDateParse("2009-07-07T09:56:16-05:00")); - ; + assertEquals(response.get(1).getProgress(), Integer.valueOf(80)); assertEquals(response.get(1).getServerId(), Integer.valueOf(12)); assertEquals(response.get(1).getStatus(), ImageStatus.SAVING); diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateServerOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateServerOptionsTest.java index 1ed1d6a68f..1ab9f124da 100644 --- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateServerOptionsTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateServerOptionsTest.java @@ -48,7 +48,7 @@ public class CreateServerOptionsTest { private HttpRequest buildRequest(CreateServerOptions options) { injector.injectMembers(options); - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); options.bindToRequest(request, ImmutableMap.of("name", "foo", "imageId", "1", "flavorId", "2")); return request; } diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java index 4fe54fe581..4151c06e56 100644 --- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/CreateSharedIpGroupOptionsTest.java @@ -46,7 +46,7 @@ public class CreateSharedIpGroupOptionsTest { private HttpRequest buildRequest(CreateSharedIpGroupOptions options) { injector.injectMembers(options); - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); options.bindToRequest(request, ImmutableMap.of("name", "foo")); return request; } diff --git a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/RebuildServerOptionsTest.java b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/RebuildServerOptionsTest.java index 199b1abf1b..d9375b46f4 100644 --- a/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/RebuildServerOptionsTest.java +++ b/apis/cloudservers/src/test/java/org/jclouds/cloudservers/options/RebuildServerOptionsTest.java @@ -47,7 +47,7 @@ public class RebuildServerOptionsTest { private HttpRequest buildRequest(RebuildServerOptions options) { injector.injectMembers(options); - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); options.bindToRequest(request, new HashMap()); return request; } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParamsTest.java index 65e4f99240..86973e7185 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParamsTest.java @@ -58,7 +58,7 @@ public class BindBlockDeviceMappingToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeBlockDeviceMapping() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBundleIdsToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBundleIdsToIndexedFormParamsTest.java index 5e2043979c..57963732e4 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBundleIdsToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBundleIdsToIndexedFormParamsTest.java @@ -45,7 +45,7 @@ public class BindBundleIdsToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeArray() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindFiltersToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindFiltersToIndexedFormParamsTest.java index 3f7c7a26dd..a4edc1cb5f 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindFiltersToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindFiltersToIndexedFormParamsTest.java @@ -51,7 +51,7 @@ public class BindFiltersToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeMultimap() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindGroupNamesToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindGroupNamesToIndexedFormParamsTest.java index d2ab709150..6a6347220c 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindGroupNamesToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindGroupNamesToIndexedFormParamsTest.java @@ -45,7 +45,7 @@ public class BindGroupNamesToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeArray() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindInstanceIdsToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindInstanceIdsToIndexedFormParamsTest.java index 47bef98617..b5a932a26f 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindInstanceIdsToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindInstanceIdsToIndexedFormParamsTest.java @@ -45,7 +45,7 @@ public class BindInstanceIdsToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeArray() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindKeyNamesToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindKeyNamesToIndexedFormParamsTest.java index e493edf6df..230f678e8b 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindKeyNamesToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindKeyNamesToIndexedFormParamsTest.java @@ -45,7 +45,7 @@ public class BindKeyNamesToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeArray() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindProductCodesToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindProductCodesToIndexedFormParamsTest.java index fb22b20f14..f452a699dc 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindProductCodesToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindProductCodesToIndexedFormParamsTest.java @@ -46,7 +46,7 @@ public class BindProductCodesToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeIterable() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindPublicIpsToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindPublicIpsToIndexedFormParamsTest.java index 30675447df..ae9b79e48c 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindPublicIpsToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindPublicIpsToIndexedFormParamsTest.java @@ -45,7 +45,7 @@ public class BindPublicIpsToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeArray() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParamsTest.java index fe1917e9cf..e90d0e2824 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindResourceIdsToIndexedFormParamsTest.java @@ -45,7 +45,7 @@ public class BindResourceIdsToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeArray() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserGroupsToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserGroupsToIndexedFormParamsTest.java index a9929a254b..a58d480c65 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserGroupsToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserGroupsToIndexedFormParamsTest.java @@ -51,7 +51,7 @@ public class BindUserGroupsToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeIterable() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParamsTest.java index ed5dde15d3..eb8e9f8dcc 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserIdGroupPairToSourceSecurityGroupFormParamsTest.java @@ -48,7 +48,7 @@ public class BindUserIdGroupPairToSourceSecurityGroupFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeUserIdGroupPair() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserIdsToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserIdsToIndexedFormParamsTest.java index 2bca24c6e0..d816836ed7 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserIdsToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindUserIdsToIndexedFormParamsTest.java @@ -46,7 +46,7 @@ public class BindUserIdsToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeIterable() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindVolumeIdsToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindVolumeIdsToIndexedFormParamsTest.java index 897c5bf081..8208879506 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindVolumeIdsToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindVolumeIdsToIndexedFormParamsTest.java @@ -45,7 +45,7 @@ public class BindVolumeIdsToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeArray() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/IfNotNullBindAvailabilityZoneToFormParamTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/IfNotNullBindAvailabilityZoneToFormParamTest.java index 360eaca486..6ef75141a9 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/IfNotNullBindAvailabilityZoneToFormParamTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/IfNotNullBindAvailabilityZoneToFormParamTest.java @@ -52,7 +52,7 @@ public class IfNotNullBindAvailabilityZoneToFormParamTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeString() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/apis/filesystem/src/test/java/org/jclouds/filesystem/utils/TestUtils.java b/apis/filesystem/src/test/java/org/jclouds/filesystem/utils/TestUtils.java index d0c30623e7..3b9159ffbc 100644 --- a/apis/filesystem/src/test/java/org/jclouds/filesystem/utils/TestUtils.java +++ b/apis/filesystem/src/test/java/org/jclouds/filesystem/utils/TestUtils.java @@ -103,7 +103,7 @@ public class TestUtils { File file = new File(TARGET_BASE_DIR, containerName); if (!file.mkdirs()) { throw new IOException("Could not mkdir: " + file); - }; + } } /** diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java index 230d9d59f7..85407d15fa 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ImageApiExpectTest.java @@ -153,7 +153,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest { apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").getMetadata(imageId); fail("Expected an exception."); } catch (Exception e) { - ; + // expected } } @@ -208,7 +208,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest { apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").setMetadata(imageId, metadata); fail("Expected an exception."); } catch (Exception e) { - ; + // expected } } @@ -264,7 +264,7 @@ public class ImageApiExpectTest extends BaseNovaApiExpectTest { apiWhenServerExists.getImageApiForZone("az-1.region-a.geo-1").setMetadata(imageId, metadata); fail("Expected an exception."); } catch (Exception e) { - ; + // expected } } diff --git a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java index 8b2b0d1450..be780ebe25 100644 --- a/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java +++ b/apis/openstack-nova/src/test/java/org/jclouds/openstack/nova/v2_0/features/ServerApiExpectTest.java @@ -302,7 +302,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest { apiWhenServerDoesNotExist.getServerApiForZone("az-1.region-a.geo-1").createImageFromServer(imageName, serverId); fail("Expected an exception."); } catch (Exception e) { - ; + // expected } } @@ -348,7 +348,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest { apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").stop(serverId); fail("Expected an exception."); } catch (Exception e) { - ; + // expected } } @@ -394,7 +394,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest { apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").start(serverId); fail("Expected an exception."); } catch (Exception e) { - ; + // expected } } @@ -438,7 +438,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest { apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").getMetadata(serverId); fail("Expected an exception."); } catch (Exception e) { - ; + // expected } } @@ -493,7 +493,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest { apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").setMetadata(serverId, metadata); fail("Expected an exception."); } catch (Exception e) { - ; + // expected } } @@ -549,7 +549,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest { apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").setMetadata(serverId, metadata); fail("Expected an exception."); } catch (Exception e) { - ; + // expected } } @@ -600,7 +600,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest { apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").setMetadata(serverId, metadata); fail("Expected an exception."); } catch (Exception e) { - ; + // expected } } @@ -656,7 +656,7 @@ public class ServerApiExpectTest extends BaseNovaApiExpectTest { apiWhenServerExists.getServerApiForZone("az-1.region-a.geo-1").setMetadata(serverId, metadata); fail("Expected an exception."); } catch (Exception e) { - ; + // expected } } diff --git a/apis/s3/src/test/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequestTest.java b/apis/s3/src/test/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequestTest.java index 99fb1b8c28..eae3a50667 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequestTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequestTest.java @@ -115,7 +115,7 @@ public class BindS3ObjectMetadataToRequestTest extends BaseS3AsyncClientTest parser = createParser(); HttpRequest request = HttpRequest.builder().method("GET").endpoint("http://foohost").build(); - HttpResponse response = HttpResponse.builder().statusCode(304).message("Not Modified").build();; + HttpResponse response = HttpResponse.builder().statusCode(304).message("Not Modified").build(); Locator locator = createMock(Locator.class); expect(locator.getColumnNumber()).andReturn(1); expect(locator.getLineNumber()).andReturn(1); diff --git a/core/src/test/java/org/jclouds/json/GsonExperimentsTest.java b/core/src/test/java/org/jclouds/json/GsonExperimentsTest.java index 7bebe57abc..21b50d908d 100644 --- a/core/src/test/java/org/jclouds/json/GsonExperimentsTest.java +++ b/core/src/test/java/org/jclouds/json/GsonExperimentsTest.java @@ -175,8 +175,8 @@ public class GsonExperimentsTest { protected T parseThingFromReaderOrNull(String toFind, JsonReader reader, Type type) throws IOException { AtomicReference name = Atomics.newReference(); JsonToken token = reader.peek(); - for (; token != JsonToken.END_DOCUMENT && nnn(toFind, reader, token, name); token = skipAndPeek(token, reader)) - ; + for (; token != JsonToken.END_DOCUMENT && nnn(toFind, reader, token, name); token = skipAndPeek(token, reader)) { + } T val = gson. fromJson(reader, type); reader.close(); return val; diff --git a/core/src/test/java/org/jclouds/providers/ProvidersTest.java b/core/src/test/java/org/jclouds/providers/ProvidersTest.java index 40026c925d..83ed427eb3 100644 --- a/core/src/test/java/org/jclouds/providers/ProvidersTest.java +++ b/core/src/test/java/org/jclouds/providers/ProvidersTest.java @@ -49,7 +49,7 @@ public class ProvidersTest { providerMetadata = Providers.withId("fake-id"); fail("Looking for a provider with an id that doesn't exist should " + "throw an exception."); } catch (NoSuchElementException nsee) { - ; // Expected + // expected } providerMetadata = Providers.withId(testBlobstoreProvider.getId()); diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParamsTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParamsTest.java index d999b70075..2ae04227ca 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParamsTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/binders/BindTagsToIndexedFormParamsTest.java @@ -51,7 +51,7 @@ public class BindTagsToIndexedFormParamsTest { @Test(expectedExceptions = IllegalArgumentException.class) public void testMustBeArray() { - HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build();; + HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost").build(); binder.bindToRequest(request, new File("foo")); } diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/binders/BindObjectMetadataToRequestTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/binders/BindObjectMetadataToRequestTest.java index bd5a3ebc1b..4f5efd1f82 100644 --- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/binders/BindObjectMetadataToRequestTest.java +++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/binders/BindObjectMetadataToRequestTest.java @@ -75,7 +75,7 @@ public class BindObjectMetadataToRequestTest extends BaseS3AsyncClientTest