Repository: jclouds
Updated Branches:
  refs/heads/master 8117574c8 -> 3c9f66b8e


http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobToHttpGetOptionsTest.java
----------------------------------------------------------------------
diff --git 
a/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobToHttpGetOptionsTest.java
 
b/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobToHttpGetOptionsTest.java
index d4b9429..4b97ddb 100644
--- 
a/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobToHttpGetOptionsTest.java
+++ 
b/blobstore/src/test/java/org/jclouds/blobstore/functions/BlobToHttpGetOptionsTest.java
@@ -35,7 +35,7 @@ public class BlobToHttpGetOptionsTest {
    @Test
    public void testIfUnmodifiedSince()  {
 
-      Date ifUnmodifiedSince = new Date(999999l);
+      Date ifUnmodifiedSince = new Date(999999L);
 
       org.jclouds.blobstore.options.GetOptions in = new 
org.jclouds.blobstore.options.GetOptions();
       in.ifUnmodifiedSince(ifUnmodifiedSince);
@@ -48,7 +48,7 @@ public class BlobToHttpGetOptionsTest {
    @Test
    public void testIfModifiedSince()  {
 
-      Date ifModifiedSince = new Date(999999l);
+      Date ifModifiedSince = new Date(999999L);
 
       org.jclouds.blobstore.options.GetOptions in = new 
org.jclouds.blobstore.options.GetOptions();
       in.ifModifiedSince(ifModifiedSince);

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java
----------------------------------------------------------------------
diff --git 
a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java
 
b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java
index 3f5b21e..59863ee 100644
--- 
a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java
+++ 
b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseBlobFromHeadersAndHttpContentTest.java
@@ -72,7 +72,7 @@ public class ParseBlobFromHeadersAndHttpContentTest {
                                           .addHeader("Content-Range", 
"0-10485759/20232760").build(); 
 
       
response.getPayload().getContentMetadata().setContentType(MediaType.APPLICATION_JSON);
-      response.getPayload().getContentMetadata().setContentLength(10485760l);
+      response.getPayload().getContentMetadata().setContentLength(10485760L);
 
       MutableBlobMetadata meta = blobMetadataProvider.get();
       expect(metadataParser.apply(response)).andReturn(meta);

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java
----------------------------------------------------------------------
diff --git 
a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java
 
b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java
index f768483..a2ee1dc 100644
--- 
a/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java
+++ 
b/blobstore/src/test/java/org/jclouds/blobstore/functions/ParseSystemAndUserMetadataFromHeadersTest.java
@@ -58,7 +58,7 @@ public class ParseSystemAndUserMetadataFromHeadersTest {
                                       .payload("")
                                       .addHeader(HttpHeaders.LAST_MODIFIED, 
"Wed, 09 Sep 2009 19:50:23 GMT").build(); 
       
from.getPayload().getContentMetadata().setContentType(MediaType.APPLICATION_JSON);
-      from.getPayload().getContentMetadata().setContentLength(100l);
+      from.getPayload().getContentMetadata().setContentLength(100L);
       BlobMetadata metadata = parser.apply(from);
       assertEquals(metadata.getName(), "key");
    }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
----------------------------------------------------------------------
diff --git 
a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
 
b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
index c722d9b..9f294e3 100644
--- 
a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
+++ 
b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseBlobIntegrationTest.java
@@ -147,7 +147,7 @@ public class BaseBlobIntegrationTest extends 
BaseBlobStoreIntegrationTest {
 
             }));
          }
-         Map<Integer, Exception> exceptions = awaitCompletion(responses, exec, 
30000l, Logger.CONSOLE,
+         Map<Integer, Exception> exceptions = awaitCompletion(responses, exec, 
30000L, Logger.CONSOLE,
                   "putFileParallel");
          assert exceptions.size() == 0 : exceptions;
 
@@ -179,7 +179,7 @@ public class BaseBlobIntegrationTest extends 
BaseBlobStoreIntegrationTest {
                }
             }));
          }
