mirror of
https://github.com/google/nomulus
synced 2026-01-03 11:45:39 +00:00
Rename "clientIdentifier" to "clientId" almost everywhere
It's best to be consistent and use the same thing everywhere. "clientId" was already used in more places and is shorter and no more ambiguous, so it's the logical one to win out. Note that this CL is almost solely a big Eclipse-assisted refactoring. There are two places that I did not change clientIdentifier -- the actual entity field on Registrar (though I did change all getters and setters), and the name of a column on the exported registrar spreadsheet. Both would require data migrations. Also fixes a few minor nits discovered in touched files, including an incorrect test in OfyFilterTest.java and some superfluous uses of String.format() when calling checkArgument(). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=133956465
This commit is contained in:
@@ -353,7 +353,7 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
|
||||
return salt;
|
||||
}};
|
||||
|
||||
public String getClientIdentifier() {
|
||||
public String getClientId() {
|
||||
return clientIdentifier;
|
||||
}
|
||||
|
||||
@@ -570,12 +570,12 @@ public class Registrar extends ImmutableObject implements Buildable, Jsonifiable
|
||||
super(instance);
|
||||
}
|
||||
|
||||
public Builder setClientIdentifier(String clientIdentifier) {
|
||||
public Builder setClientId(String clientId) {
|
||||
// Client id must be [3,16] chars long. See "clIDType" in the base EPP schema of RFC 5730.
|
||||
// (Need to validate this here as there's no matching EPP XSD for validation.)
|
||||
checkArgument(clientIdentifier.length() >= 3 && clientIdentifier.length() <= 16,
|
||||
checkArgument(clientId.length() >= 3 && clientId.length() <= 16,
|
||||
"Client identifier must be 3-16 characters long.");
|
||||
getInstance().clientIdentifier = clientIdentifier;
|
||||
getInstance().clientIdentifier = clientId;
|
||||
return this;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user