Repository: jclouds-labs Updated Branches: refs/heads/master ff3bdab64 -> d5da73892
error-prone 2.3.2 fixes Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/d5da7389 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/d5da7389 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/d5da7389 Branch: refs/heads/master Commit: d5da73892951ac3e018052fd7e71923923f8c571 Parents: ff3bdab Author: Andrew Gaul <[email protected]> Authored: Sun Oct 14 02:34:24 2018 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sun Oct 14 02:34:24 2018 -0700 ---------------------------------------------------------------------- .../strategy/CreateResourcesThenCreateNodes.java | 2 +- .../jclouds/azurecompute/xml/ListVMImagesHandler.java | 12 ++++++------ .../compute/functions/OSImageToImageTest.java | 4 ++-- .../azurecompute/features/DeploymentApiMockTest.java | 8 ++++---- .../azurecompute/features/VMImageApiLiveTest.java | 4 ++-- .../v1/features/DataNonCDMIContentTypeApiLiveTest.java | 4 ---- .../apache/jclouds/oneandone/rest/domain/Server.java | 4 ++-- .../rest/features/ServerOperationsApiLiveTest.java | 4 ++-- 8 files changed, 19 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d5da7389/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/strategy/CreateResourcesThenCreateNodes.java ---------------------------------------------------------------------- diff --git a/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/strategy/CreateResourcesThenCreateNodes.java b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/strategy/CreateResourcesThenCreateNodes.java index 8d302a2..2506782 100644 --- a/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/strategy/CreateResourcesThenCreateNodes.java +++ b/aliyun-ecs/src/main/java/org/jclouds/aliyun/ecs/compute/strategy/CreateResourcesThenCreateNodes.java @@ -178,7 +178,7 @@ public class CreateResourcesThenCreateNodes extends CreateNodesWithGroupEncodedI String securityGroupName, String vpcIdFromSecurityGroup) { Optional<VSwitch> optionalVSwitch = tryFindVSwitchInVPC(regionId, vpcIdFromSecurityGroup, vSwitchId); - if (!optionalVSwitch.isPresent()) { + if (optionalVSwitch.isPresent()) { String message = String.format("security group (%s) and vSwitch (%s) must be in the same VPC_PREFIX (%s)", securityGroupName, optionalVSwitch.get().name(), http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d5da7389/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListVMImagesHandler.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListVMImagesHandler.java b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListVMImagesHandler.java index 7adecbf..7818abc 100644 --- a/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListVMImagesHandler.java +++ b/azurecompute/src/main/java/org/jclouds/azurecompute/xml/ListVMImagesHandler.java @@ -28,11 +28,11 @@ import java.util.List; public final class ListVMImagesHandler extends ParseSax.HandlerForGeneratedRequestWithResult<List<VMImage>> { private boolean inVMImage; - private final VMImageHandler VMImageHandler; + private final VMImageHandler vmImageHandler; private final Builder<VMImage> images = ImmutableList.builder(); @Inject ListVMImagesHandler(VMImageHandler vmImageHandler) { - this.VMImageHandler = vmImageHandler; + this.vmImageHandler = vmImageHandler; } @Override @@ -46,7 +46,7 @@ public final class ListVMImagesHandler extends ParseSax.HandlerForGeneratedReque inVMImage = true; } if (inVMImage) { - VMImageHandler.startElement(url, name, qName, attributes); + vmImageHandler.startElement(url, name, qName, attributes); } } @@ -54,17 +54,17 @@ public final class ListVMImagesHandler extends ParseSax.HandlerForGeneratedReque public void endElement(String uri, String name, String qName) { if (qName.equals("VMImage")) { inVMImage = false; - images.add(VMImageHandler.getResult()); + images.add(vmImageHandler.getResult()); } if (inVMImage) { - VMImageHandler.endElement(uri, name, qName); + vmImageHandler.endElement(uri, name, qName); } } @Override public void characters(char[] ch, int start, int length) { if (inVMImage) { - VMImageHandler.characters(ch, start, length); + vmImageHandler.characters(ch, start, length); } } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d5da7389/azurecompute/src/test/java/org/jclouds/azurecompute/compute/functions/OSImageToImageTest.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/test/java/org/jclouds/azurecompute/compute/functions/OSImageToImageTest.java b/azurecompute/src/test/java/org/jclouds/azurecompute/compute/functions/OSImageToImageTest.java index eb1d1a7..c4ae3dd 100644 --- a/azurecompute/src/test/java/org/jclouds/azurecompute/compute/functions/OSImageToImageTest.java +++ b/azurecompute/src/test/java/org/jclouds/azurecompute/compute/functions/OSImageToImageTest.java @@ -108,8 +108,8 @@ public class OSImageToImageTest { List<OSImage> images = createOSImage(); for (int i = 0; i < images.size(); i++) { - OSImage OSImage = images.get(i); - OperatingSystem os = OSImageToImage.osFamily().apply(OSImage).build(); + OSImage osImage = images.get(i); + OperatingSystem os = OSImageToImage.osFamily().apply(osImage).build(); assertEquals(os.getFamily(), osFamily.get(i)); assertEquals(os.getVersion(), version.get(i)); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d5da7389/azurecompute/src/test/java/org/jclouds/azurecompute/features/DeploymentApiMockTest.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/test/java/org/jclouds/azurecompute/features/DeploymentApiMockTest.java b/azurecompute/src/test/java/org/jclouds/azurecompute/features/DeploymentApiMockTest.java index 7d35311..d41901d 100644 --- a/azurecompute/src/test/java/org/jclouds/azurecompute/features/DeploymentApiMockTest.java +++ b/azurecompute/src/test/java/org/jclouds/azurecompute/features/DeploymentApiMockTest.java @@ -42,12 +42,12 @@ public class DeploymentApiMockTest extends BaseAzureComputeApiMockTest { try { DeploymentApi api = api(server.getUrl("/")).getDeploymentApiForService("myservice"); - OSImage OSImage = ListOSImagesHandlerTest.expected().get(5); // Centos + OSImage osImage = ListOSImagesHandlerTest.expected().get(5); // Centos DeploymentParams params = DeploymentParams.builder() .name("mydeployment") .size(RoleSize.Type.MEDIUM) - .sourceImageName(OSImage.name()).mediaLink(URI.create("https://mydeployment.blob.core.windows.net/vhds/disk-mydeployment.vhd";)).os(OSImage.os()) + .sourceImageName(osImage.name()).mediaLink(URI.create("https://mydeployment.blob.core.windows.net/vhds/disk-mydeployment.vhd";)).os(osImage.os()) .username("username").password("testpwd") .virtualNetworkName("my-virtualNetworkName") .reservedIPName("myreservedip") @@ -69,12 +69,12 @@ public class DeploymentApiMockTest extends BaseAzureComputeApiMockTest { try { DeploymentApi api = api(server.getUrl("/")).getDeploymentApiForService("myservice"); - OSImage OSImage = ListOSImagesHandlerTest.expected().get(1); // Windows + OSImage osImage = ListOSImagesHandlerTest.expected().get(1); // Windows DeploymentParams params = DeploymentParams.builder() .name("mydeployment") .size(RoleSize.Type.MEDIUM) - .sourceImageName(OSImage.name()).mediaLink(OSImage.mediaLink()).os(OSImage.os()) + .sourceImageName(osImage.name()).mediaLink(osImage.mediaLink()).os(osImage.os()) .username("username").password("testpwd") .virtualNetworkName("my-virtualNetworkName") .externalEndpoints(ImmutableSet.of(inboundTcpToLocalPort(80, 8080), inboundUdpToLocalPort(53, 53))) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d5da7389/azurecompute/src/test/java/org/jclouds/azurecompute/features/VMImageApiLiveTest.java ---------------------------------------------------------------------- diff --git a/azurecompute/src/test/java/org/jclouds/azurecompute/features/VMImageApiLiveTest.java b/azurecompute/src/test/java/org/jclouds/azurecompute/features/VMImageApiLiveTest.java index 556e73f..b9afed0 100644 --- a/azurecompute/src/test/java/org/jclouds/azurecompute/features/VMImageApiLiveTest.java +++ b/azurecompute/src/test/java/org/jclouds/azurecompute/features/VMImageApiLiveTest.java @@ -156,8 +156,8 @@ public class VMImageApiLiveTest extends BaseAzureComputeApiLiveTest { public void testList() { List<VMImage> vmImageList = api().list(); assertTrue(vmImageList.size() > 0); - for (VMImage VMImage : vmImageList) { - checkVMImage(VMImage); + for (VMImage vmImage : vmImageList) { + checkVMImage(vmImage); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d5da7389/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java ---------------------------------------------------------------------- diff --git a/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java b/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java index 7c5d893..56d7c9a 100644 --- a/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java +++ b/cdmi/src/test/java/org/jclouds/snia/cdmi/v1/features/DataNonCDMIContentTypeApiLiveTest.java @@ -63,10 +63,6 @@ public class DataNonCDMIContentTypeApiLiveTest extends BaseCDMIApiLiveTest { byte[] bytes; DataObject dataObject; Map<String, String> pContainerMetaDataIn = Maps.newHashMap(); - Map<String, String> pDataObjectMetaDataIn = Maps.newLinkedHashMap(); - pDataObjectMetaDataIn.put("dataObjectkey1", "value1"); - pDataObjectMetaDataIn.put("dataObjectkey2", "value2"); - pDataObjectMetaDataIn.put("dataObjectkey3", "value3"); Payload payloadIn; Payload payloadOut; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d5da7389/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/domain/Server.java ---------------------------------------------------------------------- diff --git a/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/domain/Server.java b/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/domain/Server.java index c2d754c..78e15b9 100644 --- a/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/domain/Server.java +++ b/oneandone/src/main/java/org/apache/jclouds/oneandone/rest/domain/Server.java @@ -56,7 +56,7 @@ public abstract class Server { public abstract Dvd dvd(); @Nullable - public abstract Snapshot Snapshot(); + public abstract Snapshot snapshot(); @Nullable public abstract DataCenter datacenter(); @@ -149,7 +149,7 @@ public abstract class Server { public abstract Dvd dvd(); @Nullable - public abstract Snapshot Snapshot(); + public abstract Snapshot snapshot(); @Nullable public abstract DataCenter datacenter(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/d5da7389/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerOperationsApiLiveTest.java ---------------------------------------------------------------------- diff --git a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerOperationsApiLiveTest.java b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerOperationsApiLiveTest.java index 842b61b..46f0001 100644 --- a/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerOperationsApiLiveTest.java +++ b/oneandone/src/test/java/org/apache/jclouds/oneandone/rest/features/ServerOperationsApiLiveTest.java @@ -139,7 +139,7 @@ public class ServerOperationsApiLiveTest extends BaseOneAndOneLiveTest { public void testRestoreSnapshot() throws InterruptedException { assertNodeAvailable(currentServer); currentServer = serverApi().get(currentServer.id()); - Server response = serverApi().restoreSnapshot(currentServer.id(), currentServer.Snapshot().id()); + Server response = serverApi().restoreSnapshot(currentServer.id(), currentServer.snapshot().id()); assertNotNull(response); } @@ -157,7 +157,7 @@ public class ServerOperationsApiLiveTest extends BaseOneAndOneLiveTest { assertNodeAvailable(currentServer); Thread.sleep(120000); currentServer = serverApi().get(currentServer.id()); - Server response = serverApi().deleteSnapshot(currentServer.id(), currentServer.Snapshot().id()); + Server response = serverApi().deleteSnapshot(currentServer.id(), currentServer.snapshot().id()); assertNotNull(response); }
