zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 08:27:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove compareTo() from DelegationSignerData

Browse source 
The only reason why it existed was so that we could get tests to print information in a consistent order and there are other ways of doing that. By removing compareTo we can use the properties of the extended ImmutableObject properly and properly implement the RFC https://tools.ietf.org/html/rfc5910#page-18

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=240170488
This commit is contained in:
gbrodman 2019-03-25 10:35:46 -07:00 • committed by jianglai
parent 625181ee3d
commit f95a30426d
5 changed files with 136 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

5
java/google/registry/model/domain/DomainBase.java
View file

@ -27,7 +27,6 @@ import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.util.CollectionUtils.forceEmptyToNull;
import static google.registry.util.CollectionUtils.nullToEmpty;
import static google.registry.util.CollectionUtils.nullToEmptyImmutableCopy;
import static google.registry.util.CollectionUtils.nullToEmptyImmutableSortedCopy;
import static google.registry.util.CollectionUtils.union;
import static google.registry.util.DateTimeUtils.earliestOf;
import static google.registry.util.DateTimeUtils.isBeforeOrAt;
@ -254,8 +253,8 @@ public class DomainBase extends EppResource
return fullyQualifiedDomainName;
}
public ImmutableSortedSet<DelegationSignerData> getDsData() {
return nullToEmptyImmutableSortedCopy(dsData);
public ImmutableSet<DelegationSignerData> getDsData() {
return nullToEmptyImmutableCopy(dsData);
}
public LaunchNotice getLaunchNotice() {

8
java/google/registry/model/domain/secdns/DelegationSignerData.java
View file

@ -30,8 +30,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
*/
@Embed
@XmlType(name = "dsData")
public class DelegationSignerData
extends ImmutableObject implements Comparable<DelegationSignerData> {
public class DelegationSignerData extends ImmutableObject {
/** The identifier for this particular key in the domain. */
int keyTag;
@ -85,11 +84,6 @@ public class DelegationSignerData
return instance;
}
@Override
public int compareTo(DelegationSignerData other) {
return Integer.compare(getKeyTag(), other.getKeyTag());
}
/**
* Returns the presentation format of this DS record.
*