-         Map<Integer, Exception> exceptions = awaitCompletion(responses, exec, 
30000l, Logger.CONSOLE,
+         Map<Integer, Exception> exceptions = awaitCompletion(responses, exec, 
30000L, Logger.CONSOLE,
                   "get constitution");
          if (!exceptions.isEmpty()) {
             throw exceptions.values().iterator().next();

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java
----------------------------------------------------------------------
diff --git 
a/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java
 
b/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java
index 7b3aad0..e623422 100644
--- 
a/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java
+++ 
b/blobstore/src/test/java/org/jclouds/blobstore/internal/BaseBlobSignerExpectTest.java
@@ -63,7 +63,7 @@ public abstract class BaseBlobSignerExpectTest extends 
BaseRestApiExpectTest<Blo
    public void testSignGetBlobWithTime() {
       BlobStore getBlobWithTime = requestsSendResponses(init());
       HttpRequest compare = getBlobWithTime();
-      
assertEquals(getBlobWithTime.getContext().getSigner().signGetBlob(container, 
name, 3l /* seconds */),
+      
assertEquals(getBlobWithTime.getContext().getSigner().signGetBlob(container, 
name, 3L /* seconds */),
             compare);
    }
 
@@ -88,7 +88,7 @@ public abstract class BaseBlobSignerExpectTest extends 
BaseRestApiExpectTest<Blo
    public void testSignPutBlob() throws Exception {
       HashCode hashCode = HashCode.fromBytes(new byte[16]);
       BlobStore signPutBlob = requestsSendResponses(init());
-      Blob blob = 
signPutBlob.blobBuilder("name").forSigning().contentLength(2l).contentMD5(hashCode)
+      Blob blob = 
signPutBlob.blobBuilder("name").forSigning().contentLength(2L).contentMD5(hashCode)
             .contentType("text/plain").expires(new Date(1000)).build();
       HttpRequest compare = putBlob();
       compare.setPayload(blob.getPayload());
@@ -103,7 +103,7 @@ public abstract class BaseBlobSignerExpectTest extends 
BaseRestApiExpectTest<Blo
       Blob blob = 
signPutBloblWithTime.blobBuilder(name).payload(text).contentType("text/plain").build();
       HttpRequest compare = putBlobWithTime();
       compare.setPayload(blob.getPayload());
-      
assertEquals(signPutBloblWithTime.getContext().getSigner().signPutBlob(container,
 blob, 3l /* seconds */),
+      
assertEquals(signPutBloblWithTime.getContext().getSigner().signPutBlob(container,
 blob, 3L /* seconds */),
             compare);
    }
 

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git 
a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java
 
b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java
index 03ba0ea..6251bbf 100644
--- 
a/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java
+++ 
b/compute/src/main/java/org/jclouds/compute/stub/config/StubComputeServiceAdapter.java
@@ -100,7 +100,7 @@ public class StubComputeServiceAdapter implements 
JCloudsNativeComputeServiceAda
    }
 
    protected void setStateOnNodeAfterDelay(final Status status, final 
NodeMetadata node, final long millis) {
-      if (millis == 0l)
+      if (millis == 0L)
          setStateOnNode(status, node);
       else
          executor.execute(new Runnable() {

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java
----------------------------------------------------------------------
diff --git 
a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java
 
b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java
index 0e2e77a..76bf519 100644
--- 
a/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java
+++ 
b/compute/src/test/java/org/jclouds/compute/extensions/internal/BaseImageExtensionLiveTest.java
@@ -174,7 +174,7 @@ public abstract class BaseImageExtensionLiveTest extends 
BaseComputeServiceConte
             }
             return false;
          }
-      }, getSpawnNodeMaxWait(), 1l, SECONDS).apply(client));
+      }, getSpawnNodeMaxWait(), 1L, SECONDS).apply(client));
    }
 
    protected Optional<Image> findImageWithNameInCache(String name) {

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/compute/src/test/java/org/jclouds/ovf/xml/DiskSectionHandlerTest.java
----------------------------------------------------------------------
diff --git 
a/compute/src/test/java/org/jclouds/ovf/xml/DiskSectionHandlerTest.java 
b/compute/src/test/java/org/jclouds/ovf/xml/DiskSectionHandlerTest.java
index 9e17617..282032d 100644
--- a/compute/src/test/java/org/jclouds/ovf/xml/DiskSectionHandlerTest.java
+++ b/compute/src/test/java/org/jclouds/ovf/xml/DiskSectionHandlerTest.java
@@ -44,9 +44,9 @@ public class DiskSectionHandlerTest {
       assertEquals(result.toString(), DiskSection.builder().info("Describes 
the set of virtual disks").disk(
                Disk.builder().id("vmdisk1")
 
-               
.fileRef("file1").capacity(8589934592l).populatedSize(3549324972l).format(
+               
.fileRef("file1").capacity(8589934592L).populatedSize(3549324972L).format(
                         
URI.create("http://www.vmware.com/interfaces/specifications/vmdk.html#sparse";)).build()).disk(
-               Disk.builder().id("vmdisk2").capacity(536870912l).build()).disk(
+               Disk.builder().id("vmdisk2").capacity(536870912L).build()).disk(
                Disk.builder().id("vmdisk3").capacityAllocationUnits("byte * 
2^30").build())
 
       .build().toString()

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java
----------------------------------------------------------------------
diff --git 
a/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java 
b/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java
index 978406c..f765c81 100644
--- 
a/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java
+++ 
b/core/src/main/java/org/jclouds/http/handlers/BackoffLimitedRetryHandler.java
@@ -118,7 +118,7 @@ public class BackoffLimitedRetryHandler implements 
HttpRetryHandler, IOException
    }
 
    public void imposeBackoffExponentialDelay(long period, int pow, int 
failureCount, int max, String commandDescription) {
-      imposeBackoffExponentialDelay(period, period * 10l, pow, failureCount, 
max, commandDescription);
+      imposeBackoffExponentialDelay(period, period * 10L, pow, failureCount, 
max, commandDescription);
    }
 
    public void imposeBackoffExponentialDelay(long period, long maxPeriod, int 
pow, int failureCount, int max,

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/core/src/main/java/org/jclouds/util/Predicates2.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/util/Predicates2.java 
b/core/src/main/java/org/jclouds/util/Predicates2.java
index 604f52b..84027de 100644
--- a/core/src/main/java/org/jclouds/util/Predicates2.java
+++ b/core/src/main/java/org/jclouds/util/Predicates2.java
@@ -59,7 +59,7 @@ public class Predicates2 {
     * like {@link #retry(Predicate, long, long, long, TimeUnit)} where {@code 
maxPeriod} is 10x {@code period}
     */
    public static <T> Predicate<T> retry(Predicate<T> findOrBreak, long 
timeout, long period, TimeUnit unit) {
-      return retry(findOrBreak, timeout, period, period * 10l, unit);
+      return retry(findOrBreak, timeout, period, period * 10L, unit);
    }
 
    /**
@@ -72,11 +72,11 @@ public class Predicates2 {
    /**
     * @see 
org.jclouds.compute.config.ComputeServiceProperties#POLL_INITIAL_PERIOD
     */
-   public static final long DEFAULT_PERIOD = 50l;
+   public static final long DEFAULT_PERIOD = 50L;
    /**
     * @see org.jclouds.compute.config.ComputeServiceProperties#POLL_MAX_PERIOD
     */
-   public static final long DEFAULT_MAX_PERIOD = 1000l;
+   public static final long DEFAULT_MAX_PERIOD = 1000L;
 
    /**
     * like {@link #retry(Predicate, long, long, long, TimeUnit)} where {@code 
unit} is in milliseconds, {@code period}
@@ -110,7 +110,7 @@ public class Predicates2 {
          // Always try at least once, even if timeout is 0 or negative.
          // A timeout of 0 means 0 millis.
          try {
-            long i = 1l;
+            long i = 1L;
             long now = System.currentTimeMillis();
             long end = now + timeout;
             while (now < end) {

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/core/src/test/java/org/jclouds/date/DateServiceTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/date/DateServiceTest.java 
b/core/src/test/java/org/jclouds/date/DateServiceTest.java
index ba2b7bd..067c6aa 100644
--- a/core/src/test/java/org/jclouds/date/DateServiceTest.java
+++ b/core/src/test/java/org/jclouds/date/DateServiceTest.java
@@ -76,17 +76,17 @@ public class DateServiceTest extends PerformanceTest {
       // times!
       testData = new TestData[] {
             new TestData("2009-03-12T02:00:07.000Z", 
"2009-03-12T06:00:07+0400", "2009-03-12T02:00:07Z",
-                  "Thu, 12 Mar 2009 02:00:07 GMT", "Thu Mar 12 02:00:07 +0000 
2009", new Date(1236823207000l)),
+                  "Thu, 12 Mar 2009 02:00:07 GMT", "Thu Mar 12 02:00:07 +0000 
2009", new Date(1236823207000L)),
             new TestData("2009-03-12T02:00:07.000Z", 
"2009-03-12T06:00:07+0400", "2009-03-12T02:00:07Z",
-                  "Thu, 12 Mar 2009 02:00:07 GMT", "Thu Mar 12 02:00:07 +0000 
2009", new Date(1236823207000l)),
+                  "Thu, 12 Mar 2009 02:00:07 GMT", "Thu Mar 12 02:00:07 +0000 
2009", new Date(1236823207000L)),
             new TestData("2009-03-14T04:00:07.000Z", 
"2009-03-14T08:00:07+0400", "2009-03-14T04:00:07Z",
-                  "Sat, 14 Mar 2009 04:00:07 GMT", "Thu Mar 14 04:00:07 +0000 
2009", new Date(1237003207000l)),
+                  "Sat, 14 Mar 2009 04:00:07 GMT", "Thu Mar 14 04:00:07 +0000 
2009", new Date(1237003207000L)),
             new TestData("2009-03-16T06:00:07.000Z", 
"2009-03-16T10:00:07+0400", "2009-03-16T06:00:07Z",
-                  "Mon, 16 Mar 2009 06:00:07 GMT", "Thu Mar 16 06:00:07 +0000 
2009", new Date(1237183207000l)),
+                  "Mon, 16 Mar 2009 06:00:07 GMT", "Thu Mar 16 06:00:07 +0000 
2009", new Date(1237183207000L)),
             new TestData("2009-03-18T08:00:07.000Z", 
"2009-03-18T12:00:07+0400", "2009-03-18T08:00:07Z",
-                  "Wed, 18 Mar 2009 08:00:07 GMT", "Thu Mar 18 08:00:07 +0000 
2009", new Date(1237363207000l)),
+                  "Wed, 18 Mar 2009 08:00:07 GMT", "Thu Mar 18 08:00:07 +0000 
2009", new Date(1237363207000L)),
             new TestData("2009-03-20T10:00:07.000Z", 
"2009-03-20T14:00:07+0400", "2009-03-20T10:00:07Z",
-                  "Fri, 20 Mar 2009 10:00:07 GMT", "Thu Mar 20 10:00:07 +0000 
2009", new Date(1237543207000l)) };
+                  "Fri, 20 Mar 2009 10:00:07 GMT", "Thu Mar 20 10:00:07 +0000 
2009", new Date(1237543207000L)) };
    }
 
    @Test
@@ -192,12 +192,12 @@ public class DateServiceTest extends PerformanceTest {
    
    @Test
    void testTz() {
-      
assertEquals(dateService.iso8601SecondsDateParse("2011-05-26T02:14:13-04:00").getTime(),
 1306390453000l);
+      
assertEquals(dateService.iso8601SecondsDateParse("2011-05-26T02:14:13-04:00").getTime(),
 1306390453000L);
    }
    
    @Test
    void testTzNoT() {
-      assertEquals(dateService.iso8601DateParse("2011-05-25 
16:12:21.656+0000").getTime(), 1306339941656l);
+      assertEquals(dateService.iso8601DateParse("2011-05-25 
16:12:21.656+0000").getTime(), 1306339941656L);
    }
 
    @Test

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/core/src/test/java/org/jclouds/date/internal/DateServiceDateCodecFactoryTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/jclouds/date/internal/DateServiceDateCodecFactoryTest.java
 
b/core/src/test/java/org/jclouds/date/internal/DateServiceDateCodecFactoryTest.java
index 27297c3..697925a 100644
--- 
a/core/src/test/java/org/jclouds/date/internal/DateServiceDateCodecFactoryTest.java
+++ 
b/core/src/test/java/org/jclouds/date/internal/DateServiceDateCodecFactoryTest.java
@@ -99,7 +99,7 @@ public class DateServiceDateCodecFactoryTest {
       Date date = new Date(1000);
       
assertEquals(iso8601SecondsCodec.toDate(iso8601SecondsCodec.toString(date)), 
date);
 
-      
assertEquals(iso8601SecondsCodec.toDate("2012-11-14T21:51:28UTC").getTime(), 
1352929888000l);
+      
assertEquals(iso8601SecondsCodec.toDate("2012-11-14T21:51:28UTC").getTime(), 
1352929888000L);
    }
 
    @Test

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java 
b/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java
index 0223f5a..f55bc05 100644
--- a/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java
+++ b/core/src/test/java/org/jclouds/functions/JoinOnCommaTest.java
@@ -26,13 +26,13 @@ import com.google.common.collect.ImmutableList;
 public class JoinOnCommaTest {
    @Test
    public void testIterableLong() {
-      String list = new JoinOnComma().apply(ImmutableList.of(1l, 2l));
+      String list = new JoinOnComma().apply(ImmutableList.of(1L, 2L));
       assertEquals(list, "1,2");
    }
 
    @Test
    public void testLongArray() {
-      String list = new JoinOnComma().apply(new long[] { 1l, 2l });
+      String list = new JoinOnComma().apply(new long[] { 1L, 2L });
       assertEquals(list, "1,2");
    }
 

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/core/src/test/java/org/jclouds/http/handlers/BackoffLimitedRetryHandlerTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/jclouds/http/handlers/BackoffLimitedRetryHandlerTest.java
 
b/core/src/test/java/org/jclouds/http/handlers/BackoffLimitedRetryHandlerTest.java
index cc25c27..f4f66ea 100644
--- 
a/core/src/test/java/org/jclouds/http/handlers/BackoffLimitedRetryHandlerTest.java
+++ 
b/core/src/test/java/org/jclouds/http/handlers/BackoffLimitedRetryHandlerTest.java
@@ -142,7 +142,7 @@ public class BackoffLimitedRetryHandlerTest {
       };
 
       response.setPayload(Payloads.newInputStreamPayload(inputStream));
-      response.getPayload().getContentMetadata().setContentLength(1l);
+      response.getPayload().getContentMetadata().setContentLength(1L);
       assertEquals(response.getPayload().openStream().available(), 2);
       assertEquals(response.getPayload().openStream().read(), 1);
 

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/core/src/test/java/org/jclouds/http/internal/BaseHttpCommandExecutorServiceTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/jclouds/http/internal/BaseHttpCommandExecutorServiceTest.java
 
b/core/src/test/java/org/jclouds/http/internal/BaseHttpCommandExecutorServiceTest.java
index 1f50aff..3a017e1 100644
--- 
a/core/src/test/java/org/jclouds/http/internal/BaseHttpCommandExecutorServiceTest.java
+++ 
b/core/src/test/java/org/jclouds/http/internal/BaseHttpCommandExecutorServiceTest.java
@@ -62,7 +62,7 @@ public class BaseHttpCommandExecutorServiceTest {
    public void testStreamIsClosedWhenRetrying() throws IOException {
       MockInputStream in = new MockInputStream(2); // Input stream that 
produces 2 bytes
       HttpResponse response = 
HttpResponse.builder().payload(newInputStreamPayload(in)).build();
-      response.getPayload().getContentMetadata().setContentLength(1l);
+      response.getPayload().getContentMetadata().setContentLength(1L);
       HttpCommand command = mockHttpCommand();
 
       DelegatingRetryHandler retryHandler = 
EasyMock.createMock(DelegatingRetryHandler.class);
@@ -90,7 +90,7 @@ public class BaseHttpCommandExecutorServiceTest {
    public void testStreamIsClosedWhenNotRetrying() throws IOException {
       MockInputStream in = new MockInputStream(2); // Input stream that 
produces 2 bytes
       HttpResponse response = 
HttpResponse.builder().payload(newInputStreamPayload(in)).build();
-      response.getPayload().getContentMetadata().setContentLength(1l);
+      response.getPayload().getContentMetadata().setContentLength(1L);
       HttpCommand command = mockHttpCommand();
 
       DelegatingRetryHandler retryHandler = 
EasyMock.createMock(DelegatingRetryHandler.class);
@@ -120,7 +120,7 @@ public class BaseHttpCommandExecutorServiceTest {
    public void testStreamIsClosedAndBufferedInTheErrorHandlerWhenNotRetrying() 
throws IOException {
       MockInputStream in = new MockInputStream(2); // Input stream that 
produces 2 bytes
       HttpResponse response = 
HttpResponse.builder().payload(newInputStreamPayload(in)).build();
-      response.getPayload().getContentMetadata().setContentLength(1l);
+      response.getPayload().getContentMetadata().setContentLength(1L);
       HttpCommand command = mockHttpCommand();
 
       DelegatingRetryHandler retryHandler = 
EasyMock.createMock(DelegatingRetryHandler.class);
@@ -164,7 +164,7 @@ public class BaseHttpCommandExecutorServiceTest {
    public void testCloseStreamCanBeCalledMoreThanOnce() throws IOException {
       MockInputStream in = new MockInputStream(2); // Input stream that 
produces 2 bytes
       HttpResponse response = 
HttpResponse.builder().payload(newInputStreamPayload(in)).build();
-      response.getPayload().getContentMetadata().setContentLength(1l);
+      response.getPayload().getContentMetadata().setContentLength(1L);
       HttpCommand command = mockHttpCommand();
 
       DelegatingRetryHandler retryHandler = 
EasyMock.createMock(DelegatingRetryHandler.class);

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/core/src/test/java/org/jclouds/internal/FilterStringsBoundToInjectorByNameTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/jclouds/internal/FilterStringsBoundToInjectorByNameTest.java
 
b/core/src/test/java/org/jclouds/internal/FilterStringsBoundToInjectorByNameTest.java
index 61c33a0..6a3fc7b 100644
--- 
a/core/src/test/java/org/jclouds/internal/FilterStringsBoundToInjectorByNameTest.java
+++ 
b/core/src/test/java/org/jclouds/internal/FilterStringsBoundToInjectorByNameTest.java
@@ -42,7 +42,7 @@ public class FilterStringsBoundToInjectorByNameTest {
 
          @Override
          protected void configure() {
-            bindConstant().annotatedWith(Names.named("foo")).to(1l);
+            bindConstant().annotatedWith(Names.named("foo")).to(1L);
          }
 
       }).getInstance(FilterStringsBoundToInjectorByName.class);

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java
 
b/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java
index f764680..6ac2a58 100644
--- 
a/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java
+++ 
b/core/src/test/java/org/jclouds/rest/config/ReadAnnotationsAndPropertiesTest.java
@@ -74,8 +74,8 @@ public class ReadAnnotationsAndPropertiesTest {
       });
       ReadAnnotationsAndProperties config = new 
ReadAnnotationsAndProperties(injector,
             new FilterStringsBoundToInjectorByName(injector), defaultFallback);
-      assertEquals(config.getTimeoutNanos(asyncGet), Optional.of(250000000l));
-      assertEquals(config.getTimeoutNanos(asyncNamedGet), 
Optional.of(250000000l));
+      assertEquals(config.getTimeoutNanos(asyncGet), Optional.of(250000000L));
+      assertEquals(config.getTimeoutNanos(asyncNamedGet), 
Optional.of(250000000L));
    }
 
    public void testNamedInvocationGetsTimeoutOverrideOnAsyncMethods() throws 
Exception {
@@ -90,7 +90,7 @@ public class ReadAnnotationsAndPropertiesTest {
       });
       ReadAnnotationsAndProperties config = new 
ReadAnnotationsAndProperties(injector,
             new FilterStringsBoundToInjectorByName(injector), defaultFallback);
-      assertEquals(config.getTimeoutNanos(asyncNamedGet), 
Optional.of(250000000l));
+      assertEquals(config.getTimeoutNanos(asyncNamedGet), 
Optional.of(250000000L));
    }
 
    /**

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java 
b/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java
index 40e3e4a..d2e30a4 100644
--- a/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java
+++ b/core/src/test/java/org/jclouds/rest/internal/InvokeHttpMethodTest.java
@@ -96,7 +96,7 @@ public class InvokeHttpMethodTest {
    }
 
    public void testMethodWithTimeoutRunsTimeLimiter() throws Exception {
-      expect(config.getTimeoutNanos(get)).andReturn(Optional.of(250000000l));
+      expect(config.getTimeoutNanos(get)).andReturn(Optional.of(250000000L));
       InvokeAndTransform invoke = invokeHttpMethod.new 
InvokeAndTransform("ns:get", getCommand);
       expect(timeLimiter.callWithTimeout(invoke, 250000000, 
TimeUnit.NANOSECONDS, true)).andReturn(response);
       replay(http, timeLimiter, fallback, config);
@@ -123,7 +123,7 @@ public class InvokeHttpMethodTest {
 
    public void testTimeLimitedRunsFallbackCreateOrPropagate() throws Exception 
{
       IllegalStateException exception = new IllegalStateException();
-      expect(config.getTimeoutNanos(get)).andReturn(Optional.of(250000000l));
+      expect(config.getTimeoutNanos(get)).andReturn(Optional.of(250000000L));
       InvokeAndTransform invoke = invokeHttpMethod.new 
InvokeAndTransform("ns:get", getCommand);
       expect(timeLimiter.callWithTimeout(invoke, 250000000, 
TimeUnit.NANOSECONDS, true)).andThrow(exception);
       
expect(fallback.createOrPropagate(exception)).andReturn(fallbackResponse);

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/drivers/gae/src/test/java/org/jclouds/gae/ConvertToGaeRequestTest.java
----------------------------------------------------------------------
diff --git 
a/drivers/gae/src/test/java/org/jclouds/gae/ConvertToGaeRequestTest.java 
b/drivers/gae/src/test/java/org/jclouds/gae/ConvertToGaeRequestTest.java
index 1f744d8..950df4f 100644
--- a/drivers/gae/src/test/java/org/jclouds/gae/ConvertToGaeRequestTest.java
+++ b/drivers/gae/src/test/java/org/jclouds/gae/ConvertToGaeRequestTest.java
@@ -120,7 +120,7 @@ public class ConvertToGaeRequestTest {
                                        .method(HttpMethod.GET)
                                        .endpoint(endPoint)
                                        
.payload(Strings2.toInputStream("hoot!")).build();
-      request.getPayload().getContentMetadata().setContentLength(5l);
+      request.getPayload().getContentMetadata().setContentLength(5L);
       testHoot(request);
    }
 

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/SpotInstanceApiMockTest.java
----------------------------------------------------------------------
diff --git 
a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/SpotInstanceApiMockTest.java
 
b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/SpotInstanceApiMockTest.java
index 5863059..b2d02df 100644
--- 
a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/SpotInstanceApiMockTest.java
+++ 
b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/features/SpotInstanceApiMockTest.java
@@ -109,8 +109,8 @@ import com.squareup.okhttp.mockwebserver.MockResponse;
          enqueueRegions(DEFAULT_REGION);
          enqueueXml(DEFAULT_REGION, "/describe_spot_price_history.xml");
 
-         Date from = new Date(12345678910l);
-         Date to = new Date(1234567891011l);
+         Date from = new Date(12345678910L);
+         Date to = new Date(1234567891011L);
 
          Set<Spot> result = 
spotApi().describeSpotPriceHistoryInRegion(DEFAULT_REGION,
                
from(from).to(to).productDescription("description").instanceType("m1.small"));

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/options/DescribeSpotPriceHistoryOptionsTest.java
----------------------------------------------------------------------
diff --git 
a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/options/DescribeSpotPriceHistoryOptionsTest.java
 
b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/options/DescribeSpotPriceHistoryOptionsTest.java
index 2a955a1..69e5d8b 100644
--- 
a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/options/DescribeSpotPriceHistoryOptionsTest.java
+++ 
b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/options/DescribeSpotPriceHistoryOptionsTest.java
@@ -83,7 +83,7 @@ public class DescribeSpotPriceHistoryOptionsTest {
       assertEquals(options.buildFormParameters().get("StartTime"), 
ImmutableList.of("1970-05-23T21:21:18.910Z"));
    }
 
-   Date test = new Date(12345678910l);
+   Date test = new Date(12345678910L);
 
    @Test
    public void testFromStatic() {

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/options/RequestSpotInstancesOptionsTest.java
----------------------------------------------------------------------
diff --git 
a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/options/RequestSpotInstancesOptionsTest.java
 
b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/options/RequestSpotInstancesOptionsTest.java
index 4442338..1805d4c 100644
--- 
a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/options/RequestSpotInstancesOptionsTest.java
+++ 
b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/options/RequestSpotInstancesOptionsTest.java
@@ -104,7 +104,7 @@ public class RequestSpotInstancesOptionsTest {
             ImmutableList.of("1970-05-23T21:21:18Z"));
    }
 
-   Date test = new Date(12345678910l);
+   Date test = new Date(12345678910L);
 
    @Test
    public void testFromStatic() {

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java
----------------------------------------------------------------------
diff --git 
a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java
 
b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java
index 6f41784..14c273f 100644
--- 
a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java
+++ 
b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerExpectTest.java
@@ -88,7 +88,7 @@ public class AWSS3BlobSignerExpectTest extends 
S3BlobSignerExpectTest {
    public void testSignGetBlobWithTime() {
       BlobStore getBlobWithTime = requestsSendResponses(init());
       HttpRequest compare = getBlobWithTime();
-      HttpRequest request = 
getBlobWithTime.getContext().getSigner().signGetBlob(container, name, 3l /* 
seconds */);
+      HttpRequest request = 
getBlobWithTime.getContext().getSigner().signGetBlob(container, name, 3L /* 
seconds */);
       compareRequestComponents(request, compare);
    }
 
@@ -130,7 +130,7 @@ public class AWSS3BlobSignerExpectTest extends 
S3BlobSignerExpectTest {
       Blob blob = 
signPutBloblWithTime.blobBuilder(name).payload(text).contentType("text/plain").build();
       HttpRequest compare = putBlobWithTime();
       compare.setPayload(blob.getPayload());
-      HttpRequest request = 
signPutBloblWithTime.getContext().getSigner().signPutBlob(container, blob, 3l 
/* seconds */);
+      HttpRequest request = 
signPutBloblWithTime.getContext().getSigner().signPutBlob(container, blob, 3L 
/* seconds */);
       compareRequestComponents(request, compare);
       assertEquals(request.getPayload(), compare.getPayload());
    }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerV4ExpectTest.java
----------------------------------------------------------------------
diff --git 
a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerV4ExpectTest.java
 
b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerV4ExpectTest.java
index cdfccf1..8b2af5e 100644
--- 
a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerV4ExpectTest.java
+++ 
b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/AWSS3BlobSignerV4ExpectTest.java
@@ -85,7 +85,7 @@ public class AWSS3BlobSignerV4ExpectTest extends 
S3BlobSignerExpectTest {
       BlobStore getBlobWithTime = requestsSendResponses(init());
       HttpRequest compare = getBlobWithTime();
       HttpRequest signedRequest = 
getBlobWithTime.getContext().getSigner().signGetBlob(BUCKET_NAME, OBJECT_NAME,
-            86400l /* seconds */);
+            86400L /* seconds */);
       assertEquals(signedRequest, compare);
    }
 
@@ -111,7 +111,7 @@ public class AWSS3BlobSignerV4ExpectTest extends 
S3BlobSignerExpectTest {
       HttpRequest compare = _putBlobWithTime();
       compare.setPayload(blob.getPayload());
       HttpRequest signedRequest = 
signPutBloblWithTime.getContext().getSigner().signPutBlob(BUCKET_NAME, blob,
-            86400l /* seconds */);
+            86400L /* seconds */);
       assertEquals(signedRequest, compare);
    }
 

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java
----------------------------------------------------------------------
diff --git 
a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java
 
b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java
index 6a6904e..3343121 100644
--- 
a/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java
+++ 
b/providers/azureblob/src/main/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequest.java
@@ -77,7 +77,7 @@ public class BindAzureBlobMetadataToRequest implements Binder 
{
          break;
       case BLOCK_BLOB:
          checkArgument(
-               
checkNotNull(blob.getPayload().getContentMetadata().getContentLength(), 
"blob.getContentLength()") <= 64l * 1024 * 1024,
+               
checkNotNull(blob.getPayload().getContentMetadata().getContentLength(), 
"blob.getContentLength()") <= 64L * 1024 * 1024,
                "maximum size for put Blob is 64MB");
          break;
       }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/azureblob/src/test/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequestTest.java
----------------------------------------------------------------------
diff --git 
a/providers/azureblob/src/test/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequestTest.java
 
b/providers/azureblob/src/test/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequestTest.java
index 8fc1030..46af13f 100644
--- 
a/providers/azureblob/src/test/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequestTest.java
+++ 
b/providers/azureblob/src/test/java/org/jclouds/azureblob/binders/BindAzureBlobMetadataToRequestTest.java
@@ -38,7 +38,7 @@ public class BindAzureBlobMetadataToRequestTest extends 
BaseRestAnnotationProces
    public void testPassWithMinimumDetailsAndPayload64MB() {
       AzureBlob blob = 
injector.getInstance(AzureBlob.Factory.class).create(null);
       Payload payload = Payloads.newStringPayload("");
-      payload.getContentMetadata().setContentLength(64 * 1024 * 1024l);
+      payload.getContentMetadata().setContentLength(64 * 1024 * 1024L);
       blob.setPayload(payload);
       blob.getProperties().setName("foo");
 
@@ -55,7 +55,7 @@ public class BindAzureBlobMetadataToRequestTest extends 
BaseRestAnnotationProces
    public void testExtendedPropertiesBind() {
       AzureBlob blob = 
injector.getInstance(AzureBlob.Factory.class).create(null);
       Payload payload = Payloads.newStringPayload("");
-      payload.getContentMetadata().setContentLength(64 * 1024 * 1024l);
+      payload.getContentMetadata().setContentLength(64 * 1024 * 1024L);
       blob.setPayload(payload);
       blob.getProperties().setName("foo");
       blob.getProperties().setMetadata(ImmutableMap.of("foo", "bar"));
@@ -87,7 +87,7 @@ public class BindAzureBlobMetadataToRequestTest extends 
BaseRestAnnotationProces
    public void testNoNameIsBad() {
       AzureBlob blob = 
injector.getInstance(AzureBlob.Factory.class).create(null);
       Payload payload = Payloads.newStringPayload("");
-      payload.getContentMetadata().setContentLength(5368709120000l);
+      payload.getContentMetadata().setContentLength(5368709120000L);
       blob.setPayload(payload);
 
       HttpRequest request = 
HttpRequest.builder().method("PUT").endpoint("http://localhost";).build();
@@ -99,7 +99,7 @@ public class BindAzureBlobMetadataToRequestTest extends 
BaseRestAnnotationProces
    public void testOver64MBIsBad() {
       AzureBlob blob = 
injector.getInstance(AzureBlob.Factory.class).create(null);
       Payload payload = Payloads.newStringPayload("");
-      payload.getContentMetadata().setContentLength(64 * 1024 * 1024l + 1);
+      payload.getContentMetadata().setContentLength(64 * 1024 * 1024L + 1);
       blob.setPayload(payload);
       blob.getProperties().setName("foo");
 

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java
----------------------------------------------------------------------
diff --git 
a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java
 
b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java
index 839503c..591b40c 100644
--- 
a/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java
+++ 
b/providers/azureblob/src/test/java/org/jclouds/azureblob/blobstore/AzureBlobRequestSignerTest.java
@@ -89,7 +89,7 @@ public class AzureBlobRequestSignerTest extends 
BaseRestAnnotationProcessingTest
       Blob blob = blobFactory.create(null);
       blob.getMetadata().setName("name");
       blob.setPayload("");
-      blob.getPayload().getContentMetadata().setContentLength(2l);
+      blob.getPayload().getContentMetadata().setContentLength(2L);
       blob.getPayload().getContentMetadata().setContentMD5(hashCode);
       blob.getPayload().getContentMetadata().setContentType("text/plain");
       blob.getPayload().getContentMetadata().setExpires(new Date(1000));

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiExpectTest.java
----------------------------------------------------------------------
diff --git 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiExpectTest.java
 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiExpectTest.java
index 12e5131..70efad5 100644
--- 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiExpectTest.java
+++ 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/RecordApiExpectTest.java
@@ -66,7 +66,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
                             .zone("jclouds.org")
                             .fqdn("jclouds.org")
                             .type("SOA")
-                            .id(50976579l).build();
+                            .id(50976579L).build();
 
    public void testGetWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, getSOA, soaResponse);
@@ -92,7 +92,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
         .zone("jclouds.org")
         .fqdn("jclouds.org")
         .type("AAAA")
-        .id(50976579l).build();
+        .id(50976579L).build();
 
    public void testGetAAAAWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, getAAAA, aaaaResponse);
@@ -118,7 +118,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
         .zone("jclouds.org")
         .fqdn("jclouds.org")
         .type("A")
-        .id(50976579l).build();
+        .id(50976579L).build();
 
    public void testGetAWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, getA, aResponse);
@@ -144,7 +144,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
         .zone("jclouds.org")
         .fqdn("jclouds.org")
         .type("CNAME")
-        .id(50976579l).build();
+        .id(50976579L).build();
 
    public void testGetCNAMEWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, getCNAME, cnameResponse);
@@ -170,7 +170,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
         .zone("jclouds.org")
         .fqdn("jclouds.org")
         .type("MX")
-        .id(50976579l).build();
+        .id(50976579L).build();
 
    public void testGetMXWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, getMX, mxResponse);
@@ -196,7 +196,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
         .zone("jclouds.org")
         .fqdn("jclouds.org")
         .type("NS")
-        .id(50976579l).build();
+        .id(50976579L).build();
 
    public void testGetNSWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, getNS, nsResponse);
@@ -222,7 +222,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
         .zone("jclouds.org")
         .fqdn("jclouds.org")
         .type("PTR")
-        .id(50976579l).build();
+        .id(50976579L).build();
 
    public void testGetPTRWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, getPTR, ptrResponse);
