github-repos/config
1
0
Fork 0
mirror of https://github.com/lightbend/config.git synced 2025-01-28 21:20:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add shortcut that identity-equal lists/objects are equals()

Browse Source 
The intent here is to make it fast to compare something
to itself. Though maybe Java does this automatically,
not sure.
This commit is contained in:
Havoc Pennington 2014-07-07 21:19:09 -04:00
parent 66d21576b1
commit fdce50fb76
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/src/main/java/com/typesafe/config/impl/ConfigDelayedMerge.java
View File

@ -233,7 +233,8 @@ final class ConfigDelayedMerge extends AbstractConfigValue implements Unmergeabl
// note that "origin" is deliberately NOT part of equality
if (other instanceof ConfigDelayedMerge) {
return canEqual(other)
&& this.stack.equals(((ConfigDelayedMerge) other).stack);
&& (this.stack == ((ConfigDelayedMerge) other).stack || this.stack
.equals(((ConfigDelayedMerge) other).stack));
} else {
return false;
}

4
config/src/main/java/com/typesafe/config/impl/ConfigDelayedMergeObject.java
View File

@ -170,8 +170,8 @@ final class ConfigDelayedMergeObject extends AbstractConfigObject implements Unm
// note that "origin" is deliberately NOT part of equality
if (other instanceof ConfigDelayedMergeObject) {
return canEqual(other)
&& this.stack
.equals(((ConfigDelayedMergeObject) other).stack);
&& (this.stack == ((ConfigDelayedMergeObject) other).stack || this.stack
.equals(((ConfigDelayedMergeObject) other).stack));
} else {
return false;
}

3
config/src/main/java/com/typesafe/config/impl/SimpleConfigList.java
View File

@ -154,7 +154,8 @@ final class SimpleConfigList extends AbstractConfigValue implements ConfigList,
// note that "origin" is deliberately NOT part of equality
if (other instanceof SimpleConfigList) {
// optimization to avoid unwrapped() for two ConfigList
return canEqual(other) && value.equals(((SimpleConfigList) other).value);
return canEqual(other)
&& (value == ((SimpleConfigList) other).value || value.equals(((SimpleConfigList) other).value));
} else {
return false;
}

3
config/src/main/java/com/typesafe/config/impl/SimpleConfigObject.java
View File

@ -443,6 +443,9 @@ final class SimpleConfigObject extends AbstractConfigObject implements Serializa
}
private static boolean mapEquals(Map<String, ConfigValue> a, Map<String, ConfigValue> b) {
if (a == b)
return true;
Set<String> aKeys = a.keySet();
Set<String> bKeys = b.keySet();