Repository: jclouds Updated Branches: refs/heads/master 17cf6fec9 -> cc6595799
Error-prone 2.3.2 fixes Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/cc659579 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/cc659579 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/cc659579 Branch: refs/heads/master Commit: cc65957997e0cacbd31bfb84d09bd30be8ab5351 Parents: 17cf6fe Author: Andrew Gaul <g...@apache.org> Authored: Fri Oct 12 14:05:14 2018 -0700 Committer: Andrew Gaul <g...@apache.org> Committed: Fri Oct 12 23:28:00 2018 -0700 ---------------------------------------------------------------------- .../cloudwatch/xml/GetMetricStatisticsResponseHandler.java | 4 ++-- .../cloudwatch/xml/GetMetricStatisticsResponseHandlerV2.java | 4 ++-- .../java/org/jclouds/ec2/features/KeyPairApiLiveTest.java | 4 ++-- .../openstack/keystone/auth/domain/PasswordCredentials.java | 2 +- .../java/org/jclouds/openstack/keystone/v3/domain/Group.java | 2 +- .../openstack/trove/v1/features/UserApiExpectTest.java | 6 ------ .../integration/internal/BaseServiceIntegrationTest.java | 2 -- .../jclouds/compute/internal/BaseComputeServiceLiveTest.java | 3 +-- core/src/main/java/org/jclouds/crypto/Pems.java | 5 +++++ .../jclouds/date/internal/SimpleDateFormatDateService.java | 1 + core/src/main/java/org/jclouds/util/Strings2.java | 1 - .../compute/domain/ResourceGroupAndNameAndIngressRules.java | 4 ++-- .../arm/features/VirtualMachineScaleSetApiLiveTest.java | 4 +--- .../arm/features/VirtualMachineScaleSetApiMockTest.java | 7 ++----- .../googlecloudstorage/features/ObjectApiLiveTest.java | 4 ++-- .../binders/ForwardingRuleCreationBinder.java | 8 ++++---- .../binders/ForwardingRuleCreationBinderTest.java | 4 ++-- .../loadbalancer/CreateLoadBalancerRequestBinderTest.java | 6 ------ .../loadbalancer/UpdateLoadBalancerRequestBinderTest.java | 7 ------- .../statements/login/AdminAccessBuilderSpec.java | 1 + 20 files changed, 29 insertions(+), 50 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java index c960f5a..bf35f00 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandler.java @@ -33,8 +33,8 @@ public class GetMetricStatisticsResponseHandler extends ParseSax.HandlerWithResu private final DatapointHandler datapointHandler; @Inject - public GetMetricStatisticsResponseHandler(DatapointHandler DatapointHandler) { - this.datapointHandler = DatapointHandler; + public GetMetricStatisticsResponseHandler(DatapointHandler datapointHandler) { + this.datapointHandler = datapointHandler; } public Set<Datapoint> getResult() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerV2.java ---------------------------------------------------------------------- diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerV2.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerV2.java index 8caa383..7cdb143 100644 --- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerV2.java +++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/xml/GetMetricStatisticsResponseHandlerV2.java @@ -39,8 +39,8 @@ public class GetMetricStatisticsResponseHandlerV2 extends ParseSax.HandlerWithRe private boolean inDatapoints; @Inject - public GetMetricStatisticsResponseHandlerV2(DatapointHandler DatapointHandler) { - this.datapointHandler = DatapointHandler; + public GetMetricStatisticsResponseHandlerV2(DatapointHandler datapointHandler) { + this.datapointHandler = datapointHandler; } public GetMetricStatisticsResponse getResult() { http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/apis/ec2/src/test/java/org/jclouds/ec2/features/KeyPairApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/features/KeyPairApiLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/features/KeyPairApiLiveTest.java index 8f2340f..9c828fa 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/features/KeyPairApiLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/features/KeyPairApiLiveTest.java @@ -92,9 +92,9 @@ public class KeyPairApiLiveTest extends BaseComputeServiceContextLiveTest { assertNotNull(allResults); if (!allResults.isEmpty()) { KeyPair pair = allResults.last(); - SortedSet<KeyPair> result = Sets.newTreeSet(client.describeKeyPairsInRegionWithFilter(region, + client.describeKeyPairsInRegionWithFilter(region, ImmutableMultimap.<String, String>builder() - .put("invalid-filter", pair.getKeyName()).build())); + .put("invalid-filter", pair.getKeyName()).build()); } } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/domain/PasswordCredentials.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/domain/PasswordCredentials.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/domain/PasswordCredentials.java index 2e1fee9..a1ad79e 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/domain/PasswordCredentials.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/auth/domain/PasswordCredentials.java @@ -39,7 +39,7 @@ public abstract class PasswordCredentials { } @Override - public String toString() { + public final String toString() { return MoreObjects.toStringHelper(this).add("username", username()) .add("password", password() == null ? null : "*****").toString(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/domain/Group.java ---------------------------------------------------------------------- diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/domain/Group.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/domain/Group.java index ee2738a..26f9fc1 100644 --- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/domain/Group.java +++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v3/domain/Group.java @@ -47,7 +47,7 @@ public abstract class Group { @AutoValue.Builder public abstract static class Builder { public abstract Builder id(String id); - public abstract Builder name(String String); + public abstract Builder name(String string); public abstract Builder description(String description); public abstract Builder domainId(String domainId); public abstract Builder link(Link link); http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java index e1845c9..1586b9f 100644 --- a/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java +++ b/apis/openstack-trove/src/test/java/org/jclouds/openstack/trove/v1/features/UserApiExpectTest.java @@ -180,9 +180,6 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest { HttpResponse.builder().statusCode(202).build() // response ).getUserApi("RegionOne", "instanceId-1234-5678"); - Set<String> databases = Sets.newHashSet(); - databases.add( "database" ); - databases.add( "database" ); boolean result = api.revoke("dbuser1", "databaseA"); assertTrue(result); } @@ -198,9 +195,6 @@ public class UserApiExpectTest extends BaseTroveApiExpectTest { HttpResponse.builder().statusCode(202).build() // response ).getUserApi("RegionOne", "instanceId-1234-5678"); - Set<String> databases = Sets.newHashSet(); - databases.add( "database" ); - databases.add( "database" ); boolean result = api.delete("dbuser1"); assertTrue(result); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java index 31780e4..f86ac4b 100644 --- a/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java +++ b/blobstore/src/test/java/org/jclouds/blobstore/integration/internal/BaseServiceIntegrationTest.java @@ -76,8 +76,6 @@ public class BaseServiceIntegrationTest extends BaseBlobStoreIntegrationTest { @Test(groups = { "integration", "live" }) public void testGetAssignableLocations() throws Exception { - if (view.unwrap() instanceof Location) - assertProvider(Location.class.cast(view.unwrap())); for (Location location : view.getBlobStore().listAssignableLocations()) { System.err.printf("location %s%n", location); assert location.getId() != null : location; http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java index 31d5448..b533ea1 100644 --- a/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java +++ b/compute/src/test/java/org/jclouds/compute/internal/BaseComputeServiceLiveTest.java @@ -568,7 +568,7 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte }); Map<String, ? extends NodeMetadata> metadataMap = newLinkedHashMap(uniqueMap); for (NodeMetadata node : nodes) { - metadataMap.remove(node.getId()); + assertNotNull(metadataMap.remove(node.getId())); NodeMetadata metadata = client.getNodeMetadata(node.getId()); assertEquals(metadata.getProviderId(), node.getProviderId()); assertEquals(metadata.getGroup(), node.getGroup()); @@ -664,7 +664,6 @@ public abstract class BaseComputeServiceLiveTest extends BaseComputeServiceConte assert node.getProviderId() != null : node; assert node.getLocation() != null : node; assertEquals(node.getType(), ComputeType.NODE); - assert node instanceof NodeMetadata; NodeMetadata nodeMetadata = node; assert nodeMetadata.getProviderId() != null : nodeMetadata; // nullable http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/core/src/main/java/org/jclouds/crypto/Pems.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/crypto/Pems.java b/core/src/main/java/org/jclouds/crypto/Pems.java index 61e93fd..8a47bce 100644 --- a/core/src/main/java/org/jclouds/crypto/Pems.java +++ b/core/src/main/java/org/jclouds/crypto/Pems.java @@ -35,6 +35,7 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.StringReader; +import java.nio.charset.StandardCharsets; import java.security.PrivateKey; import java.security.PublicKey; import java.security.cert.CertificateEncodingException; @@ -174,6 +175,10 @@ public class Pems { this.content = checkNotNull(content, "content"); } + @Override + public String toString() { + return type + " " + new String(content, StandardCharsets.UTF_8); + } } /** http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/core/src/main/java/org/jclouds/date/internal/SimpleDateFormatDateService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/date/internal/SimpleDateFormatDateService.java b/core/src/main/java/org/jclouds/date/internal/SimpleDateFormatDateService.java index 71350bb..bc9299a 100644 --- a/core/src/main/java/org/jclouds/date/internal/SimpleDateFormatDateService.java +++ b/core/src/main/java/org/jclouds/date/internal/SimpleDateFormatDateService.java @@ -169,6 +169,7 @@ public class SimpleDateFormatDateService implements DateService { } @Override + @SuppressWarnings("UnusedException") public Date iso8601DateOrSecondsDateParse(String toParse) throws IllegalArgumentException { try { http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/core/src/main/java/org/jclouds/util/Strings2.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/util/Strings2.java b/core/src/main/java/org/jclouds/util/Strings2.java index cc09b6c..84b3522 100644 --- a/core/src/main/java/org/jclouds/util/Strings2.java +++ b/core/src/main/java/org/jclouds/util/Strings2.java @@ -83,7 +83,6 @@ public class Strings2 { private static final String IP_ADDRESS = "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})"; private static final String SLASH_FORMAT = IP_ADDRESS + "/(\\d{1,3})"; - private static final Pattern ADDRESS_PATTERN = Pattern.compile(IP_ADDRESS); private static final Pattern CIDR_PATTERN = Pattern.compile(SLASH_FORMAT); public static boolean isCidrFormat(String in) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/domain/ResourceGroupAndNameAndIngressRules.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/domain/ResourceGroupAndNameAndIngressRules.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/domain/ResourceGroupAndNameAndIngressRules.java index 25708cb..c652226 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/domain/ResourceGroupAndNameAndIngressRules.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/domain/ResourceGroupAndNameAndIngressRules.java @@ -55,13 +55,13 @@ public abstract class ResourceGroupAndNameAndIngressRules { // class so that we can search only by region/id in a map @Override - public int hashCode() { + public final int hashCode() { return Objects.hashCode(resourceGroup(), name()); } @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(value = "EQ_UNUSUAL") @Override - public boolean equals(Object obj) { + public final boolean equals(Object obj) { if (obj == this) { return true; } http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiLiveTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiLiveTest.java index 4d17967..c7464d2 100644 --- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiLiveTest.java +++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiLiveTest.java @@ -178,11 +178,9 @@ public class VirtualMachineScaleSetApiLiveTest extends BaseAzureComputeApiLiveTe private VirtualMachineScaleSetNetworkProfile getNetworkProfile() { - List<NetworkProfile.NetworkInterface> networkInterfacesList = new ArrayList<NetworkProfile.NetworkInterface>(); - NetworkInterfaceCard nic = createNetworkInterfaceCard(resourceGroupName, "jc-nic-" + RAND, LOCATION, "ipConfig-" + RAND); assertNotNull(nic); - networkInterfacesList.add(NetworkProfile.NetworkInterface.create(nic.id(), NetworkProfile.NetworkInterface.NetworkInterfaceProperties.create(true))); + NetworkProfile.NetworkInterface.create(nic.id(), NetworkProfile.NetworkInterface.NetworkInterfaceProperties.create(true)); List<NetworkInterfaceConfiguration> networkInterfaceConfigurations = new ArrayList<NetworkInterfaceConfiguration>(); List<VirtualMachineScaleSetIpConfiguration> virtualMachineScaleSetIpConfigurations = new ArrayList<VirtualMachineScaleSetIpConfiguration>(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiMockTest.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiMockTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiMockTest.java index 300a4c8..9c24e5a 100644 --- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiMockTest.java +++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiMockTest.java @@ -276,16 +276,13 @@ public class VirtualMachineScaleSetApiMockTest extends BaseAzureComputeApiMockTe private VirtualMachineScaleSetNetworkProfile getNetworkProfile() { - List<NetworkProfile.NetworkInterface> networkInterfacesList = - new ArrayList<NetworkProfile.NetworkInterface>(); - NetworkInterfaceCard nic = createNetworkInterfaceCard( "jc-nic-" + 123, "eastus"); - networkInterfacesList.add(NetworkProfile.NetworkInterface.create( + NetworkProfile.NetworkInterface.create( nic.id(), - NetworkProfile.NetworkInterface.NetworkInterfaceProperties.create(true))); + NetworkProfile.NetworkInterface.NetworkInterfaceProperties.create(true)); List<NetworkInterfaceConfiguration> networkInterfaceConfigurations = new ArrayList<NetworkInterfaceConfiguration>(); http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java index b54a272..5d44d58 100644 --- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java +++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/features/ObjectApiLiveTest.java @@ -21,6 +21,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; @@ -314,7 +315,7 @@ public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest { ListPageWithPrefixes<GoogleCloudStorageObject> list = api().listObjects(BUCKET_NAME); assertNotNull(list); - assertEquals(list.get(0) instanceof GoogleCloudStorageObject, true); + assertNotEquals(list.size(), 0); } @Test(groups = "live", dependsOnMethods = "testComposeObjectWithOptions") @@ -324,7 +325,6 @@ public class ObjectApiLiveTest extends BaseGoogleCloudStorageApiLiveTest { while (list.nextPageToken() != null) { assertNotNull(list); - assertEquals(list.get(0) instanceof GoogleCloudStorageObject, true); assertEquals(list.size(), 1); options = new ListObjectOptions().maxResults(1).pageToken(list.nextPageToken()); http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java index 007465d..e72306b 100644 --- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java +++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinder.java @@ -53,9 +53,9 @@ public class ForwardingRuleCreationBinder extends BindToJsonPayload { @SuppressWarnings("unused") private String description; @SuppressWarnings("unused") - private String IPAddress; + private String ipAddress; @SuppressWarnings("unused") - private ForwardingRule.IPProtocol IPProtocol; + private ForwardingRule.IPProtocol ipProtocol; @SuppressWarnings("unused") private String portRange; @SuppressWarnings("unused") @@ -64,8 +64,8 @@ public class ForwardingRuleCreationBinder extends BindToJsonPayload { private ForwardingRuleCreationBinderHelper(String name, ForwardingRuleCreationOptions forwardingRuleCreationOptions){ this.name = name; this.description = forwardingRuleCreationOptions.description(); - this.IPAddress = forwardingRuleCreationOptions.ipAddress(); - this.IPProtocol = forwardingRuleCreationOptions.ipProtocol(); + this.ipAddress = forwardingRuleCreationOptions.ipAddress(); + this.ipProtocol = forwardingRuleCreationOptions.ipProtocol(); this.portRange = forwardingRuleCreationOptions.portRange(); this.target = forwardingRuleCreationOptions.target(); } http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinderTest.java ---------------------------------------------------------------------- diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinderTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinderTest.java index 1686427..8b6ef8d 100644 --- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinderTest.java +++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/binders/ForwardingRuleCreationBinderTest.java @@ -62,8 +62,8 @@ public class ForwardingRuleCreationBinderTest extends BaseGoogleComputeEngineExp "{\"" + "name\":\"testForwardingRuleName\"," + "\"description\":\"" + DESCRIPTION + "\"," - + "\"IPAddress\":\"" + IP_ADDRESS + "\"," - + "\"IPProtocol\":\"SCTP\"," + + "\"ipAddress\":\"" + IP_ADDRESS + "\"," + + "\"ipProtocol\":\"SCTP\"," + "\"portRange\":\"" + PORT_RANGE + "\"," + "\"target\":\"" + TARGET + "\"" + "}"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/loadbalancer/CreateLoadBalancerRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/loadbalancer/CreateLoadBalancerRequestBinderTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/loadbalancer/CreateLoadBalancerRequestBinderTest.java index b9afc2a..2da3517 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/loadbalancer/CreateLoadBalancerRequestBinderTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/loadbalancer/CreateLoadBalancerRequestBinderTest.java @@ -19,9 +19,6 @@ package org.jclouds.profitbricks.binder.loadbalancer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.util.List; - -import com.google.common.collect.Lists; import com.google.common.collect.ImmutableList; import org.testng.annotations.Test; @@ -35,9 +32,6 @@ public class CreateLoadBalancerRequestBinderTest { public void testCreatePayload() { CreateLoadBalancerRequestBinder binder = new CreateLoadBalancerRequestBinder(); - List<String> serverIds = Lists.newArrayList(); - serverIds.add("server-ids"); - String actual = binder.createPayload( LoadBalancer.Request.creatingBuilder() .dataCenterId("datacenter-id") http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/loadbalancer/UpdateLoadBalancerRequestBinderTest.java ---------------------------------------------------------------------- diff --git a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/loadbalancer/UpdateLoadBalancerRequestBinderTest.java b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/loadbalancer/UpdateLoadBalancerRequestBinderTest.java index 24d512d..3ed14cb 100644 --- a/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/loadbalancer/UpdateLoadBalancerRequestBinderTest.java +++ b/providers/profitbricks/src/test/java/org/jclouds/profitbricks/binder/loadbalancer/UpdateLoadBalancerRequestBinderTest.java @@ -19,10 +19,6 @@ package org.jclouds.profitbricks.binder.loadbalancer; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; -import java.util.List; - -import com.google.common.collect.Lists; - import org.jclouds.profitbricks.domain.LoadBalancer; import org.testng.annotations.Test; @@ -32,9 +28,6 @@ public class UpdateLoadBalancerRequestBinderTest { @Test public void testDeregisterPayload() { UpdateLoadBalancerRequestBinder binder = new UpdateLoadBalancerRequestBinder(); - List<String> serverIds = Lists.newArrayList(); - serverIds.add("1"); - serverIds.add("2"); LoadBalancer.Request.UpdatePayload payload = LoadBalancer.Request.updatingBuilder() .id("aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee") http://git-wip-us.apache.org/repos/asf/jclouds/blob/cc659579/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java ---------------------------------------------------------------------- diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java index 250727a..f2dbc0a 100644 --- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java +++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java @@ -389,6 +389,7 @@ public class AdminAccessBuilderSpec { && equal(adminPrivateKeyFile, that.adminPrivateKeyFile) && equal(adminPassword, that.adminPassword) && equal(loginPassword, that.loginPassword) && equal(lockSsh, that.lockSsh) && equal(grantSudoToAdminUser, that.grantSudoToAdminUser) + && equal(authorizeAdminPublicKey, that.authorizeAdminPublicKey) && equal(installAdminPrivateKey, that.installAdminPrivateKey) && equal(resetLoginPassword, that.resetLoginPassword); }