@@ -259,7 +259,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
         .zone("jclouds.org")
         .fqdn("jclouds.org")
         .type("SPF")
-        .id(50976579l).build();
+        .id(50976579L).build();
 
    public void testGetSPFWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, getSPF, spfResponse);
@@ -280,7 +280,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
         .zone("jclouds.org")
         .fqdn("jclouds.org")
         .type("SRV")
-        .id(50976579l).build();
+        .id(50976579L).build();
 
    public void testGetSRVWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, getSRV, srvResponse);
@@ -301,7 +301,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
         .zone("jclouds.org")
         .fqdn("jclouds.org")
         .type("SSHFP")
-        .id(50976579l).build();
+        .id(50976579L).build();
 
    public void testGetSSHFPWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, getSSHFP, sshfpResponse);
@@ -322,7 +322,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
         .zone("jclouds.org")
         .fqdn("jclouds.org")
         .type("TXT")
-        .id(50976579l).build();
+        .id(50976579L).build();
 
    public void testGetTXTWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, getTXT, txtResponse);
@@ -403,7 +403,7 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
                                                .ttl(86400)
                                                .rdata(a("1.1.1.1"))
                                                .build();
-      
assertEquals(success.getRecordApiForZone("jclouds.org").scheduleCreate(record), 
Job.success(285372440l));
+      
assertEquals(success.getRecordApiForZone("jclouds.org").scheduleCreate(record), 
Job.success(285372440L));
    }
 
    HttpRequest delete = HttpRequest.builder().method(DELETE)
