You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2016/10/23 13:43:43 UTC
[2/3] jclouds git commit: Address confusing operator precedence
Address confusing operator precedence
Found via error-prone.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/25baad6d
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/25baad6d
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/25baad6d
Branch: refs/heads/master
Commit: 25baad6d324266ece33eb60a76127407afd38536
Parents: 2a04a52
Author: Andrew Gaul <ga...@apache.org>
Authored: Fri Jul 15 19:05:08 2016 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sun Oct 23 06:39:46 2016 -0700
----------------------------------------------------------------------
.../java/org/jclouds/ovf/xml/internal/BaseEnvelopeHandler.java | 4 ++--
.../org/jclouds/compute/StubComputeServiceIntegrationTest.java | 4 ++--
...airPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java | 4 ++--
.../compute/GoogleComputeEngineServiceAdapter.java | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/25baad6d/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseEnvelopeHandler.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseEnvelopeHandler.java b/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseEnvelopeHandler.java
index 69f850a..db1f100 100644
--- a/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseEnvelopeHandler.java
+++ b/compute/src/main/java/org/jclouds/ovf/xml/internal/BaseEnvelopeHandler.java
@@ -93,8 +93,8 @@ public class BaseEnvelopeHandler<V extends BaseVirtualSystem<V>, B extends BaseV
inNetwork = true;
} else if (equalsOrSuffix(qName, "VirtualSystem")) {
inVirtualSystem = true;
- } else if (extensionHandlers.containsKey(qName) || attributes.containsKey("type")
- && extensionHandlers.containsKey(attributes.get("type"))) {
+ } else if (extensionHandlers.containsKey(qName) || (attributes.containsKey("type")
+ && extensionHandlers.containsKey(attributes.get("type")))) {
inExtensionSection = true;
extensionHandler = extensionHandlers.get(qName).get();
} else if (qName.endsWith("Section")) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/25baad6d/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
index 9c546f4..cfd904e 100644
--- a/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
+++ b/compute/src/test/java/org/jclouds/compute/StubComputeServiceIntegrationTest.java
@@ -418,8 +418,8 @@ public class StubComputeServiceIntegrationTest extends BaseComputeServiceLiveTes
if (o == null || !this.getClass().equals(o.getClass()))
return false;
PayloadEquals other = (PayloadEquals) o;
- return this.expected == null && other.expected == null || this.expected != null
- && this.expected.equals(other.expected);
+ return (this.expected == null && other.expected == null) ||
+ (this.expected != null && this.expected.equals(other.expected));
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/25baad6d/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java
index 371271c..782e376 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/strategy/CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions.java
@@ -179,8 +179,8 @@ public class CreateKeyPairPlacementAndSecurityGroupsAsNeededAndReturnRunOptions
@Override
protected boolean userSpecifiedTheirOwnGroups(TemplateOptions options) {
- return options instanceof AWSEC2TemplateOptions
- && !AWSEC2TemplateOptions.class.cast(options).getGroupIds().isEmpty()
+ return (options instanceof AWSEC2TemplateOptions
+ && !AWSEC2TemplateOptions.class.cast(options).getGroupIds().isEmpty())
|| super.userSpecifiedTheirOwnGroups(options);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/25baad6d/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java
index 912f554..99ec4e7 100644
--- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java
+++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceAdapter.java
@@ -183,7 +183,7 @@ public final class GoogleComputeEngineServiceAdapter
// Add lookup for InstanceToNodeMetadata
diskURIToImage.getUnchecked(instance.get().disks().get(0).source());
- if (options.autoCreateWindowsPassword() != null && options.autoCreateWindowsPassword()
+ if ((options.autoCreateWindowsPassword() != null && options.autoCreateWindowsPassword())
|| OsFamily.WINDOWS == template.getImage().getOperatingSystem().getFamily()) {
Map<String, ?> params = ImmutableMap.of("instance", instance, "zone", zone, "email", create.user(), "userName", credentials.getUser());
String password = windowsPasswordGenerator.apply(params);