Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update equals to include typed bag parent #201

Merged
merged 1 commit into from
Nov 11, 2019
Merged

Update equals to include typed bag parent #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions codegen/smithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/Symbol.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,12 +222,12 @@ public String toString() {
public boolean equals(Object o) {
if (this == o) {
return true;
}
if (!(o instanceof Symbol)) {
} else if (!(o instanceof Symbol)) {
return false;
}
Symbol symbol = (Symbol) o;
return Objects.equals(namespace, symbol.namespace)
return super.equals(o)
&& Objects.equals(namespace, symbol.namespace)
&& Objects.equals(namespaceDelimiter, symbol.namespaceDelimiter)
&& Objects.equals(name, symbol.name)
&& getProperties().equals(symbol.getProperties())
Expand Down
3 changes: 2 additions & 1 deletion ...ithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/SymbolDependency.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,8 @@ public boolean equals(Object o) {
}

SymbolDependency that = (SymbolDependency) o;
return dependencyType.equals(that.dependencyType)
return super.equals(o)
&& dependencyType.equals(that.dependencyType)
&& packageName.equals(that.packageName)
&& version.equals(that.version);
}
Expand Down
3 changes: 2 additions & 1 deletion ...mithy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/SymbolReference.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,8 @@ public boolean equals(Object o) {
}

SymbolReference that = (SymbolReference) o;
return symbol.equals(that.symbol)
return super.equals(o)
&& symbol.equals(that.symbol)
&& getProperties().equals(that.getProperties())
&& options.equals(that.options)
&& alias.equals(that.alias);
Expand Down
17 changes: 17 additions & 0 deletions ...hy-codegen-core/src/main/java/software/amazon/smithy/codegen/core/TypedPropertiesBag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import java.util.HashMap;
import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import software.amazon.smithy.utils.MapUtils;

Expand Down Expand Up @@ -97,6 +98,22 @@ public <T> T expectProperty(String name, Class<T> type) {
"Property `%s` is not part of %s, `%s`", name, getClass().getSimpleName(), this)));
}

@Override
public boolean equals(Object o) {
if (this == o) {
return true;
} else if (!(o instanceof TypedPropertiesBag)) {
return false;
} else {
return properties.equals(((TypedPropertiesBag) o).properties);
}
}

@Override
public int hashCode() {
return Objects.hash(properties);
}

/**
* Builds a SymbolReference.
*/
Expand Down