@@ -420,13 +420,13 @@ public class RecordApiExpectTest extends 
BaseDynECTApiExpectTest {
                      .zone("jclouds.org")
                      .fqdn("www.jclouds.org")
                      .type("A")
-                     .id(285372440l)
+                     .id(285372440L)
                      .build();
 
    public void testDeleteWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, delete, deleteResponse);
 
-      
assertEquals(success.getRecordApiForZone("jclouds.org").scheduleDelete(id), 
Job.success(285372457l));
+      
assertEquals(success.getRecordApiForZone("jclouds.org").scheduleDelete(id), 
Job.success(285372457L));
    }
 
    public void testDeleteWhenResponseIs404() {

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/ZoneApiExpectTest.java
----------------------------------------------------------------------
diff --git 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/ZoneApiExpectTest.java
 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/ZoneApiExpectTest.java
index cc9fd58..34eff59 100644
--- 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/ZoneApiExpectTest.java
+++ 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/features/ZoneApiExpectTest.java
@@ -70,12 +70,12 @@ public class ZoneApiExpectTest extends 
BaseDynECTApiExpectTest {
       
assertEquals(success.getZoneApi().scheduleCreate(CreatePrimaryZone.builder()
                                                                         
.fqdn("jclouds.org")
                                                                         
.contact("[email protected]")
-                                                                        
.build()), Job.success(285351593l));
+                                                                        
.build()), Job.success(285351593L));
    }
 
    public void testCreateWithContactWhenResponseIs2xx() {
       DynECTApi success = requestsSendResponses(createSession, 
createSessionResponse, create, createResponse);
-      
assertEquals(success.getZoneApi().scheduleCreateWithContact("jclouds.org", 
"[email protected]"), Job.success(285351593l));
+      
assertEquals(success.getZoneApi().scheduleCreateWithContact("jclouds.org", 
"[email protected]"), Job.success(285351593L));
    }
 
    public void testGetWhenResponseIs404() {

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneChangesResponseTest.java
----------------------------------------------------------------------
diff --git 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneChangesResponseTest.java
 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneChangesResponseTest.java
index 2223b50..09546eb 100644
--- 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneChangesResponseTest.java
+++ 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneChangesResponseTest.java
@@ -34,6 +34,6 @@ public class DeleteZoneChangesResponseTest extends 
BaseDynECTParseTest<Job> {
    @Override
    @Consumes(MediaType.APPLICATION_JSON)
    public Job expected() {
-      return Job.success(275625520l);
+      return Job.success(275625520L);
    }
 }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneResponseTest.java
----------------------------------------------------------------------
diff --git 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneResponseTest.java
 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneResponseTest.java
index c4cf770..9508f7a 100644
--- 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneResponseTest.java
+++ 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/DeleteZoneResponseTest.java
@@ -34,6 +34,6 @@ public class DeleteZoneResponseTest extends 
BaseDynECTParseTest<Job> {
    @Override
    @Consumes(MediaType.APPLICATION_JSON)
    public Job expected() {
-      return Job.success(262989027l);
+      return Job.success(262989027L);
    }
 }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetRecordResponseTest.java
----------------------------------------------------------------------
diff --git 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetRecordResponseTest.java
 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetRecordResponseTest.java
index 0188fa0..4865e9e 100644
--- 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetRecordResponseTest.java
+++ 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetRecordResponseTest.java
@@ -44,7 +44,7 @@ public class GetRecordResponseTest extends 
BaseDynECTParseTest<Record<Map<String
                    .zone("adrianc.zone.dynecttest.jclouds.org")
                    .fqdn("adrianc.zone.dynecttest.jclouds.org")
                    .type("SOA")
-                   .id(50976579l)
+                   .id(50976579L)
                    .ttl(3600)
                    // TODO: default parse to unsigned
                    .rdata(ImmutableMap.<String, Object> builder()

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSOARecordResponseTest.java
----------------------------------------------------------------------
diff --git 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSOARecordResponseTest.java
 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSOARecordResponseTest.java
index b157dd2..35b2a27 100644
--- 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSOARecordResponseTest.java
+++ 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSOARecordResponseTest.java
@@ -43,7 +43,7 @@ public class GetSOARecordResponseTest extends 
BaseDynECTParseTest<SOARecord> {
                       .zone("adrianc.zone.dynecttest.jclouds.org")
                       .fqdn("adrianc.zone.dynecttest.jclouds.org")
                       .type("SOA")
-                      .id(50976579l)
+                      .id(50976579L)
                       .ttl(3600)
                       .serialStyle(INCREMENT)
                       .rdata(SOAData.builder()

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java
----------------------------------------------------------------------
diff --git 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java
 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java
index c9e782a..bcdc88c 100644
--- 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java
+++ 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSPFRecordResponseTest.java
@@ -41,7 +41,7 @@ public class GetSPFRecordResponseTest extends 
BaseDynECTParseTest<Record<SPFData
                    .zone("adrianc.zone.dynecttest.jclouds.org")
                    .fqdn("_http._tcp.www.jclouds.org.")
                    .type("SPF")
-                   .id(50976579l)
+                   .id(50976579L)
                    .ttl(3600)
                    .rdata(SPFData.create("v=spf1 a -all")).build();
    }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSRVRecordResponseTest.java
----------------------------------------------------------------------
diff --git 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSRVRecordResponseTest.java
 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSRVRecordResponseTest.java
index e179f29..591f1a7 100644
--- 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSRVRecordResponseTest.java
+++ 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSRVRecordResponseTest.java
@@ -41,7 +41,7 @@ public class GetSRVRecordResponseTest extends 
BaseDynECTParseTest<Record<SRVData
                    .zone("adrianc.zone.dynecttest.jclouds.org")
                    .fqdn("_http._tcp.www.jclouds.org.")
                    .type("SRV")
-                   .id(50976579l)
+                   .id(50976579L)
                    .ttl(3600)
                    .rdata(SRVData.builder()
                                  .priority(0)

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java
----------------------------------------------------------------------
diff --git 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java
 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java
index a1fd699..e2fb9e4 100644
--- 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java
+++ 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/GetSSHFPRecordResponseTest.java
@@ -38,7 +38,7 @@ public class GetSSHFPRecordResponseTest extends 
BaseDynECTParseTest<Record<SSHFP
     @Consumes(MediaType.APPLICATION_JSON)
     public Record<SSHFPData> expected() {
         return Record.<SSHFPData> 
builder().zone("adrianc.zone.dynecttest.jclouds.org")
-                
.fqdn("_http._tcp.www.jclouds.org.").type("SSHFP").id(50976579l).ttl(3600)
+                
.fqdn("_http._tcp.www.jclouds.org.").type("SSHFP").id(50976579L).ttl(3600)
                 
.rdata(SSHFPData.builder().algorithm(2).fptype(1).fingerprint("190E37C5B5DB9A1C455E648A41AF3CC83F99F102").build()).build();
     }
 }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/ListRecordsResponseTest.java
----------------------------------------------------------------------
diff --git 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/ListRecordsResponseTest.java
 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/ListRecordsResponseTest.java
index 26f14b6..9507d45 100644
--- 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/ListRecordsResponseTest.java
+++ 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/parse/ListRecordsResponseTest.java
@@ -43,11 +43,11 @@ public class ListRecordsResponseTest extends 
BaseDynECTParseTest<FluentIterable<
                                    .zone("adrianc.zone.dynecttest.jclouds.org")
                                    
.fqdn("adrianc.zone.dynecttest.jclouds.org");
       return FluentIterable.from(ImmutableSet.<RecordId> builder()
-                                             
.add(builder.type("SOA").id(50976579l).build())
-                                             
.add(builder.type("NS").id(50976580l).build())
-                                             
.add(builder.type("NS").id(50976581l).build())
-                                             
.add(builder.type("NS").id(50976582l).build())
-                                             
.add(builder.type("NS").id(50976583l).build())
+                                             
.add(builder.type("SOA").id(50976579L).build())
+                                             
.add(builder.type("NS").id(50976580L).build())
+                                             
.add(builder.type("NS").id(50976581L).build())
+                                             
.add(builder.type("NS").id(50976582L).build())
+                                             
.add(builder.type("NS").id(50976583L).build())
                                              .build());
    }
 }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/dynect/src/test/java/org/jclouds/dynect/v3/predicates/RecordPredicatesTest.java
----------------------------------------------------------------------
diff --git 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/predicates/RecordPredicatesTest.java
 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/predicates/RecordPredicatesTest.java
index 839592a..0b38d13 100644
--- 
a/providers/dynect/src/test/java/org/jclouds/dynect/v3/predicates/RecordPredicatesTest.java
+++ 
b/providers/dynect/src/test/java/org/jclouds/dynect/v3/predicates/RecordPredicatesTest.java
@@ -28,7 +28,7 @@ public class RecordPredicatesTest {
                                .zone("adrianc.zone.dynecttest.jclouds.org")
                                .fqdn("adrianc.zone.dynecttest.jclouds.org")
                                .type("SOA")
-                               .id(50976579l).build();
+                               .id(50976579L).build();
 
    @Test
    public void testTypeEqualsWhenEqual() {

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git 
a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java
 
b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java
index d88d128..69cd599 100644
--- 
a/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java
+++ 
b/providers/gogrid/src/main/java/org/jclouds/gogrid/compute/strategy/GoGridComputeServiceAdapter.java
@@ -70,9 +70,9 @@ public class GoGridComputeServiceAdapter implements 
ComputeServiceAdapter<Server
       this.client = checkNotNull(client, "client");
       this.sizeToRam = checkNotNull(sizeToRam, "sizeToRam");
       this.serverLatestJobCompleted = retry(new 
ServerLatestJobCompleted(client.getJobServices()),
-            timeouts.nodeRunning * 9l / 10l);
+            timeouts.nodeRunning * 9L / 10L);
       this.serverLatestJobCompletedShort = retry(new 
ServerLatestJobCompleted(client.getJobServices()),
-            timeouts.nodeRunning * 1l / 10l);
+            timeouts.nodeRunning * 1L / 10L);
    }
 
    @Override

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadataTest.java
----------------------------------------------------------------------
diff --git 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadataTest.java
 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadataTest.java
