Repository: jclouds Updated Branches: refs/heads/master 68ff250c3 -> 3872b5748
Remove userMetadata from equals and hashCode This caused test failures, regression from a3376d4efe86fafc38b631d3b741444f3df50493. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/3872b574 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/3872b574 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/3872b574 Branch: refs/heads/master Commit: 3872b5748311037b9dfda1a01c937b66516cd21f Parents: 68ff250 Author: Andrew Gaul <[email protected]> Authored: Tue Jan 26 14:08:39 2016 -0800 Committer: Andrew Gaul <[email protected]> Committed: Tue Jan 26 14:08:39 2016 -0800 ---------------------------------------------------------------------- .../jclouds/domain/internal/MutableResourceMetadataImpl.java | 7 ++++--- .../org/jclouds/domain/internal/ResourceMetadataImpl.java | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/3872b574/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java b/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java index 9d7cca8..973eb93 100644 --- a/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java +++ b/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java @@ -175,7 +175,8 @@ public class MutableResourceMetadataImpl<T extends Enum<T>> implements MutableRe @Override public int hashCode() { - return Objects.hashCode(id, location, name, type, uri, userMetadata); + // intentionally not hashing userMetadata + return Objects.hashCode(id, location, name, type, uri); } @Override @@ -191,8 +192,8 @@ public class MutableResourceMetadataImpl<T extends Enum<T>> implements MutableRe && Objects.equal(location, other.getLocation()) && Objects.equal(name, other.getName()) && Objects.equal(type, other.getType()) - && Objects.equal(uri, other.getUri()) - && Objects.equal(userMetadata, other.getUserMetadata()); + && Objects.equal(uri, other.getUri()); + // intentionally not comparing userMetadata } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/3872b574/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java index 7426b97..a46b3c4 100644 --- a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java +++ b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java @@ -114,13 +114,14 @@ public abstract class ResourceMetadataImpl<T extends Enum<T>> implements Resourc return false; ResourceMetadataImpl<?> that = ResourceMetadataImpl.class.cast(o); return equal(this.getType(), that.getType()) && equal(this.providerId, that.providerId) - && equal(this.name, that.name) && equal(this.location, that.location) && equal(this.uri, that.uri) - && equal(this.userMetadata, that.userMetadata); + && equal(this.name, that.name) && equal(this.location, that.location) && equal(this.uri, that.uri); + // intentionally not comparing userMetadata } @Override public int hashCode() { - return Objects.hashCode(getType(), providerId, name, location, uri, userMetadata); + return Objects.hashCode(getType(), providerId, name, location, uri); + // intentionally not hashing userMetadata } @Override
