honeymoose/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2026-08-07 04:37:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

JCLOUDS-1225: Address Guava 18 Objects changes

Browse Source 
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
This commit is contained in:
Andrew Gaul
2017-08-21 13:35:48 -07:00
parent e331a000d1
commit a493e2ca2f
410 changed files with 953 additions and 667 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/openstack/src/main/java/org/jclouds/openstack/domain/AuthenticationResponse.java
+2 -1
View File
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
import java.util.Map;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
@@ -60,7 +61,7 @@ public class AuthenticationResponse {
@Override
public String toString() {
return Objects.toStringHelper(this).add("authToken", authToken).add("services", services).toString();
return MoreObjects.toStringHelper(this).add("authToken", authToken).add("services", services).toString();
}
}
common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jclouds.openstack.domain;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
common/openstack/src/main/java/org/jclouds/openstack/domain/Resource.java
+3 -2
View File
@@ -23,8 +23,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -149,7 +150,7 @@ public class Resource implements Comparable<Resource> {
}
protected ToStringHelper string() {
return Objects.toStringHelper("")
return MoreObjects.toStringHelper("")
.add("id", getId())
.add("name", name)
.add("links", links);
common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jclouds.openstack.keystone.v1_1.domain;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Objects;
common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jclouds.openstack.keystone.v1_1.domain;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Token.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jclouds.openstack.keystone.v1_1.domain;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;