Address Xlint warnings

rackspace · Mar 14, 2013 · 371db8d · 371db8d
1 parent 2e1cc3c
commit 371db8d
Show file tree

Hide file tree

Showing 48 changed files with 64 additions and 63 deletions.
diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosAsyncBlobStore.java b/apis/atmos/src/main/java/org/jclouds/atmos/blobstore/AtmosAsyncBlobStore.java
@@ -222,7 +222,7 @@ public ListenableFuture<PageSet<? extends StorageMetadata>> list(String containe
       ListenableFuture<BoundedSet<? extends DirectoryEntry>> returnVal = async.listDirectory(container, nativeOptions);
       ListenableFuture<PageSet<? extends StorageMetadata>> list = transform(returnVal, container2ResourceList,
             userExecutor);
-      return (ListenableFuture<PageSet<? extends StorageMetadata>>) (options.isDetailed() ? transform(list,
+      return (options.isDetailed() ? transform(list,
                fetchBlobMetadataProvider.get().setContainerName(container)) : list);
    }
 

diff --git a/apis/atmos/src/main/java/org/jclouds/atmos/util/AtmosUtils.java b/apis/atmos/src/main/java/org/jclouds/atmos/util/AtmosUtils.java
@@ -63,7 +63,7 @@ public class AtmosUtils {
 
    public AtmosError parseAtmosErrorFromContent(HttpCommand command, HttpResponse response, InputStream content)
             throws HttpException {
-      AtmosError error = (AtmosError) factory.create(errorHandlerProvider.get()).parse(content);
+      AtmosError error = factory.create(errorHandlerProvider.get()).parse(content);
       if (error.getCode() == 1032) {
          error.setStringSigned(signer.createStringToSign(command.getCurrentRequest()));
       }

diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java
@@ -103,7 +103,7 @@ public void testSignPutBlob() throws ArrayIndexOutOfBoundsException, SecurityExc
                request,
                "Accept: */*\nDate: Thu, 05 Jun 2008 16:38:19 GMT\nExpect: 100-continue\nx-emc-signature: 7Cbdnu+YA5rG9J/C9RlHk07mU7w=\nx-emc-uid: identity\n");
 
-      assertContentHeadersEqual(request, "text/plain", null, null, null, (long) 2l, new byte[] { 0, 2, 4, 8 }, new Date(1000));
+      assertContentHeadersEqual(request, "text/plain", null, null, null, 2L, new byte[] { 0, 2, 4, 8 }, new Date(1000));
 
       assertEquals(request.getFilters().size(), 0);
    }

diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/xml/ErrorHandlerTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/xml/ErrorHandlerTest.java
@@ -37,7 +37,7 @@
 public class ErrorHandlerTest extends BaseHandlerTest {
 
    ParseSax<AtmosError> createParser() {
-      ParseSax<AtmosError> parser = (ParseSax<AtmosError>) factory.create(injector
+      ParseSax<AtmosError> parser = factory.create(injector
                .getInstance(ErrorHandler.class));
       return parser;
    }

diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/xml/ListDirectoryResponseHandlerTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/xml/ListDirectoryResponseHandlerTest.java
@@ -41,7 +41,7 @@
 public class ListDirectoryResponseHandlerTest extends BaseHandlerTest {
 
    ParseSax<Set<DirectoryEntry>> createParser() {
-      ParseSax<Set<DirectoryEntry>> parser = (ParseSax<Set<DirectoryEntry>>) factory
+      ParseSax<Set<DirectoryEntry>> parser = factory
                .create(injector.getInstance(ListDirectoryResponseHandler.class));
       return parser;
    }

diff --git a/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/MapToServerInfoTest.java b/apis/cloudsigma/src/test/java/org/jclouds/cloudsigma/functions/MapToServerInfoTest.java
@@ -67,7 +67,7 @@ public class MapToServerInfoTest {
                            "tcp/23", "tcp/25", "tcp/110", "tcp/143", "tcp/43595")).build()))
          .devices(
                ImmutableMap.of("ide:0:0",
-                     new IDEDevice.Builder((int) 0, (int) 0).uuid("4af85ed3-0caa-4736-8a26-a33d7de0a122").build()
+                     new IDEDevice.Builder(0, 0).uuid("4af85ed3-0caa-4736-8a26-a33d7de0a122").build()
 
                ))
          .metrics(
@@ -95,7 +95,7 @@ public class MapToServerInfoTest {
          .devices(
                ImmutableMap.of(
                      "ide:0:0",
-                     new IDEDevice.Builder((int) 0, (int) 0).uuid("853bb98a-4fff-4c2f-a265-97c363f19ea5")
+                     new IDEDevice.Builder(0, 0).uuid("853bb98a-4fff-4c2f-a265-97c363f19ea5")
                            .mediaType(MediaType.CDROM).build()))
          .metrics(
                new ServerMetrics.Builder().driveMetrics(ImmutableMap.of("ide:0:0", new DriveMetrics.Builder().build()))
@@ -143,7 +143,7 @@ public void testComplete() throws IOException {
                            "tcp/23", "tcp/25", "tcp/110", "tcp/143", "tcp/43595")).build()))
          .devices(
                ImmutableMap.of("ide:0:0",
-                     new IDEDevice.Builder((int) 0, (int) 0).uuid("403c9a86-0aab-4e47-aa95-e9768021c4c1").build()
+                     new IDEDevice.Builder(0, 0).uuid("403c9a86-0aab-4e47-aa95-e9768021c4c1").build()
 
                ))
          .metrics(

diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/internal/BaseCloudStackExpectTest.java
@@ -53,7 +53,7 @@ protected ApiMetadata createApiMetadata() {
 
    @Override
    public S createClient(Function<HttpRequest, HttpResponse> fn, Module module, Properties props) {
-      return (S) clientFrom(createInjector(fn, module, props).getInstance(CloudStackContext.class));
+      return clientFrom(createInjector(fn, module, props).getInstance(CloudStackContext.class));
    }
 
    protected abstract S clientFrom(CloudStackContext context);

diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeImagesResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeImagesResponseHandlerTest.java
@@ -124,7 +124,7 @@ protected void configure() {
          }
 
       });
-      ParseSax<Set<Image>> parser = (ParseSax<Set<Image>>) injector.getInstance(ParseSax.Factory.class).create(
+      ParseSax<Set<Image>> parser = injector.getInstance(ParseSax.Factory.class).create(
                injector.getInstance(DescribeImagesResponseHandler.class));
       return parser;
    }

diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeInstancesResponseHandlerTest.java
@@ -162,7 +162,7 @@ protected void configure() {
          }
 
       });
