JCLOUDS-1225: Address Guava 18 Objects changes Fixed with:
find -name \*.java | xargs sed -i 's/Objects.[Tt]oStringHelper/More&/g' find -name \*.java | xargs sed -i 's/Objects.firstNonNull/More&/g' find -name \*.java | xargs sed -i 's/^\(import com.google.common.base.\)\(Objects.*\)/\1More\2\n\1\2/g' find -name \*.java | xargs java -jar google-java-format-1.3-all-deps.jar -i --fix-imports-only --skip-sorting-imports Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/b38ce8d7 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/b38ce8d7 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/b38ce8d7 Branch: refs/heads/master Commit: b38ce8d7b317f2e8d486c38a81365d30ec4145f5 Parents: 7100e81 Author: Andrew Gaul <[email protected]> Authored: Thu Aug 24 18:26:39 2017 -0700 Committer: Andrew Gaul <[email protected]> Committed: Thu Aug 24 18:28:07 2017 -0700 ---------------------------------------------------------------------- .../azurecompute/arm/compute/AzureComputeServiceAdapter.java | 4 ++-- .../azurecompute/arm/compute/options/AzureTemplateOptions.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/b38ce8d7/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java index 0a37d5d..213d438 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/AzureComputeServiceAdapter.java @@ -96,7 +96,7 @@ import org.jclouds.location.Region; import org.jclouds.logging.Logger; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Predicate; import com.google.common.base.Splitter; import com.google.common.base.Supplier; @@ -375,7 +375,7 @@ public class AzureComputeServiceAdapter implements ComputeServiceAdapter<Virtual private OSProfile createOsProfile(String computerName, Template template) { String defaultLoginUser = template.getImage().getDefaultCredentials().getUser(); - String adminUsername = Objects.firstNonNull(template.getOptions().getLoginUser(), defaultLoginUser); + String adminUsername = MoreObjects.firstNonNull(template.getOptions().getLoginUser(), defaultLoginUser); // Password already generated in CreateResourcesThenCreateNodes (if not set by user) String adminPassword = template.getOptions().getLoginPassword(); OSProfile.Builder builder = OSProfile.builder().adminUsername(adminUsername).adminPassword(adminPassword) http://git-wip-us.apache.org/repos/asf/jclouds/blob/b38ce8d7/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java index 6ba85d1..92f592e 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/options/AzureTemplateOptions.java @@ -26,6 +26,7 @@ import org.jclouds.azurecompute.arm.domain.OSProfile.WindowsConfiguration; import org.jclouds.azurecompute.arm.domain.Secrets; import org.jclouds.compute.options.TemplateOptions; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; @@ -179,8 +180,8 @@ public class AzureTemplateOptions extends TemplateOptions implements Cloneable { } @Override - public Objects.ToStringHelper string() { - Objects.ToStringHelper toString = super.string(); + public MoreObjects.ToStringHelper string() { + MoreObjects.ToStringHelper toString = super.string(); if (availabilitySet != null) toString.add("availabilitySet", availabilitySet); if (availabilitySetName != null)
