Avoid lower-case l literal suffix Readers can confuse this with 1. Found via error-prone. Fixed via:
find -name \*.java | xargs sed -i 's/\( [0-9][0-9]*\)l/\1L/g' find -name \*.java | xargs sed -i 's/\(([0-9][0-9]*\)l/\1L/g' Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/3c9f66b8 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/3c9f66b8 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/3c9f66b8 Branch: refs/heads/master Commit: 3c9f66b8e9026d0f640a9a293d61547bf956dfc0 Parents: 8117574 Author: Andrew Gaul <[email protected]> Authored: Sun Oct 23 13:56:14 2016 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sun Oct 23 14:24:35 2016 -0700 ---------------------------------------------------------------------- .../org/jclouds/atmos/AtmosClientLiveTest.java | 2 +- .../blobstore/AtmosBlobRequestSignerTest.java | 2 +- .../jclouds/atmos/filters/SignRequestTest.java | 2 +- .../ParseSystemMetadataFromHeadersTest.java | 2 +- .../org/jclouds/chef/util/ChefUtilsTest.java | 4 +-- .../java/org/jclouds/ohai/config/JMXTest.java | 2 +- .../org/jclouds/ohai/config/OhaiModuleTest.java | 4 +-- .../features/AccountApiExpectTest.java | 22 +++++++-------- .../cloudstack/features/AsyncJobApiTest.java | 2 +- .../cloudstack/features/GuestOSApiTest.java | 4 +-- .../cloudstack/features/VolumeApiTest.java | 2 +- .../DeleteIPForwardingRuleResponseTest.java | 2 +- .../parse/DeleteNetworkResponseTest.java | 2 +- .../parse/DisableStaticNATResponseTest.java | 2 +- .../parse/ListAccountsResponseTest.java | 22 +++++++-------- .../parse/ListTemplatesResponseTest.java | 6 ++--- .../parse/ListUsageRecordsResponseTest.java | 2 +- .../binders/MetricDataBinderTest.java | 6 ++--- .../features/MetricApiExpectTest.java | 4 +-- .../compute/functions/ImageToImageTest.java | 12 ++++----- .../PredicateLocateImageByNameTest.java | 12 ++++----- .../docker/features/ContainerApiMockTest.java | 2 +- .../EC2ComputeServiceDependenciesModule.java | 2 +- ...ockDeviceMappingToIndexedFormParamsTest.java | 2 +- .../ElasticStackComputeServiceAdapter.java | 2 +- .../elasticstack/ElasticStackApiLiveTest.java | 14 +++++----- .../elasticstack/ElasticStackApiTest.java | 4 +-- .../BindDriveDataToPlainTextStringTest.java | 4 +-- .../binders/BindDriveToPlainTextStringTest.java | 4 +-- .../functions/BaseDriveToMapTest.java | 4 +-- .../functions/CreateDriveRequestToMapTest.java | 4 +-- .../functions/DriveDataToMapTest.java | 4 +-- .../functions/MapToDriveInfoTest.java | 8 +++--- .../functions/MapToServerInfoTest.java | 2 +- .../functions/MapToStandardDriveTest.java | 4 +-- .../config/NovaComputeServiceContextModule.java | 2 +- .../openstack/swift/v1/binders/SetPayload.java | 2 +- .../swift/v1/TemporaryUrlSignerMockTest.java | 4 +-- .../swift/v1/features/AccountApiMockTest.java | 6 ++--- .../swift/v1/features/ContainerApiMockTest.java | 8 +++--- .../swift/v1/features/ObjectApiMockTest.java | 2 +- .../binders/BindS3ObjectMetadataToRequest.java | 2 +- .../BackoffOnNotFoundWhenGetBucketACL.java | 2 +- .../s3/filters/RequestAuthorizeSignatureV4.java | 2 +- .../BindS3ObjectMetadataToRequestTest.java | 8 +++--- .../ParseObjectMetadataFromHeadersTest.java | 12 ++++----- .../jclouds/s3/xml/ListBucketHandlerTest.java | 20 +++++++------- .../sqs/functions/MapToQueueAttributesTest.java | 2 +- .../handlers/AWSServerErrorRetryHandler.java | 2 +- .../TransientBlobRequestSignerTest.java | 2 +- .../functions/BlobToHttpGetOptionsTest.java | 4 +-- .../ParseBlobFromHeadersAndHttpContentTest.java | 2 +- ...rseSystemAndUserMetadataFromHeadersTest.java | 2 +- .../internal/BaseBlobIntegrationTest.java | 4 +-- .../internal/BaseBlobSignerExpectTest.java | 6 ++--- .../stub/config/StubComputeServiceAdapter.java | 2 +- .../internal/BaseImageExtensionLiveTest.java | 2 +- .../jclouds/ovf/xml/DiskSectionHandlerTest.java | 4 +-- .../handlers/BackoffLimitedRetryHandler.java | 2 +- .../main/java/org/jclouds/util/Predicates2.java | 8 +++--- .../java/org/jclouds/date/DateServiceTest.java | 16 +++++------ .../DateServiceDateCodecFactoryTest.java | 2 +- .../org/jclouds/functions/JoinOnCommaTest.java | 4 +-- .../BackoffLimitedRetryHandlerTest.java | 2 +- .../BaseHttpCommandExecutorServiceTest.java | 8 +++--- .../FilterStringsBoundToInjectorByNameTest.java | 2 +- .../ReadAnnotationsAndPropertiesTest.java | 6 ++--- .../rest/internal/InvokeHttpMethodTest.java | 4 +-- .../jclouds/gae/ConvertToGaeRequestTest.java | 2 +- .../ec2/features/SpotInstanceApiMockTest.java | 4 +-- .../DescribeSpotPriceHistoryOptionsTest.java | 2 +- .../RequestSpotInstancesOptionsTest.java | 2 +- .../s3/blobstore/AWSS3BlobSignerExpectTest.java | 4 +-- .../blobstore/AWSS3BlobSignerV4ExpectTest.java | 4 +-- .../binders/BindAzureBlobMetadataToRequest.java | 2 +- .../BindAzureBlobMetadataToRequestTest.java | 8 +++--- .../blobstore/AzureBlobRequestSignerTest.java | 2 +- .../dynect/v3/features/RecordApiExpectTest.java | 28 ++++++++++---------- .../dynect/v3/features/ZoneApiExpectTest.java | 4 +-- .../v3/parse/DeleteZoneChangesResponseTest.java | 2 +- .../dynect/v3/parse/DeleteZoneResponseTest.java | 2 +- .../dynect/v3/parse/GetRecordResponseTest.java | 2 +- .../v3/parse/GetSOARecordResponseTest.java | 2 +- .../v3/parse/GetSPFRecordResponseTest.java | 2 +- .../v3/parse/GetSRVRecordResponseTest.java | 2 +- .../v3/parse/GetSSHFPRecordResponseTest.java | 2 +- .../v3/parse/ListRecordsResponseTest.java | 10 +++---- .../v3/predicates/RecordPredicatesTest.java | 2 +- .../strategy/GoGridComputeServiceAdapter.java | 4 +-- .../functions/ServerToNodeMetadataTest.java | 8 +++--- .../gogrid/features/GridImageApiTest.java | 2 +- .../features/GridLoadBalancerApiTest.java | 2 +- .../ParseLoadBalancersFromJsonResponseTest.java | 2 +- .../gogrid/parse/ParseServerListTest.java | 2 +- .../jclouds/gogrid/parse/ParseServerTest.java | 2 +- .../compute/config/StatusPredicateTest.java | 6 ++--- 96 files changed, 225 insertions(+), 225 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/atmos/src/test/java/org/jclouds/atmos/AtmosClientLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/AtmosClientLiveTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/AtmosClientLiveTest.java index 0ba9a37..aef93ec 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/AtmosClientLiveTest.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/AtmosClientLiveTest.java @@ -213,7 +213,7 @@ public class AtmosClientLiveTest extends BaseBlobStoreIntegrationTest { AtmosObject object = getApi().newObject(); object.getContentMetadata().setName(name); object.setPayload(Payloads.newPayload(data)); - object.getContentMetadata().setContentLength(16l); + object.getContentMetadata().setContentLength(16L); object.getContentMetadata().setContentMD5(hashCode.asBytes()); object.getContentMetadata().setContentType("text/plain"); object.getUserMetadata().getMetadata().put("Metadata", metadataValue); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java ---------------------------------------------------------------------- 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 index 46348fb..d875427 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/blobstore/AtmosBlobRequestSignerTest.java @@ -88,7 +88,7 @@ public class AtmosBlobRequestSignerTest 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.asBytes()); blob.getPayload().getContentMetadata().setContentType("text/plain"); blob.getPayload().getContentMetadata().setExpires(new Date(1000)); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/atmos/src/test/java/org/jclouds/atmos/filters/SignRequestTest.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/filters/SignRequestTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/filters/SignRequestTest.java index 7993bbc..e45faa7 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/filters/SignRequestTest.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/filters/SignRequestTest.java @@ -120,7 +120,7 @@ public class SignRequestTest { .endpoint("http://localhost/rest/objects";) .headers(headers).build(); request.setPayload(""); - request.getPayload().getContentMetadata().setContentLength(4286l); + request.getPayload().getContentMetadata().setContentLength(4286L); request.getPayload().getContentMetadata().setContentType(MediaType.APPLICATION_OCTET_STREAM); return request; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/atmos/src/test/java/org/jclouds/atmos/functions/ParseSystemMetadataFromHeadersTest.java ---------------------------------------------------------------------- diff --git a/apis/atmos/src/test/java/org/jclouds/atmos/functions/ParseSystemMetadataFromHeadersTest.java b/apis/atmos/src/test/java/org/jclouds/atmos/functions/ParseSystemMetadataFromHeadersTest.java index b16be72..488f69a 100644 --- a/apis/atmos/src/test/java/org/jclouds/atmos/functions/ParseSystemMetadataFromHeadersTest.java +++ b/apis/atmos/src/test/java/org/jclouds/atmos/functions/ParseSystemMetadataFromHeadersTest.java @@ -38,7 +38,7 @@ public class ParseSystemMetadataFromHeadersTest { dateService.iso8601SecondsDateParse("2009-10-19T04:37:00Z"), "rootr", dateService.iso8601SecondsDateParse("2009-10-12T16:09:42Z"), dateService.iso8601SecondsDateParse("2009-10-19T04:37:00Z"), 1, - "4980cdb2b010109b04a44f7bb83f5f04ad354c638ae5", "e913e09366364e9ba384b8fead643d43", "default", 4096l, + "4980cdb2b010109b04a44f7bb83f5f04ad354c638ae5", "e913e09366364e9ba384b8fead643d43", "default", 4096L, FileType.DIRECTORY, "root" ); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java ---------------------------------------------------------------------- diff --git a/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java b/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java index 40645e7..5f625f4 100644 --- a/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java +++ b/apis/chef/src/test/java/org/jclouds/chef/util/ChefUtilsTest.java @@ -31,9 +31,9 @@ import com.google.common.collect.ImmutableList; */ @Test(groups = { "unit" }, sequential = true) public class ChefUtilsTest { - public static long millis = 1280251180727l; + public static long millis = 1280251180727L; public static String millisString = "1280251180727"; - public static Date now = new Date(1280251180727l); + public static Date now = new Date(1280251180727L); public void testToOhaiTime() { assertEquals(ChefUtils.toOhaiTime(millis).toString(), millisString); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java ---------------------------------------------------------------------- diff --git a/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java b/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java index bcda2e9..1ff36a1 100644 --- a/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java +++ b/apis/chef/src/test/java/org/jclouds/ohai/config/JMXTest.java @@ -51,7 +51,7 @@ public class JMXTest { final RuntimeMXBean runtime = createMock(RuntimeMXBean.class); - expect(runtime.getUptime()).andReturn(69876000l); + expect(runtime.getUptime()).andReturn(69876000L); replay(runtime); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java ---------------------------------------------------------------------- diff --git a/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java b/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java index 9f36fe9..093f76b 100644 --- a/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java +++ b/apis/chef/src/test/java/org/jclouds/ohai/config/OhaiModuleTest.java @@ -66,7 +66,7 @@ public class OhaiModuleTest { }, new ChefParserModule(), new GsonModule(), new OhaiModule() { @Override protected Long millis() { - return 127999291932529l; + return 127999291932529L; } @Override @@ -100,7 +100,7 @@ public class OhaiModuleTest { }, new ChefParserModule(), new GsonModule(), new OhaiModule() { @Override protected Long millis() { - return 1279992919l; + return 1279992919L; } @Override http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java index 385f221..f69e378 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AccountApiExpectTest.java @@ -76,22 +76,22 @@ public class AccountApiExpectTest extends BaseCloudStackExpectTest<AccountApi> { .domain("AA000062-jclouds-dev") .receivedBytes(318900216) .sentBytes(23189677) - .VMLimit(15l) + .VMLimit(15L) .VMs(1) - .IPsAvailable(14l) - .IPLimit(15l) + .IPsAvailable(14L) + .IPLimit(15L) .IPs(0) - .IPsAvailable(15l) - .volumeLimit(90l) + .IPsAvailable(15L) + .volumeLimit(90L) .volumes(2) - .volumesAvailable(88l) - .snapshotLimit(250l) + .volumesAvailable(88L) + .snapshotLimit(250L) .snapshots(0) - .snapshotsAvailable(250l) - .templateLimit(15l) + .snapshotsAvailable(250L) + .templateLimit(15L) .templates(0) - .templatesAvailable(15l) - .VMsAvailable(14l) + .templatesAvailable(15L) + .VMsAvailable(14L) .VMsStopped(0) .VMsRunning(1) .state(Account.State.ENABLED) http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiTest.java index a61d4e0..6801862 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/AsyncJobApiTest.java @@ -42,7 +42,7 @@ public class AsyncJobApiTest extends BaseCloudStackApiTest<AsyncJobApi> { public void testGetAsyncJob() throws SecurityException, NoSuchMethodException, IOException { Invokable<?, ?> method = method(AsyncJobApi.class, "getAsyncJob", String.class); - GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(11l)); + GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(11L)); assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=queryAsyncJobResult&jobid=11 HTTP/1.1"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSApiTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSApiTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSApiTest.java index 5f3e657..4884985 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSApiTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/GuestOSApiTest.java @@ -44,7 +44,7 @@ public class GuestOSApiTest extends BaseCloudStackApiTest<GuestOSApi> { public void testGetOSCategory() throws SecurityException, NoSuchMethodException, IOException { Invokable<?, ?> method = method(GuestOSApi.class, "getOSCategory", String.class); - GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(11l)); + GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(11L)); assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=listOsCategories&listAll=true&id=11 HTTP/1.1"); @@ -78,7 +78,7 @@ public class GuestOSApiTest extends BaseCloudStackApiTest<GuestOSApi> { public void testGetOSType() throws SecurityException, NoSuchMethodException, IOException { Invokable<?, ?> method = method(GuestOSApi.class, "getOSType", String.class); - GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(11l)); + GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of(11L)); assertRequestLineEquals(httpRequest, "GET http://localhost:8080/client/api?response=json&command=listOsTypes&listAll=true&id=11 HTTP/1.1"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiTest.java index 9002f46..0431abd 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/features/VolumeApiTest.java @@ -82,7 +82,7 @@ public class VolumeApiTest extends BaseCloudStackApiTest<VolumeApi> { public void testCreateVolumeWithSnapshot() throws SecurityException, NoSuchMethodException, IOException { Invokable<?, ?> method = method(VolumeApi.class, "createVolumeFromSnapshotInZone", String.class, String.class, String.class); - GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("jclouds-volume", 999L, 111l)); + GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("jclouds-volume", 999L, 111L)); assertRequestLineEquals(httpRequest, createVolumeFromSnapshot.getRequestLine()); assertNonPayloadHeadersEqual(httpRequest, "Accept: application/json\n"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteIPForwardingRuleResponseTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteIPForwardingRuleResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteIPForwardingRuleResponseTest.java index 6080c4a..9b56ef1 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteIPForwardingRuleResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteIPForwardingRuleResponseTest.java @@ -31,7 +31,7 @@ public class DeleteIPForwardingRuleResponseTest extends BaseItemParserTest<Long> @Override @SelectJson("jobid") public Long expected() { - return 50005l; + return 50005L; } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java index 1e90ee8..c84913f 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DeleteNetworkResponseTest.java @@ -31,7 +31,7 @@ public class DeleteNetworkResponseTest extends BaseItemParserTest<Long> { @Override @SelectJson("jobid") public Long expected() { - return 45612l; + return 45612L; } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DisableStaticNATResponseTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DisableStaticNATResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DisableStaticNATResponseTest.java index 65c8d9f..bd93204 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DisableStaticNATResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/DisableStaticNATResponseTest.java @@ -31,7 +31,7 @@ public class DisableStaticNATResponseTest extends BaseItemParserTest<Long> { @Override @SelectJson("jobid") public Long expected() { - return 50006l; + return 50006L; } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java index 5aa1e8b..b68d38a 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListAccountsResponseTest.java @@ -66,22 +66,22 @@ public class ListAccountsResponseTest extends BaseSetParserTest<Account> { .domain("AA000062-jclouds-dev") .receivedBytes(318900216) .sentBytes(23189677) - .VMLimit(15l) + .VMLimit(15L) .VMs(1) - .IPsAvailable(14l) - .IPLimit(15l) + .IPsAvailable(14L) + .IPLimit(15L) .IPs(0) - .IPsAvailable(15l) - .volumeLimit(90l) + .IPsAvailable(15L) + .volumeLimit(90L) .volumes(2) - .volumesAvailable(88l) - .snapshotLimit(250l) + .volumesAvailable(88L) + .snapshotLimit(250L) .snapshots(0) - .snapshotsAvailable(250l) - .templateLimit(15l) + .snapshotsAvailable(250L) + .templateLimit(15L) .templates(0) - .templatesAvailable(15l) - .VMsAvailable(14l) + .templatesAvailable(15L) + .VMsAvailable(14L) .VMsStopped(0) .VMsRunning(1) .state(State.ENABLED) http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java index d33a206..416a0e4 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListTemplatesResponseTest.java @@ -54,13 +54,13 @@ public class ListTemplatesResponseTest extends BaseSetParserTest<Template> { .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-03-20T19:17:48-0700")) .ready(true).passwordEnabled(false).format(Format.QCOW2).featured(true).crossZones(true) .OSTypeId("112").OSType("CentOS 5.5 (64-bit)").account("system").zoneId("2").zone("Chicago") - .size(8589934592l).type(Type.BUILTIN).hypervisor("KVM").domain("ROOT").domainId("1").extractable(true) + .size(8589934592L).type(Type.BUILTIN).hypervisor("KVM").domain("ROOT").domainId("1").extractable(true) .build(), Template.builder().id("203").name("Windows 7 KVM").displayText("Windows 7 KVM").isPublic(true) .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-03-20T22:02:18-0700")) .ready(true).passwordEnabled(false).format(Format.QCOW2).featured(true).crossZones(false) .OSTypeId("48").OSType("Windows 7 (32-bit)").account("admin").zoneId("2").zone("Chicago") - .size(17179869184l).type(Type.USER).hypervisor("KVM").domain("ROOT").domainId("1").extractable(false) + .size(17179869184L).type(Type.USER).hypervisor("KVM").domain("ROOT").domainId("1").extractable(false) .build(), Template.builder().id("7").name("CentOS 5.3(64-bit) no GUI (vSphere)") .displayText("CentOS 5.3(64-bit) no GUI (vSphere)").isPublic(true) @@ -72,7 +72,7 @@ public class ListTemplatesResponseTest extends BaseSetParserTest<Template> { .created(new SimpleDateFormatDateService().iso8601SecondsDateParse("2011-04-21T09:43:25-0700")) .ready(true).passwordEnabled(false).format(Format.QCOW2).featured(false).crossZones(false) .OSTypeId("14").OSType("CentOS 5.4 (64-bit)").account("rs3").zoneId("2").zone("Chicago") - .size(10737418240l).type(Type.USER).hypervisor("KVM").domain("ROOT").domainId("1").extractable(false) + .size(10737418240L).type(Type.USER).hypervisor("KVM").domain("ROOT").domainId("1").extractable(false) .tags(ImmutableSet.of(Tag.builder().account("rs3").domain("ROOT").domainId("1").key("some-tag") .resourceId("241").resourceType(Tag.ResourceType.TEMPLATE).value("some-value").build())) .build()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java index a55bf7e..9bc5ec3 100644 --- a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java +++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/parse/ListUsageRecordsResponseTest.java @@ -60,7 +60,7 @@ public class ListUsageRecordsResponseTest extends BaseSetParserTest<UsageRecord> .accountName("admin").accountId("2").domainId("1").zoneId("1") .description("Template Id:203 Size:3117171712") .usage("24 Hrs").usageType(UsageRecord.UsageType.TEMPLATE).rawUsageHours(24) - .size(3117171712l).templateId("0").id("203").project("project1").projectId("1") + .size(3117171712L).templateId("0").id("203").project("project1").projectId("1") .startDate(start).endDate(end).build()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/binders/MetricDataBinderTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/binders/MetricDataBinderTest.java b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/binders/MetricDataBinderTest.java index 117702d..71819a2 100644 --- a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/binders/MetricDataBinderTest.java +++ b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/binders/MetricDataBinderTest.java @@ -77,7 +77,7 @@ public class MetricDataBinderTest { .dimension(new Dimension("TestDimension", "FAKE")) .dimension(new Dimension("TestDimension2", "FAKE2")) .unit(Unit.COUNT) - .timestamp(new Date(10000000l)) + .timestamp(new Date(10000000L)) .value(5.0) .build(); @@ -107,14 +107,14 @@ public class MetricDataBinderTest { .dimension(new Dimension("TestDimension", "FAKE")) .dimension(new Dimension("TestDimension2", "FAKE2")) .unit(Unit.COUNT) - .timestamp(new Date(10000000l)) + .timestamp(new Date(10000000L)) .value(2.0) .build(); MetricDatum metricDatum2 = MetricDatum.builder() .metricName("TestMetricName") .dimension(new Dimension("TestDimension", "FAKE")) .unit(Unit.COUNT) - .timestamp(new Date(10000000l)) + .timestamp(new Date(10000000L)) .value(5.0) .build(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java index 49ee743..bfa6115 100644 --- a/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java +++ b/apis/cloudwatch/src/test/java/org/jclouds/cloudwatch/features/MetricApiExpectTest.java @@ -156,11 +156,11 @@ public class MetricApiExpectTest extends BaseCloudWatchApiExpectTest { } GetMetricStatistics stats = GetMetricStatistics.builder() - .endTime(new Date(10000000l)) + .endTime(new Date(10000000L)) .metricName(EC2Constants.MetricName.CPU_UTILIZATION) .namespace(Namespaces.EC2) .period(60) - .startTime(new Date(10000000l)) + .startTime(new Date(10000000L)) .statistic(Statistics.MAXIMUM) .statistic(Statistics.MINIMUM) .unit(Unit.PERCENT).build(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java ---------------------------------------------------------------------- diff --git a/apis/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java b/apis/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java index 83c1c3b..10b4c9b 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/compute/functions/ImageToImageTest.java @@ -53,8 +53,8 @@ public class ImageToImageTest { "1.3.1", // dockerVersion "x86_64", // architecture "os", // os - 0l, // size - 0l, // virtualSize + 0L, // size + 0L, // virtualSize ImmutableList.<String> of() // repoTags ); @@ -74,8 +74,8 @@ public class ImageToImageTest { "1.3.1", // dockerVersion "x86_64", // architecture "os", // os - 0l, // size - 0l, // virtualSize + 0L, // size + 0L, // virtualSize ImmutableList.of("registry.company.example:8888/a/b/c/d:latest") // repoTags ); @@ -101,8 +101,8 @@ public class ImageToImageTest { "1.3.1", // dockerVersion "x86_64", // architecture "os", // os - 0l, // size - 0l, // virtualSize + 0L, // size + 0L, // virtualSize ImmutableList.of("repoTag1:version") // repoTags ); function = new ImageToImage(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/docker/src/test/java/org/jclouds/docker/compute/strategy/PredicateLocateImageByNameTest.java ---------------------------------------------------------------------- diff --git a/apis/docker/src/test/java/org/jclouds/docker/compute/strategy/PredicateLocateImageByNameTest.java b/apis/docker/src/test/java/org/jclouds/docker/compute/strategy/PredicateLocateImageByNameTest.java index dd8b654..33170f7 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/compute/strategy/PredicateLocateImageByNameTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/compute/strategy/PredicateLocateImageByNameTest.java @@ -46,8 +46,8 @@ public class PredicateLocateImageByNameTest { "1.3.1", // dockerVersion "x86_64", // architecture "os", // os - 0l, // size - 0l, // virtualSize + 0L, // size + 0L, // virtualSize ImmutableList.<String> of("kwart/alpine-ext:3.3-ssh", "kwart/alpine-ext:latest", "my-tag:latestdock") // repoTags ); @@ -59,8 +59,8 @@ public class PredicateLocateImageByNameTest { "1.3.1", // dockerVersion "x86_64", // architecture "os", // os - 0l, // size - 0l, // virtualSize + 0L, // size + 0L, // virtualSize ImmutableList.<String> of() // repoTags ); @@ -72,8 +72,8 @@ public class PredicateLocateImageByNameTest { "1.3.1", // dockerVersion "x86_64", // architecture "os", // os - 0l, // size - 0l, // virtualSize + 0L, // size + 0L, // virtualSize ImmutableList.<String> of("docker.io/kwart/alpine-ext:3.3-ssh", "docker.io/kwart/alpine-ext:latest") // repoTags ); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/docker/src/test/java/org/jclouds/docker/features/ContainerApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/docker/src/test/java/org/jclouds/docker/features/ContainerApiMockTest.java b/apis/docker/src/test/java/org/jclouds/docker/features/ContainerApiMockTest.java index a9d32b5..c2eff09 100644 --- a/apis/docker/src/test/java/org/jclouds/docker/features/ContainerApiMockTest.java +++ b/apis/docker/src/test/java/org/jclouds/docker/features/ContainerApiMockTest.java @@ -63,7 +63,7 @@ public class ContainerApiMockTest extends BaseDockerMockTest { } } - @Test(timeOut = 10000l) + @Test(timeOut = 10000L) public void testListAllContainers() throws Exception { MockWebServer server = mockWebServer(new MockResponse().setBody(payloadFromResource("/containers.json"))); ContainerApi api = api(DockerApi.class, server.getUrl("/").toString()).getContainerApi(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceDependenciesModule.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceDependenciesModule.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceDependenciesModule.java index 0a1a243..62b72dd 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceDependenciesModule.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/config/EC2ComputeServiceDependenciesModule.java @@ -187,7 +187,7 @@ public class EC2ComputeServiceDependenciesModule extends AbstractModule { @Named("SECURITY") protected final Predicate<RegionAndName> securityGroupEventualConsistencyDelay(SecurityGroupPresent in, @Named(PROPERTY_EC2_TIMEOUT_SECURITYGROUP_PRESENT) long msDelay) { - return retry(in, msDelay, 100l, MILLISECONDS); + return retry(in, msDelay, 100L, MILLISECONDS); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParamsTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParamsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParamsTest.java index d6ca4ab..3217c7f 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParamsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/binders/BindBlockDeviceMappingToIndexedFormParamsTest.java @@ -43,7 +43,7 @@ public class BindBlockDeviceMappingToIndexedFormParamsTest { public void testMappingOrdersLexicographically() { Map<String, BlockDevice> mapping = Maps.newLinkedHashMap(); mapping.put("apple", new BlockDevice("appleId", true)); - Date date = new Date(999999l); + Date date = new Date(999999L); mapping.put("cranberry", new BlockDevice("cranberry", Status.ATTACHED, date, false)); HttpRequest request = HttpRequest.builder().method("POST").endpoint("http://localhost";) http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java index 2f0c11e..7bc00c7 100644 --- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java +++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapter.java @@ -104,7 +104,7 @@ public class ElasticStackComputeServiceAdapter implements @Override public NodeAndInitialCredentials<ServerInfo> createNodeWithGroupEncodedIntoName(String tag, String name, Template template) { - long bootSize = (long) (template.getHardware().getVolumes().get(0).getSize() * 1024 * 1024 * 1024l); + long bootSize = (long) (template.getHardware().getVolumes().get(0).getSize() * 1024 * 1024 * 1024L); logger.debug(">> creating boot drive bytes(%d)", bootSize); DriveInfo drive = client http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiLiveTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiLiveTest.java index 2c1947e..a946c85 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiLiveTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiLiveTest.java @@ -69,7 +69,7 @@ public class ElasticStackApiLiveTest extends BaseComputeServiceContextLiveTest { provider = "elasticstack"; } - protected long driveSize = 1 * 1024 * 1024 * 1024l; + protected long driveSize = 1 * 1024 * 1024 * 1024L; protected int maxDriveImageTime = 360; protected String vncPassword = "Il0veVNC"; protected ElasticStackApi client; @@ -167,10 +167,10 @@ public class ElasticStackApiLiveTest extends BaseComputeServiceContextLiveTest { assertEquals(drive.getSize(), driveSize); assertEquals(drive.getStatus(), DriveStatus.ACTIVE); // for some reason, these occasionally return as 4096,1 - // assertEquals(info.getReadBytes(), 0l); - // assertEquals(info.getWriteBytes(), 0l); - // assertEquals(info.getReadRequests(), 0l); - // assertEquals(info.getWriteRequests(), 0l); + // assertEquals(info.getReadBytes(), 0L); + // assertEquals(info.getWriteBytes(), 0L); + // assertEquals(info.getReadRequests(), 0L); + // assertEquals(info.getWriteRequests(), 0L); assertEquals(drive.getEncryptionCipher(), "aes-xts-plain"); } @@ -326,7 +326,7 @@ public class ElasticStackApiLiveTest extends BaseComputeServiceContextLiveTest { private DriveInfo drive3; public void testWeCanReadAndWriteToDrive() throws IOException { - drive2 = client.createDrive(new CreateDriveRequest.Builder().name(prefix + "2").size(1 * 1024 * 1024l).build()); + drive2 = client.createDrive(new CreateDriveRequest.Builder().name(prefix + "2").size(1 * 1024 * 1024L).build()); client.writeDrive(drive2.getUuid(), Payloads.newStringPayload("foo")); assertEquals(Strings2.toStringAndClose(client.readDrive(drive2.getUuid(), 0, 3).openStream()), "foo"); } @@ -335,7 +335,7 @@ public class ElasticStackApiLiveTest extends BaseComputeServiceContextLiveTest { public void testWeCopyADriveContentsViaGzip() throws IOException { try { drive3 = client - .createDrive(new CreateDriveRequest.Builder().name(prefix + "3").size(1 * 1024 * 1024l).build()); + .createDrive(new CreateDriveRequest.Builder().name(prefix + "3").size(1 * 1024 * 1024L).build()); System.err.println("before image; drive 2" + client.getDriveInfo(drive2.getUuid())); System.err.println("before image; drive 3" + client.getDriveInfo(drive3.getUuid())); client.imageDrive(drive2.getUuid(), drive3.getUuid()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java index 83e0ecd..90bddd9 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackApiTest.java @@ -312,7 +312,7 @@ public class ElasticStackApiTest extends BaseRestAnnotationProcessingTest<Elasti public void testCreateDrive() throws SecurityException, NoSuchMethodException, IOException { Invokable<?, ?> method = method(ElasticStackApi.class, "createDrive", Drive.class); GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of( - new CreateDriveRequest.Builder().name("foo").size(10000l).build())); + new CreateDriveRequest.Builder().name("foo").size(10000L).build())); assertRequestLineEquals(httpRequest, "POST https://api-lon-p.elastichosts.com/drives/create HTTP/1.1"); assertNonPayloadHeadersEqual(httpRequest, "Accept: text/plain\n"); @@ -329,7 +329,7 @@ public class ElasticStackApiTest extends BaseRestAnnotationProcessingTest<Elasti public void testSetDriveData() throws SecurityException, NoSuchMethodException, IOException { Invokable<?, ?> method = method(ElasticStackApi.class, "setDriveData", String.class, DriveData.class); GeneratedHttpRequest httpRequest = processor.createRequest(method, ImmutableList.<Object> of("100", - new DriveData.Builder().name("foo").size(10000l).tags(ImmutableList.of("production", "candy")).build())); + new DriveData.Builder().name("foo").size(10000L).tags(ImmutableList.of("production", "candy")).build())); assertRequestLineEquals(httpRequest, "POST https://api-lon-p.elastichosts.com/drives/100/set HTTP/1.1"); assertNonPayloadHeadersEqual(httpRequest, "Accept: text/plain\n"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextStringTest.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextStringTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextStringTest.java index 82b5258..d60a5fd 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextStringTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveDataToPlainTextStringTest.java @@ -56,7 +56,7 @@ public class BindDriveDataToPlainTextStringTest { public void testSimple() { HttpRequest request = HttpRequest.builder().method("POST").endpoint("https://host/drives/create";).build(); - FN.bindToRequest(request, new DriveData.Builder().name("foo").size(100l).build()); + FN.bindToRequest(request, new DriveData.Builder().name("foo").size(100L).build()); assertEquals(request.getPayload().getContentMetadata().getContentType(), MediaType.TEXT_PLAIN); assertEquals(request.getPayload().getRawContent(), "name foo\nsize 100"); } @@ -64,7 +64,7 @@ public class BindDriveDataToPlainTextStringTest { public void testComplete() throws IOException { DriveData input = new DriveData.Builder().name("Ubuntu 10.10 Server Edition Linux 64bit Preinstalled System") // - .size(8589934592l)// + .size(8589934592L)// .claimType(ClaimType.SHARED)// .readers(ImmutableSet.of("ffffffff-ffff-ffff-ffff-ffffffffffff"))// .tags(ImmutableSet.of("tag1", "tag2")).userMetadata(ImmutableMap.of("foo", "bar", "baz", "raz"))// http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextStringTest.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextStringTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextStringTest.java index 8392ff3..40aafc7 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextStringTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/binders/BindDriveToPlainTextStringTest.java @@ -57,7 +57,7 @@ public class BindDriveToPlainTextStringTest { public void testSimple() { HttpRequest request = HttpRequest.builder().method("POST").endpoint("https://host/drives/create";).build(); - FN.bindToRequest(request, new CreateDriveRequest.Builder().name("foo").size(100l).build()); + FN.bindToRequest(request, new CreateDriveRequest.Builder().name("foo").size(100L).build()); assertEquals(request.getPayload().getContentMetadata().getContentType(), MediaType.TEXT_PLAIN); assertEquals(request.getPayload().getRawContent(), "name foo\nsize 100"); } @@ -66,7 +66,7 @@ public class BindDriveToPlainTextStringTest { CreateDriveRequest input = new CreateDriveRequest.Builder() .name("Ubuntu 10.10 Server Edition Linux 64bit Preinstalled System") // - .size(8589934592l)// + .size(8589934592L)// .claimType(ClaimType.SHARED)// .readers(ImmutableSet.of("ffffffff-ffff-ffff-ffff-ffffffffffff"))// .tags(ImmutableSet.of("tag1", "tag2")).userMetadata(ImmutableMap.of("foo", "bar", "baz", "raz"))// http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/BaseDriveToMapTest.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/BaseDriveToMapTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/BaseDriveToMapTest.java index f99f1a4..f43a6fa 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/BaseDriveToMapTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/BaseDriveToMapTest.java @@ -33,14 +33,14 @@ public class BaseDriveToMapTest { private static final BaseDriveToMap BASEDRIVE_TO_MAP = new BaseDriveToMap(); public void testBasics() { - assertEquals(BASEDRIVE_TO_MAP.apply(new Drive.Builder().name("foo").size(100l).build()), + assertEquals(BASEDRIVE_TO_MAP.apply(new Drive.Builder().name("foo").size(100L).build()), ImmutableMap.of("name", "foo", "size", "100")); } public void testComplete() throws IOException { Drive one = new Drive.Builder().name("Ubuntu 10.10 Server Edition Linux 64bit Preinstalled System") // - .size(8589934592l)// + .size(8589934592L)// .claimType(ClaimType.SHARED)// .readers(ImmutableSet.of("ffffffff-ffff-ffff-ffff-ffffffffffff"))// .tags(ImmutableSet.of("tag1", "tag2")).userMetadata(ImmutableMap.of("foo", "bar", "baz", "raz"))// http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMapTest.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMapTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMapTest.java index 752a72c..6821d3d 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMapTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/CreateDriveRequestToMapTest.java @@ -35,7 +35,7 @@ public class CreateDriveRequestToMapTest { CreateDriveRequestToMap.class); public void testBasics() { - assertEquals(BASEDRIVE_TO_MAP.apply(new CreateDriveRequest.Builder().name("foo").size(100l).build()), + assertEquals(BASEDRIVE_TO_MAP.apply(new CreateDriveRequest.Builder().name("foo").size(100L).build()), ImmutableMap.of("name", "foo", "size", "100")); } @@ -43,7 +43,7 @@ public class CreateDriveRequestToMapTest { CreateDriveRequest one = new CreateDriveRequest.Builder() .name("Ubuntu 10.10 Server Edition Linux 64bit Preinstalled System") // - .size(8589934592l)// + .size(8589934592L)// .claimType(ClaimType.SHARED)// .readers(ImmutableSet.of("ffffffff-ffff-ffff-ffff-ffffffffffff"))// .tags(ImmutableSet.of("tag1", "tag2")).userMetadata(ImmutableMap.of("foo", "bar", "baz", "raz"))// http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/DriveDataToMapTest.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/DriveDataToMapTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/DriveDataToMapTest.java index f94efcc..d74f4cc 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/DriveDataToMapTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/DriveDataToMapTest.java @@ -34,14 +34,14 @@ public class DriveDataToMapTest { private static final DriveDataToMap BASEDRIVE_TO_MAP = Guice.createInjector().getInstance(DriveDataToMap.class); public void testBasics() { - assertEquals(BASEDRIVE_TO_MAP.apply(new DriveData.Builder().name("foo").size(100l).build()), + assertEquals(BASEDRIVE_TO_MAP.apply(new DriveData.Builder().name("foo").size(100L).build()), ImmutableMap.of("name", "foo", "size", "100")); } public void testComplete() throws IOException { DriveData one = new DriveData.Builder().name("Ubuntu 10.10 Server Edition Linux 64bit Preinstalled System") // - .size(8589934592l)// + .size(8589934592L)// .claimType(ClaimType.SHARED)// .readers(ImmutableSet.of("ffffffff-ffff-ffff-ffff-ffffffffffff"))// .tags(ImmutableSet.of("tag1", "tag2")).userMetadata(ImmutableMap.of("foo", "bar", "baz", "raz"))// http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToDriveInfoTest.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToDriveInfoTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToDriveInfoTest.java index 834dd81..966c03b 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToDriveInfoTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToDriveInfoTest.java @@ -37,8 +37,8 @@ public class MapToDriveInfoTest { .status(DriveStatus.ACTIVE) .name("Ubuntu 10.10 Server Edition Linux 64bit Preinstalled System") .metrics( - new DriveMetrics.Builder().readBytes(4096l).writeBytes(8589938688l).writeRequests(2097153l) - .readRequests(1l).build()) + new DriveMetrics.Builder().readBytes(4096L).writeBytes(8589938688L).writeRequests(2097153L) + .readRequests(1L).build()) .user("58ca3c1f-7629-4771-9b71-863f40153ba4") .encryptionCipher("aes-xts-plain") .uuid("b8171d28-755a-4271-b891-7998871a160e") @@ -51,7 +51,7 @@ public class MapToDriveInfoTest { "00031836-a624-4b22-bc7d-41ff8977087b:guest:17b076be-430d-4a76-9df3-b9896fec82a5:ide:0:0", "000663ee-9fb6-4461-90f6-01327a4aff07:guest:f83b519f-feab-42cf-859c-f61495681ada:ide:0:1"))// .readers(ImmutableSet.of("ffffffff-ffff-ffff-ffff-ffffffffffff"))// - .size(8589934592l)// + .size(8589934592L)// .userMetadata(ImmutableMap.of("foo", "bar", "baz", "raz")).build(); private static final MapToDriveInfo MAP_TO_DRIVE = new MapToDriveInfo(); @@ -61,7 +61,7 @@ public class MapToDriveInfoTest { } public void testBasics() { - DriveInfo expects = new DriveInfo.Builder().name("foo").size(100l).metrics(new DriveMetrics.Builder().build()) + DriveInfo expects = new DriveInfo.Builder().name("foo").size(100L).metrics(new DriveMetrics.Builder().build()) .build(); assertEquals(MAP_TO_DRIVE.apply(ImmutableMap.of("name", "foo", "size", "100")), expects); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToServerInfoTest.java ---------------------------------------------------------------------- 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 index 7a8c618..2427f32 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToServerInfoTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToServerInfoTest.java @@ -49,7 +49,7 @@ public class MapToServerInfoTest { .smp(1) .mem(1024) .status(ServerStatus.ACTIVE) - .started(new Date(1291493868l)) + .started(new Date(1291493868L)) .user("2f6244eb-50bc-4403-847e-f03cc3706a1f") .name("jo") .vnc(new VNC("46.20.114.124", "HfHzVmLT", false)) http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToStandardDriveTest.java ---------------------------------------------------------------------- diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToStandardDriveTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToStandardDriveTest.java index 2d8b20b..8d22423 100644 --- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToStandardDriveTest.java +++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/functions/MapToStandardDriveTest.java @@ -51,8 +51,8 @@ public class MapToStandardDriveTest { } public void testBasics() { - StandardDrive expects = new StandardDrive.Builder().name("foo").size(100l).media(MediaType.DISK) - .format(ImageConversionType.GZIP).rawSize(5l).build(); + StandardDrive expects = new StandardDrive.Builder().name("foo").size(100L).media(MediaType.DISK) + .format(ImageConversionType.GZIP).rawSize(5L).build(); assertEquals(MAP_TO_STANDARD_DRIVE.apply(ImmutableMap.of("name", "foo", "size", "100", "format", "gzip", "media", "disk", "rawsize", "5")), expects); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java index b38aa46..477ff0a 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java @@ -201,7 +201,7 @@ public class NovaComputeServiceContextModule extends protected final Predicate<AtomicReference<RegionAndName>> securityGroupEventualConsistencyDelay( FindSecurityGroupWithNameAndReturnTrue in, @Named(TIMEOUT_SECURITYGROUP_PRESENT) long msDelay) { - return retry(in, msDelay, 100l, MILLISECONDS); + return retry(in, msDelay, 100L, MILLISECONDS); } @Provides http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/SetPayload.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/SetPayload.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/SetPayload.java index f24a3ad..b5fefdc 100644 --- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/SetPayload.java +++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/binders/SetPayload.java @@ -49,7 +49,7 @@ public class SetPayload implements Binder { Long contentLength = payload.getContentMetadata().getContentLength(); if (contentLength != null && contentLength >= 0) { - checkArgument(contentLength <= 5l * 1024 * 1024 * 1024, "maximum size for put object is 5GB, %s", + checkArgument(contentLength <= 5L * 1024 * 1024 * 1024, "maximum size for put object is 5GB, %s", contentLength); } else { builder.replaceHeader(TRANSFER_ENCODING, "chunked").build(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java index 8f42cf3..a9ab9a2 100644 --- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java +++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java @@ -42,7 +42,7 @@ public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi> try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); String signature = TemporaryUrlSigner.checkApiEvery(api.getAccountApi("DFW"), 10000) - .sign("GET", "/v1/AUTH_account/container/object", 1323479485l); + .sign("GET", "/v1/AUTH_account/container/object", 1323479485L); assertEquals(signature, "d9fc2067e52b06598421664cf6610bfc8fc431f6"); @@ -64,7 +64,7 @@ public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi> try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); TemporaryUrlSigner.checkApiEvery(api.getAccountApi("DFW"), 10000) - .sign("GET", "/v1/AUTH_account/container/object", 1323479485l); + .sign("GET", "/v1/AUTH_account/container/object", 1323479485L); } finally { assertEquals(server.getRequestCount(), 2); assertEquals(server.takeRequest().getRequestLine(), "POST /tokens HTTP/1.1"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java index 8069770..72d3a1e 100644 --- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java +++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java @@ -53,9 +53,9 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> { try { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); Account account = api.getAccountApi("DFW").get(); - assertEquals(account.getContainerCount(), 3l); - assertEquals(account.getObjectCount(), 42l); - assertEquals(account.getBytesUsed(), 323479l); + assertEquals(account.getContainerCount(), 3L); + assertEquals(account.getObjectCount(), 42L); + assertEquals(account.getBytesUsed(), 323479L); for (Entry<String, String> entry : metadata.entrySet()) { assertEquals(account.getMetadata().get(entry.getKey().toLowerCase()), entry.getValue()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java index 74c7b30..618ec9a 100644 --- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java +++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java @@ -116,8 +116,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { Container container = api.getContainerApi("DFW").get("myContainer"); assertEquals(container.getName(), "myContainer"); - assertEquals(container.getObjectCount(), Long.valueOf(42l)); - assertEquals(container.getBytesUsed(), Long.valueOf(323479l)); + assertEquals(container.getObjectCount(), Long.valueOf(42L)); + assertEquals(container.getBytesUsed(), Long.valueOf(323479L)); for (Entry<String, String> entry : container.getMetadata().entrySet()) { assertEquals(container.getMetadata().get(entry.getKey().toLowerCase()), entry.getValue()); } @@ -236,8 +236,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); Container container = api.getContainerApi("DFW").get("myContainer"); assertEquals(container.getName(), "myContainer"); - assertEquals(container.getObjectCount(), Long.valueOf(42l)); - assertEquals(container.getBytesUsed(), Long.valueOf(323479l)); + assertEquals(container.getObjectCount(), Long.valueOf(42L)); + assertEquals(container.getBytesUsed(), Long.valueOf(323479L)); for (Entry<String, String> entry : container.getMetadata().entrySet()) { assertEquals(container.getMetadata().get(entry.getKey().toLowerCase()), entry.getValue()); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java index 28299de..06c3f65 100644 --- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java +++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java @@ -88,7 +88,7 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { .name("test_obj_2") .uri(URI.create(baseUri + "/test_obj_2")) .etag("b039efe731ad111bc1b0ef221c3849d0") - .payload(payload(64l, "application/octet-stream", null)) + .payload(payload(64L, "application/octet-stream", null)) .lastModified(dates.iso8601DateParse("2009-02-03T05:26:32.612278")).build(), SwiftObject.builder() .name("test obj 3") http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/s3/src/main/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequest.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/main/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequest.java b/apis/s3/src/main/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequest.java index d35a3e6..c50405c 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequest.java +++ b/apis/s3/src/main/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequest.java @@ -46,7 +46,7 @@ public class BindS3ObjectMetadataToRequest implements Binder { checkArgument(s3Object.getMetadata().getKey() != null, "s3Object.getMetadata().getKey() must be set!"); checkArgument(s3Object.getPayload().getContentMetadata().getContentLength() != null, "contentLength must be set, streaming not supported"); - checkArgument(s3Object.getPayload().getContentMetadata().getContentLength() <= 5l * 1024 * 1024 * 1024, + checkArgument(s3Object.getPayload().getContentMetadata().getContentLength() <= 5L * 1024 * 1024 * 1024, "maximum size for put object is 5GB"); request = metadataPrefixer.bindToRequest(request, s3Object.getMetadata().getUserMetadata()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/BackoffOnNotFoundWhenGetBucketACL.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/BackoffOnNotFoundWhenGetBucketACL.java b/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/BackoffOnNotFoundWhenGetBucketACL.java index 1dca87a..061ff0c 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/BackoffOnNotFoundWhenGetBucketACL.java +++ b/apis/s3/src/main/java/org/jclouds/s3/blobstore/internal/BackoffOnNotFoundWhenGetBucketACL.java @@ -45,7 +45,7 @@ public class BackoffOnNotFoundWhenGetBucketACL extends CacheLoader<String, Acces try { return client.getBucketACL(bucketName); } catch (ResourceNotFoundException e) { - imposeBackoffExponentialDelay(100l, 200l, 2, currentTries, maxTries); + imposeBackoffExponentialDelay(100L, 200L, 2, currentTries, maxTries); last = e; } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4.java b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4.java index 4e4edbd..c3eae42 100644 --- a/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4.java +++ b/apis/s3/src/main/java/org/jclouds/s3/filters/RequestAuthorizeSignatureV4.java @@ -84,7 +84,7 @@ public class RequestAuthorizeSignatureV4 implements RequestAuthorizeSignature { return false; } - return contentLength > 0l && !payload.isRepeatable(); + return contentLength > 0L && !payload.isRepeatable(); } protected HttpRequest signForAuthorizationHeader(HttpRequest request) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/s3/src/test/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequestTest.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/test/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequestTest.java b/apis/s3/src/test/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequestTest.java index 229f4a1..bbd8d4d 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequestTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/binders/BindS3ObjectMetadataToRequestTest.java @@ -44,7 +44,7 @@ public class BindS3ObjectMetadataToRequestTest extends BaseS3ClientTest<S3Client public void testPassWithMinimumDetailsAndPayload5GB() { S3Object object = injector.getInstance(S3Object.Factory.class).create(null); Payload payload = Payloads.newStringPayload(""); - payload.getContentMetadata().setContentLength(5368709120l); + payload.getContentMetadata().setContentLength(5368709120L); object.setPayload(payload); object.getMetadata().setKey("foo"); @@ -59,7 +59,7 @@ public class BindS3ObjectMetadataToRequestTest extends BaseS3ClientTest<S3Client public void testExtendedPropertiesBind() { S3Object object = injector.getInstance(S3Object.Factory.class).create(null); Payload payload = Payloads.newStringPayload(""); - payload.getContentMetadata().setContentLength(5368709120l); + payload.getContentMetadata().setContentLength(5368709120L); object.setPayload(payload); object.getMetadata().setKey("foo"); object.getMetadata().setUserMetadata(ImmutableMap.of("foo", "bar")); @@ -89,7 +89,7 @@ public class BindS3ObjectMetadataToRequestTest extends BaseS3ClientTest<S3Client public void testNoKeyIsBad() { S3Object object = injector.getInstance(S3Object.Factory.class).create(null); Payload payload = Payloads.newStringPayload(""); - payload.getContentMetadata().setContentLength(5368709120000l); + payload.getContentMetadata().setContentLength(5368709120000L); object.setPayload(payload); HttpRequest request = HttpRequest.builder().method("PUT").endpoint("http://localhost";).build(); @@ -101,7 +101,7 @@ public class BindS3ObjectMetadataToRequestTest extends BaseS3ClientTest<S3Client public void testOver5GBIsBad() { S3Object object = injector.getInstance(S3Object.Factory.class).create(null); Payload payload = Payloads.newStringPayload(""); - payload.getContentMetadata().setContentLength(5368709120000l); + payload.getContentMetadata().setContentLength(5368709120000L); object.setPayload(payload); object.getMetadata().setKey("foo"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java b/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java index b10311f..6946100 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/functions/ParseObjectMetadataFromHeadersTest.java @@ -53,7 +53,7 @@ public class ParseObjectMetadataFromHeadersTest { .addHeader(HttpHeaders.LAST_MODIFIED, lastModified) .addHeader(HttpHeaders.ETAG, "\"00000000000000000000000000000000\"") .addHeader(HttpHeaders.CACHE_CONTROL, "cacheControl").build(); - http.getPayload().getContentMetadata().setContentLength(1025l); + http.getPayload().getContentMetadata().setContentLength(1025L); http.getPayload().getContentMetadata().setContentDisposition("contentDisposition"); http.getPayload().getContentMetadata().setContentEncoding("encoding"); http.getPayload().getContentMetadata().setContentType(MediaType.APPLICATION_OCTET_STREAM); @@ -66,7 +66,7 @@ public class ParseObjectMetadataFromHeadersTest { expects.getContentMetadata().setContentDisposition("contentDisposition"); expects.getContentMetadata().setContentEncoding("encoding"); expects.getContentMetadata().setContentType(MediaType.APPLICATION_OCTET_STREAM); - expects.getContentMetadata().setContentLength(1025l); + expects.getContentMetadata().setContentLength(1025L); expects.getContentMetadata().setContentMD5(hashCode); expects.setETag("\"abcd\""); expects.setKey("key"); @@ -84,7 +84,7 @@ public class ParseObjectMetadataFromHeadersTest { .addHeader(HttpHeaders.LAST_MODIFIED, lastModified) .addHeader(HttpHeaders.ETAG, "\"abcd-1\"") .addHeader(HttpHeaders.CACHE_CONTROL, "cacheControl").build(); - http.getPayload().getContentMetadata().setContentLength(1025l); + http.getPayload().getContentMetadata().setContentLength(1025L); http.getPayload().getContentMetadata().setContentDisposition("contentDisposition"); http.getPayload().getContentMetadata().setContentEncoding("encoding"); http.getPayload().getContentMetadata().setContentType(MediaType.APPLICATION_OCTET_STREAM); @@ -96,7 +96,7 @@ public class ParseObjectMetadataFromHeadersTest { expects.getContentMetadata().setContentDisposition("contentDisposition"); expects.getContentMetadata().setContentEncoding("encoding"); expects.getContentMetadata().setContentType(MediaType.APPLICATION_OCTET_STREAM); - expects.getContentMetadata().setContentLength(1025l); + expects.getContentMetadata().setContentLength(1025L); expects.setETag("\"abcd-1\""); expects.setKey("key"); expects.setLastModified(now); @@ -114,7 +114,7 @@ public class ParseObjectMetadataFromHeadersTest { .addHeader(S3Headers.AMZ_ETAG, "\"00000000000000000000000000000000\"") .addHeader(HttpHeaders.CACHE_CONTROL, "cacheControl").build(); - http.getPayload().getContentMetadata().setContentLength(1025l); + http.getPayload().getContentMetadata().setContentLength(1025L); http.getPayload().getContentMetadata().setContentDisposition("contentDisposition"); http.getPayload().getContentMetadata().setContentEncoding("encoding"); http.getPayload().getContentMetadata().setContentType(MediaType.APPLICATION_OCTET_STREAM); @@ -128,7 +128,7 @@ public class ParseObjectMetadataFromHeadersTest { expects.getContentMetadata().setContentEncoding("encoding"); expects.getContentMetadata().setContentMD5(hashCode); expects.getContentMetadata().setContentType(MediaType.APPLICATION_OCTET_STREAM); - expects.getContentMetadata().setContentLength(1025l); + expects.getContentMetadata().setContentLength(1025L); expects.setETag("\"abcd\""); expects.setKey("key"); expects.setLastModified(now); http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/s3/src/test/java/org/jclouds/s3/xml/ListBucketHandlerTest.java ---------------------------------------------------------------------- diff --git a/apis/s3/src/test/java/org/jclouds/s3/xml/ListBucketHandlerTest.java b/apis/s3/src/test/java/org/jclouds/s3/xml/ListBucketHandlerTest.java index 4519c40..f420ec4 100644 --- a/apis/s3/src/test/java/org/jclouds/s3/xml/ListBucketHandlerTest.java +++ b/apis/s3/src/test/java/org/jclouds/s3/xml/ListBucketHandlerTest.java @@ -69,43 +69,43 @@ public class ListBucketHandlerTest extends BaseHandlerTest { new ObjectMetadataBuilder().key("apps/0").bucket(bucket).uri(URI.create("http://bucket.com/apps/0";)) .lastModified(dateService.iso8601DateParse("2009-05-07T18:27:08.000Z")).eTag( "\"c82e6a0025c31c5de5947fda62ac51ab\"").owner(owner).contentMD5( - base16().lowerCase().decode("c82e6a0025c31c5de5947fda62ac51ab")).contentLength(8l).build(), + base16().lowerCase().decode("c82e6a0025c31c5de5947fda62ac51ab")).contentLength(8L).build(), new ObjectMetadataBuilder().key("apps/1").bucket(bucket).uri(URI.create("http://bucket.com/apps/1";)) .lastModified(dateService.iso8601DateParse("2009-05-07T18:27:09.000Z")).eTag( "\"944fab2c5a9a6bacf07db5e688310d7a\"").owner(owner).contentMD5( - base16().lowerCase().decode("944fab2c5a9a6bacf07db5e688310d7a")).contentLength(8l).build(), + base16().lowerCase().decode("944fab2c5a9a6bacf07db5e688310d7a")).contentLength(8L).build(), new ObjectMetadataBuilder().key("apps/2").bucket(bucket).uri(URI.create("http://bucket.com/apps/2";)) .lastModified(dateService.iso8601DateParse("2009-05-07T18:27:09.000Z")).eTag( "\"a227b8888045c8fd159fb495214000f0\"").owner(owner).contentMD5( - base16().lowerCase().decode("a227b8888045c8fd159fb495214000f0")).contentLength(8l).build(), + base16().lowerCase().decode("a227b8888045c8fd159fb495214000f0")).contentLength(8L).build(), new ObjectMetadataBuilder().key("apps/3").bucket(bucket).uri(URI.create("http://bucket.com/apps/3";)) .lastModified(dateService.iso8601DateParse("2009-05-07T18:27:09.000Z")).eTag( "\"c9caa76c3dec53e2a192608ce73eef03\"").owner(owner).contentMD5( - base16().lowerCase().decode("c9caa76c3dec53e2a192608ce73eef03")).contentLength(8l).build(), + base16().lowerCase().decode("c9caa76c3dec53e2a192608ce73eef03")).contentLength(8L).build(), new ObjectMetadataBuilder().key("apps/4").bucket(bucket).uri(URI.create("http://bucket.com/apps/4";)) .lastModified(dateService.iso8601DateParse("2009-05-07T18:27:09.000Z")).eTag( "\"1ce5d0dcc6154a647ea90c7bdf82a224\"").owner(owner).contentMD5( - base16().lowerCase().decode("1ce5d0dcc6154a647ea90c7bdf82a224")).contentLength(8l).build(), + base16().lowerCase().decode("1ce5d0dcc6154a647ea90c7bdf82a224")).contentLength(8L).build(), new ObjectMetadataBuilder().key("apps/5").bucket(bucket).uri(URI.create("http://bucket.com/apps/5";)) .lastModified(dateService.iso8601DateParse("2009-05-07T18:27:09.000Z")).eTag( "\"79433524d87462ee05708a8ef894ed55\"").owner(owner).contentMD5( - base16().lowerCase().decode("79433524d87462ee05708a8ef894ed55")).contentLength(8l).build(), + base16().lowerCase().decode("79433524d87462ee05708a8ef894ed55")).contentLength(8L).build(), new ObjectMetadataBuilder().key("apps/6").bucket(bucket).uri(URI.create("http://bucket.com/apps/6";)) .lastModified(dateService.iso8601DateParse("2009-05-07T18:27:10.000Z")).eTag( "\"dd00a060b28ddca8bc5a21a49e306f67\"").owner(owner).contentMD5( - base16().lowerCase().decode("dd00a060b28ddca8bc5a21a49e306f67")).contentLength(8l).build(), + base16().lowerCase().decode("dd00a060b28ddca8bc5a21a49e306f67")).contentLength(8L).build(), new ObjectMetadataBuilder().key("apps/7").bucket(bucket).uri(URI.create("http://bucket.com/apps/7";)) .lastModified(dateService.iso8601DateParse("2009-05-07T18:27:10.000Z")).eTag( "\"8cd06eca6e819a927b07a285d750b100\"").owner(owner).contentMD5( - base16().lowerCase().decode("8cd06eca6e819a927b07a285d750b100")).contentLength(8l).build(), + base16().lowerCase().decode("8cd06eca6e819a927b07a285d750b100")).contentLength(8L).build(), new ObjectMetadataBuilder().key("apps/8").bucket(bucket).uri(URI.create("http://bucket.com/apps/8";)) .lastModified(dateService.iso8601DateParse("2009-05-07T18:27:10.000Z")).eTag( "\"174495094d0633b92cbe46603eee6bad\"").owner(owner).contentMD5( - base16().lowerCase().decode("174495094d0633b92cbe46603eee6bad")).contentLength(8l).build(), + base16().lowerCase().decode("174495094d0633b92cbe46603eee6bad")).contentLength(8L).build(), new ObjectMetadataBuilder().key("apps/9").bucket(bucket).uri(URI.create("http://bucket.com/apps/9";)) .lastModified(dateService.iso8601DateParse("2009-05-07T18:27:10.000Z")).eTag( "\"cd8a19b26fea8a827276df0ad11c580d\"").owner(owner).contentMD5( - base16().lowerCase().decode("cd8a19b26fea8a827276df0ad11c580d")).contentLength(8l).build()), + base16().lowerCase().decode("cd8a19b26fea8a827276df0ad11c580d")).contentLength(8L).build()), "apps/", null, null, 1000, null, false, new TreeSet<String>()); return expected; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/sqs/src/test/java/org/jclouds/sqs/functions/MapToQueueAttributesTest.java ---------------------------------------------------------------------- diff --git a/apis/sqs/src/test/java/org/jclouds/sqs/functions/MapToQueueAttributesTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/functions/MapToQueueAttributesTest.java index d69972d..1844715 100644 --- a/apis/sqs/src/test/java/org/jclouds/sqs/functions/MapToQueueAttributesTest.java +++ b/apis/sqs/src/test/java/org/jclouds/sqs/functions/MapToQueueAttributesTest.java @@ -48,7 +48,7 @@ public class MapToQueueAttributesTest { .approximateNumberOfMessages(0) .approximateNumberOfMessagesNotVisible(0) .approximateNumberOfMessagesDelayed(0) - .createdTimestamp(new Date(1347566436l)) + .createdTimestamp(new Date(1347566436L)) .lastModifiedTimestamp(new Date(1347566436)) .visibilityTimeout(30) .maximumMessageSize(65536) http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/apis/sts/src/main/java/org/jclouds/aws/handlers/AWSServerErrorRetryHandler.java ---------------------------------------------------------------------- diff --git a/apis/sts/src/main/java/org/jclouds/aws/handlers/AWSServerErrorRetryHandler.java b/apis/sts/src/main/java/org/jclouds/aws/handlers/AWSServerErrorRetryHandler.java index dd01fd4..482f23f 100644 --- a/apis/sts/src/main/java/org/jclouds/aws/handlers/AWSServerErrorRetryHandler.java +++ b/apis/sts/src/main/java/org/jclouds/aws/handlers/AWSServerErrorRetryHandler.java @@ -73,7 +73,7 @@ public class AWSServerErrorRetryHandler extends BackoffLimitedRetryHandler { } public void imposeBackoffExponentialDelay(long period, int pow, int failureCount, int max, String commandDescription) { - imposeBackoffExponentialDelay(period, period * 100l, pow, failureCount, max, commandDescription); + imposeBackoffExponentialDelay(period, period * 100L, pow, failureCount, max, commandDescription); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3c9f66b8/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java index fab598f..633b737 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/TransientBlobRequestSignerTest.java @@ -75,7 +75,7 @@ public class TransientBlobRequestSignerTest extends BaseRestAnnotationProcessing public void testSignPutBlob() throws ArrayIndexOutOfBoundsException, SecurityException, IllegalArgumentException, NoSuchMethodException, IOException { HashCode hashCode = HashCode.fromBytes(new byte[16]); - Blob blob = blobFactory.get().name(blobName).forSigning().contentLength(2l).contentMD5(hashCode) + Blob blob = blobFactory.get().name(blobName).forSigning().contentLength(2L).contentMD5(hashCode) .contentType("text/plain").build(); assertEquals(blob.getPayload().getContentMetadata().getContentMD5AsHashCode(), hashCode);