index 1c1e86c..6664179 100644
--- 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadataTest.java
+++ 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/compute/functions/ServerToNodeMetadataTest.java
@@ -57,13 +57,13 @@ public class ServerToNodeMetadataTest {
 
       Map<ServerState, Status> serverStateToNodeStatus = createMock(Map.class);
       org.jclouds.compute.domain.Image jcImage = 
createMock(org.jclouds.compute.domain.Image.class);
-      Option dc = Option.createWithIdNameAndDescription(1l, "US-West-1", "US 
West 1 Datacenter");
-      Option ram = Option.createWithIdNameAndDescription(1l, "512MB", "Server 
with 512MB RAM");
+      Option dc = Option.createWithIdNameAndDescription(1L, "US-West-1", "US 
West 1 Datacenter");
+      Option ram = Option.createWithIdNameAndDescription(1L, "512MB", "Server 
with 512MB RAM");
 
       Set<? extends org.jclouds.compute.domain.Image> images = 
ImmutableSet.of(jcImage);
       Server server = createMock(Server.class);
 
-      expect(server.getId()).andReturn(1000l).atLeastOnce();
+      expect(server.getId()).andReturn(1000L).atLeastOnce();
       expect(server.getName()).andReturn("group-ff").atLeastOnce();
       expect(server.getState()).andReturn(ServerState.ON).atLeastOnce();
 
@@ -78,7 +78,7 @@ public class ServerToNodeMetadataTest {
       expect(server.getImage()).andReturn(image).atLeastOnce();
       expect(server.getRam()).andReturn(ram).atLeastOnce();
       expect(server.getDatacenter()).andReturn(dc).atLeastOnce();
-      expect(image.getId()).andReturn(2000l).atLeastOnce();
+      expect(image.getId()).andReturn(2000L).atLeastOnce();
       expect(jcImage.getProviderId()).andReturn("2000").atLeastOnce();
       expect(jcImage.getLocation()).andReturn(location).atLeastOnce();
       
expect(jcImage.getOperatingSystem()).andReturn(createMock(OperatingSystem.class)).atLeastOnce();

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/gogrid/src/test/java/org/jclouds/gogrid/features/GridImageApiTest.java
----------------------------------------------------------------------
diff --git 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/features/GridImageApiTest.java
 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/features/GridImageApiTest.java
index 2161f45..1148d66 100644
--- 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/features/GridImageApiTest.java
+++ 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/features/GridImageApiTest.java
@@ -141,7 +141,7 @@ public class GridImageApiTest extends 
BaseGoGridApiTest<GridImageApi> {
    @Test
    public void testDeleteById() throws NoSuchMethodException, IOException {
       Invokable<?, ?> method = method(GridImageApi.class, "deleteById", 
long.class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, 
ImmutableList.<Object> of(11l));
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, 
ImmutableList.<Object> of(11L));
 
       assertRequestLineEquals(httpRequest, "GET 
https://api.gogrid.com/api/grid/image/delete?v=1.5&id=11 HTTP/1.1");
       assertNonPayloadHeadersEqual(httpRequest, "");

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/gogrid/src/test/java/org/jclouds/gogrid/features/GridLoadBalancerApiTest.java
----------------------------------------------------------------------
diff --git 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/features/GridLoadBalancerApiTest.java
 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/features/GridLoadBalancerApiTest.java
index 3b86f4b..f0cbef7 100644
--- 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/features/GridLoadBalancerApiTest.java
+++ 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/features/GridLoadBalancerApiTest.java
@@ -106,7 +106,7 @@ public class GridLoadBalancerApiTest extends 
BaseGoGridApiTest<GridLoadBalancerA
    @Test
    public void testEditLoadBalancer() throws NoSuchMethodException, 
IOException {
       Invokable<?, ?> method = method(GridLoadBalancerApi.class, 
"editLoadBalancer", long.class, List.class);
-      GeneratedHttpRequest httpRequest = processor.createRequest(method, 
ImmutableList.<Object> of(1l, ImmutableList.of(
+      GeneratedHttpRequest httpRequest = processor.createRequest(method, 
ImmutableList.<Object> of(1L, ImmutableList.of(
             
IpPortPair.builder().ip(Ip.builder().ip("127.0.0.1").build()).port(8080).build(),
             
IpPortPair.builder().ip(Ip.builder().ip("127.0.0.1").build()).port(9090).build())));
 

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseLoadBalancersFromJsonResponseTest.java
----------------------------------------------------------------------
diff --git 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseLoadBalancersFromJsonResponseTest.java
 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseLoadBalancersFromJsonResponseTest.java
index d0fbe70..4d8ae2b 100644
--- 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseLoadBalancersFromJsonResponseTest.java
+++ 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/functions/ParseLoadBalancersFromJsonResponseTest.java
@@ -57,7 +57,7 @@ public class ParseLoadBalancersFromJsonResponseTest {
       ParseLoadBalancerListFromJsonResponse parser = 
i.getInstance(ParseLoadBalancerListFromJsonResponse.class);
       SortedSet<LoadBalancer> response = 
parser.apply(HttpResponse.builder().statusCode(200).message("ok").payload(is).build());
 
-      Option dc = Option.createWithIdNameAndDescription(1l, "US-West-1", "US 
West 1 Datacenter");
+      Option dc = Option.createWithIdNameAndDescription(1L, "US-West-1", "US 
West 1 Datacenter");
 
       LoadBalancer loadBalancer = 
LoadBalancer.builder().id(6372L).name("Balancer")
             .virtualIp(IpPortPair.builder().ip(Ip.builder().id(1313082L)

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/gogrid/src/test/java/org/jclouds/gogrid/parse/ParseServerListTest.java
----------------------------------------------------------------------
diff --git 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/parse/ParseServerListTest.java
 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/parse/ParseServerListTest.java
index c577da5..7db6fb7 100644
--- 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/parse/ParseServerListTest.java
+++ 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/parse/ParseServerListTest.java
@@ -50,7 +50,7 @@ public class ParseServerListTest extends 
BaseSetParserTest<Server> {
    @Override
    @SelectJson("list")
    public Set<Server> expected() {
-      Option dc = Option.createWithIdNameAndDescription(1l, "US-West-1", "US 
West 1 Datacenter");
+      Option dc = Option.createWithIdNameAndDescription(1L, "US-West-1", "US 
West 1 Datacenter");
       Option centOs = Option.createWithIdNameAndDescription(13L, "CentOS 5.2 
(32-bit)", "CentOS 5.2 (32-bit)");
       Option webServer = Option.createWithIdNameAndDescription(1L, "Web 
Server", "Web or Application Server");
       return 
ImmutableSet.of(Server.builder().id(75245L).datacenter(dc).name("PowerServer").description("server
 to test the api. created by Alex")

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/gogrid/src/test/java/org/jclouds/gogrid/parse/ParseServerTest.java
----------------------------------------------------------------------
diff --git 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/parse/ParseServerTest.java 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/parse/ParseServerTest.java
index f854b42..1ab0f40 100644
--- 
a/providers/gogrid/src/test/java/org/jclouds/gogrid/parse/ParseServerTest.java
+++ 
b/providers/gogrid/src/test/java/org/jclouds/gogrid/parse/ParseServerTest.java
@@ -50,7 +50,7 @@ public class ParseServerTest extends 
BaseItemParserTest<Server> {
    @SelectJson("list")
    @OnlyElement
    public Server expected() {
-      Option dc = Option.createWithIdNameAndDescription(1l, "US-West-1", "US 
West 1 Datacenter");
+      Option dc = Option.createWithIdNameAndDescription(1L, "US-West-1", "US 
West 1 Datacenter");
       Option centOs = Option.createWithIdNameAndDescription(13L, "CentOS 5.2 
(32-bit)", "CentOS 5.2 (32-bit)");
       Option webServer = Option.createWithIdNameAndDescription(1L, "Web 
Server", "Web or Application Server");
       return 
Server.builder().id(75245L).datacenter(dc).isSandbox(false).name("PowerServer").description("server
 to test the api. created by Alex")

http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/providers/profitbricks/src/test/java/org/jclouds/profitbricks/compute/config/StatusPredicateTest.java
----------------------------------------------------------------------
diff --git 
a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/compute/config/StatusPredicateTest.java
 
b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/compute/config/StatusPredicateTest.java
index 9c2b228..b2f4607 100644
--- 
a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/compute/config/StatusPredicateTest.java
+++ 
b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/compute/config/StatusPredicateTest.java
@@ -62,7 +62,7 @@ public class StatusPredicateTest extends 
BaseProfitBricksMockTest {
 
       Predicate<String> waitUntilAvailable = Predicates2.retry(
               new DataCenterProvisioningStatePredicate(pbApi, 
ProvisioningState.AVAILABLE),
-              30l, 1l, TimeUnit.SECONDS);
+              30L, 1L, TimeUnit.SECONDS);
 
       String id = "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee";
       try {
@@ -95,7 +95,7 @@ public class StatusPredicateTest extends 
BaseProfitBricksMockTest {
 
       Predicate<String> waitUntilAvailable = Predicates2.retry(
               new ServerStatusPredicate(pbApi, Server.Status.RUNNING),
-              30l, 1l, TimeUnit.SECONDS);
+              30L, 1L, TimeUnit.SECONDS);
 
       String id = "qwertyui-qwer-qwer-qwer-qwertyyuiiop";
       try {
@@ -128,7 +128,7 @@ public class StatusPredicateTest extends 
BaseProfitBricksMockTest {
 
       Predicate<String> waitUntilAvailable = Predicates2.retry(
               new SnapshotProvisioningStatePredicate(pbApi, 
ProvisioningState.AVAILABLE),
-              30l, 1l, TimeUnit.SECONDS);
+              30L, 1L, TimeUnit.SECONDS);
 
       String id = "qswdefrg-qaws-qaws-defe-rgrgdsvcxbrh";
       try {

Reply via email to