-      ParseSax<Set<Reservation<? extends RunningInstance>>> parser = (ParseSax<Set<Reservation<? extends RunningInstance>>>) injector
+      ParseSax<Set<Reservation<? extends RunningInstance>>> parser = injector
                .getInstance(ParseSax.Factory.class)
                .create(injector.getInstance(DescribeInstancesResponseHandler.class));
       return parser;

diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToServerInfoTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToServerInfoTest.java
@@ -67,7 +67,7 @@ public class MapToServerInfoTest {
                            "tcp/23", "tcp/25", "tcp/110", "tcp/143", "tcp/43595")).build()))
          .devices(
                ImmutableMap.of("ide:0:0",
-                     new IDEDevice.Builder((int) 0, (int) 0).uuid("4af85ed3-0caa-4736-8a26-a33d7de0a122").build()
+                     new IDEDevice.Builder(0, 0).uuid("4af85ed3-0caa-4736-8a26-a33d7de0a122").build()
 
                ))
          .metrics(
@@ -95,7 +95,7 @@ public class MapToServerInfoTest {
          .devices(
                ImmutableMap.of(
                      "ide:0:0",
-                     new IDEDevice.Builder((int) 0, (int) 0).uuid("853bb98a-4fff-4c2f-a265-97c363f19ea5")
+                     new IDEDevice.Builder(0, 0).uuid("853bb98a-4fff-4c2f-a265-97c363f19ea5")
                            .mediaType(MediaType.CDROM).build()))
          .metrics(
                new ServerMetrics.Builder().driveMetrics(ImmutableMap.of("ide:0:0", new DriveMetrics.Builder().build()))
@@ -149,7 +149,7 @@ public void testComplete() throws IOException {
                            "tcp/23", "tcp/25", "tcp/110", "tcp/143", "tcp/43595")).build()))
          .devices(
                ImmutableMap.of("ide:0:0",
-                     new IDEDevice.Builder((int) 0, (int) 0).uuid("403c9a86-0aab-4e47-aa95-e9768021c4c1").build()
+                     new IDEDevice.Builder(0, 0).uuid("403c9a86-0aab-4e47-aa95-e9768021c4c1").build()
 
                ))
          .metrics(

diff --git a/apis/s3/src/test/java/org/jclouds/s3/xml/AccessControlListHandlerTest.java b/apis/s3/src/test/java/org/jclouds/s3/xml/AccessControlListHandlerTest.java
@@ -42,7 +42,7 @@ public class AccessControlListHandlerTest extends BaseHandlerTest {
    public static final String aclExtreme = "<AccessControlPolicy xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><Owner><ID>1a405254c932b52e5b5caaa88186bc431a1bacb9ece631f835daddaf0c47677c</ID><DisplayName>jamesmurty</DisplayName></Owner><AccessControlList><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Group\"><URI>http://acs.amazonaws.com/groups/global/AuthenticatedUsers</URI></Grantee><Permission>WRITE</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Group\"><URI>http://acs.amazonaws.com/groups/global/AuthenticatedUsers</URI></Grantee><Permission>READ_ACP</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"CanonicalUser\"><ID>1a405254c932b52e5b5caaa88186bc431a1bacb9ece631f835daddaf0c47677c</ID><DisplayName>jamesmurty</DisplayName></Grantee><Permission>WRITE</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Group\"><URI>http://acs.amazonaws.com/groups/global/AuthenticatedUsers</URI></Grantee><Permission>WRITE_ACP</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Group\"><URI>http://acs.amazonaws.com/groups/global/AllUsers</URI></Grantee><Permission>READ</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Group\"><URI>http://acs.amazonaws.com/groups/global/AuthenticatedUsers</URI></Grantee><Permission>READ</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"Group\"><URI>http://acs.amazonaws.com/groups/s3/LogDelivery</URI></Grantee><Permission>WRITE</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"CanonicalUser\"><ID>1a405254c932b52e5b5caaa88186bc431a1bacb9ece631f835daddaf0c47677c</ID><DisplayName>jamesmurty</DisplayName></Grantee><Permission>READ</Permission></Grant><Grant><Grantee xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:type=\"CanonicalUser\"><ID>1a405254c932b52e5b5caaa88186bc431a1bacb9ece631f835daddaf0c47677c</ID><DisplayName>jamesmurty</DisplayName></Grantee><Permission>FULL_CONTROL</Permission></Grant></AccessControlList></AccessControlPolicy>";
 
    ParseSax<AccessControlList> createParser() {
-      ParseSax<AccessControlList> parser = (ParseSax<AccessControlList>) factory.create(injector
+      ParseSax<AccessControlList> parser = factory.create(injector
                .getInstance(AccessControlListHandler.class));
       return parser;
    }

diff --git a/apis/s3/src/test/java/org/jclouds/s3/xml/CopyObjectHandlerTest.java b/apis/s3/src/test/java/org/jclouds/s3/xml/CopyObjectHandlerTest.java
@@ -55,7 +55,7 @@ public void testApplyInputStream() {
                .iso8601DateParse("2009-03-19T13:23:27.000Z"),
                "\"92836a3ea45a6984d1b4d23a747d46bb\"");
 
-      ObjectMetadata result = (ObjectMetadata) factory.create(
+      ObjectMetadata result = factory.create(
                injector.getInstance(CopyObjectHandler.class)).parse(is);
 
       assertEquals(result, expected);

diff --git a/apis/s3/src/test/java/org/jclouds/s3/xml/PayerHandlerTest.java b/apis/s3/src/test/java/org/jclouds/s3/xml/PayerHandlerTest.java
@@ -37,7 +37,7 @@
 public class PayerHandlerTest extends BaseHandlerTest {
 
    ParseSax<Payer> createParser() {
-      ParseSax<Payer> parser = (ParseSax<Payer>) factory.create(injector
+      ParseSax<Payer> parser = factory.create(injector
                .getInstance(PayerHandler.class));
       return parser;
    }

diff --git a/apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java b/apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java
@@ -139,15 +139,15 @@ public void testCanParseListContainerResult() throws HttpException {
    }
 
    private ListBucketResponse runParseListContainerResult() throws HttpException {
-      return (ListBucketResponse) factory.create(injector.getInstance(ListBucketHandler.class)).setContext(
+      return factory.create(injector.getInstance(ListBucketHandler.class)).setContext(
                HttpRequest.builder().method("GET").endpoint("http://bucket.com").build()).parse(
                Strings2.toInputStream(listContainerResult));
    }
 
    public static final String successfulCopyObject200 = "<CopyObjectResult xmlns=\"http://s3.amazonaws.com/doc/2006-03-01/\"><LastModified>2009-03-19T13:23:27.000Z</LastModified><ETag>\"92836a3ea45a6984d1b4d23a747d46bb\"</ETag></CopyObjectResult>";
 
    private ObjectMetadata runParseCopyObjectResult() throws HttpException {
-      return (ObjectMetadata) factory.create(injector.getInstance(CopyObjectHandler.class)).parse(
+      return factory.create(injector.getInstance(CopyObjectHandler.class)).parse(
                Strings2.toInputStream(successfulCopyObject200));
    }
 

diff --git a/.../jclouds/sqs/binders/BindChangeMessageVisibilityBatchRequestEntryToIndexedFormParams.java b/.../jclouds/sqs/binders/BindChangeMessageVisibilityBatchRequestEntryToIndexedFormParams.java
@@ -42,7 +42,7 @@ protected BindChangeMessageVisibilityBatchRequestEntryToIndexedFormParams() {
    }
 
    public Map<String, String> idReceiptHandle(Iterable<String> input) {
-      return Maps.uniqueIndex((Iterable<String>) input, new Function<String, String>() {
+      return Maps.uniqueIndex(input, new Function<String, String>() {
          int index = 1;
 
          @Override

diff --git a/...rg/jclouds/sqs/binders/BindSendMessageBatchRequestEntryWithDelaysToIndexedFormParams.java b/...rg/jclouds/sqs/binders/BindSendMessageBatchRequestEntryWithDelaysToIndexedFormParams.java
@@ -41,7 +41,7 @@ protected BindSendMessageBatchRequestEntryWithDelaysToIndexedFormParams() {
    }
 
    public Map<String, String> idMessageBody(Iterable<String> input) {
-      return Maps.uniqueIndex((Iterable<String>) input, new Function<String, String>() {
+      return Maps.uniqueIndex(input, new Function<String, String>() {
          int index = 1;
 
          @Override

diff --git a/apis/sts/src/test/java/org/jclouds/aws/xml/ErrorHandlerTest.java b/apis/sts/src/test/java/org/jclouds/aws/xml/ErrorHandlerTest.java
@@ -38,7 +38,7 @@ public class ErrorHandlerTest extends BaseHandlerTest {
    public static final String errorFromAmazonIfYouDontRemoveTransferEncodingHeader = "<Error><Code>NotImplemented</Code><Message>A header you provided implies functionality that is not implemented</Message><Header>Transfer-Encoding</Header><RequestId>7C59925D75D15561</RequestId><HostId>fbskVU51OZJg2yZS/wNIxoE2PmCf0ZqFd0iH6Vrzw0uKG3KmokswBytL/Bfp/GWb</HostId></Error>";
 
    ParseSax<AWSError> createParser() {
-      ParseSax<AWSError> parser = (ParseSax<AWSError>) factory.create(injector.getInstance(ErrorHandler.class));
+      ParseSax<AWSError> parser = factory.create(injector.getInstance(ErrorHandler.class));
       return parser;
    }
 

diff --git a/.../jclouds/openstack/swift/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java b/.../jclouds/openstack/swift/blobstore/strategy/internal/MultipartUploadSlicingAlgorithm.java
@@ -74,7 +74,7 @@ protected long calculateChunkSize(long length) {
       long unitPartSize = defaultPartSize; // first try with default part size
       int parts = (int)(length / unitPartSize);
       long partSize = unitPartSize;
-      int magnitude = (int) (parts / magnitudeBase);
+      int magnitude = parts / magnitudeBase;
       if (magnitude > 0) {
          partSize = magnitude * unitPartSize;
          if (partSize > MultipartUpload.MAX_PART_SIZE) {

diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/options/CreateContainerOptions.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/options/CreateContainerOptions.java
@@ -68,7 +68,7 @@ public static CreateContainerOptions withPublicAccess() {
 
       public static CreateContainerOptions withMetadata(Map<String, String> metadata) {
          CreateContainerOptions options = new CreateContainerOptions();
-         return (CreateContainerOptions) options.withMetadata(metadata);
+         return options.withMetadata(metadata);
       }
 
    }

diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/util/VCloudUtils.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/util/VCloudUtils.java
@@ -59,7 +59,7 @@ public VCloudError parseErrorFromContent(HttpRequest request, HttpResponse respo
       String contentType = response.getPayload().getContentMetadata().getContentType();
       if (contentType != null && contentType.startsWith(VCloudMediaType.ERROR_XML)) {
          try {
-            return (VCloudError) factory.create(errorHandlerProvider.get()).setContext(request).apply(response);
+            return factory.create(errorHandlerProvider.get()).setContext(request).apply(response);
          } catch (RuntimeException e) {
             logger.warn(e, "error parsing error");
          }

diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/CatalogHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/CatalogHandlerTest.java
@@ -55,7 +55,7 @@ public void testVCloud1_0() {
       InputStream is = getClass().getResourceAsStream("/catalog-blank.xml");
       injector = Guice.createInjector(new SaxParserModule());
       factory = injector.getInstance(ParseSax.Factory.class);
-      Catalog result = (Catalog) factory.create(injector.getInstance(CatalogHandler.class)).parse(is);
+      Catalog result = factory.create(injector.getInstance(CatalogHandler.class)).parse(is);
       assertEquals(result, new CatalogImpl("Jclouds-private", "application/vnd.vmware.vcloud.catalog+xml", URI
                .create("https://vcenterprise.bluelock.com/api/v1.0/catalog/921222081"), new ReferenceTypeImpl(null,
                "application/vnd.vmware.vcloud.org+xml", URI
@@ -67,7 +67,7 @@ public void testTerremark() {
       InputStream is = getClass().getResourceAsStream("/catalog.xml");
       injector = Guice.createInjector(new SaxParserModule());
       factory = injector.getInstance(ParseSax.Factory.class);
-      Catalog result = (Catalog) factory.create(injector.getInstance(CatalogHandler.class)).parse(is);
+      Catalog result = factory.create(injector.getInstance(CatalogHandler.class)).parse(is);
       assertEquals(result.getName(), "Miami Environment 1");
       assert result.getDescription() == null;
 

diff --git a/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/OrgHandlerTest.java b/apis/vcloud/src/test/java/org/jclouds/vcloud/xml/OrgHandlerTest.java
@@ -55,7 +55,7 @@ public void testApplyInputStream() {
       Injector injector = Guice.createInjector(new SaxParserModule());
       Factory factory = injector.getInstance(ParseSax.Factory.class);
 
-      Org result = (Org) factory.create(injector.getInstance(OrgHandler.class)).parse(is);
+      Org result = factory.create(injector.getInstance(OrgHandler.class)).parse(is);
       assertEquals(result.getName(), "ExampleOrg");
       assertEquals(result.getFullName(), "ExampleOrg");
       assertEquals(result.getDescription(), "Example Corp's Primary Organization.");
@@ -80,7 +80,7 @@ public void testTerremark() {
       Injector injector = Guice.createInjector(new SaxParserModule());
       Factory factory = injector.getInstance(ParseSax.Factory.class);
 
-      Org result = (Org) factory.create(injector.getInstance(OrgHandler.class)).parse(is);
+      Org result = factory.create(injector.getInstance(OrgHandler.class)).parse(is);
       assertEquals(result.getName(), "adrian@jclouds.org");
       assertEquals(result.getFullName(), "adrian@jclouds.org");
       assertEquals(result.getHref(), URI.create("https://services.vcloudexpress.terremark.com/api/v0.8/org/48"));
@@ -98,7 +98,7 @@ public void testHosting() {
       InputStream is = getClass().getResourceAsStream("/org-hosting.xml");
       Injector injector = Guice.createInjector(new SaxParserModule());
       Factory factory = injector.getInstance(ParseSax.Factory.class);
-      Org result = (Org) factory.create(injector.getInstance(OrgHandler.class)).parse(is);
+      Org result = factory.create(injector.getInstance(OrgHandler.class)).parse(is);
       assertEquals(result.getName(), "Customer 188849");
       assertEquals(result.getFullName(), "Customer 188849");
       assertEquals(result.getHref(), URI.create("https://vcloud.safesecureweb.com/api/v0.8/org/188849"));
@@ -115,7 +115,7 @@ public void testSavvis() {
       InputStream is = getClass().getResourceAsStream("/org-savvis.xml");
       Injector injector = Guice.createInjector(new SaxParserModule());
       Factory factory = injector.getInstance(ParseSax.Factory.class);
-      Org result = (Org) factory.create(injector.getInstance(OrgHandler.class)).parse(is);
+      Org result = factory.create(injector.getInstance(OrgHandler.class)).parse(is);
       assertEquals(result, new OrgImpl("607968.0", null, null, "607968.0", "Gravitant Inc", ImmutableMap
                .<String, ReferenceType> of(), ImmutableMap.<String, ReferenceType> of("GravDataCenter1(Saved)",
                new ReferenceTypeImpl("GravDataCenter1(Saved)", "application/vnd.vmware.vcloud.vdc+xml", URI

diff --git a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java
@@ -83,7 +83,7 @@ public void testSignPutBlob() throws ArrayIndexOutOfBoundsException, SecurityExc
       assertNonPayloadHeadersEqual(
                request,
                "Authorization: Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==\nContent-Length: 2\nContent-MD5: AAIECA==\nContent-Type: text/plain\n");
-      assertContentHeadersEqual(request, "text/plain", null, null, null, (long) 2l, new byte[] { 0, 2, 4, 8 }, null);
+      assertContentHeadersEqual(request, "text/plain", null, null, null, 2L, new byte[] { 0, 2, 4, 8 }, null);
 
       assertEquals(request.getFilters().size(), 0);
    }
@@ -101,7 +101,7 @@ public void testSignPutBlobWithGenerate() throws ArrayIndexOutOfBoundsException,
       assertNonPayloadHeadersEqual(
                request,
                "Authorization: Basic aWRlbnRpdHk6Y3JlZGVudGlhbA==\nContent-Length: 3\nContent-MD5: rL0Y20zC+Fzt72VPzMSk2A==\nContent-Type: text/plain\n");
-      assertContentHeadersEqual(request, "text/plain", null, null, null, (long) 3l, md5, null);
+      assertContentHeadersEqual(request, "text/plain", null, null, null, 3L, md5, null);
 
       assertEquals(request.getFilters().size(), 0);
    }

diff --git a/common/azure/src/test/java/org/jclouds/azure/storage/xml/ErrorHandlerTest.java b/common/azure/src/test/java/org/jclouds/azure/storage/xml/ErrorHandlerTest.java
@@ -37,7 +37,7 @@
 public class ErrorHandlerTest extends BaseHandlerTest {
 
    ParseSax<AzureStorageError> createParser() {
-      ParseSax<AzureStorageError> parser = (ParseSax<AzureStorageError>) factory.create(injector
+      ParseSax<AzureStorageError> parser = factory.create(injector
                .getInstance(ErrorHandler.class));
       return parser;
    }