mirror of
https://github.com/google/nomulus.git
synced 2025-05-13 07:57:13 +02:00
Remove UNRESERVED as a reservation type
This is a follow-up to Lai's refactoring of the get reservation types code to return a set rather than a single type. Since we're always returning a set now, the more natural way to represent a label that is not reserved is to return an empty set rather than a set containing UNRESERVED. Also fixes some minor style issues I ran across regarding static importing and test method naming that I ran across (no logic implications). ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=151132116
This commit is contained in:
parent
4260fb573f
commit
b03bd3b525
12 changed files with 83 additions and 90 deletions
|
@ -14,8 +14,6 @@
|
|||
|
||||
package google.registry.export;
|
||||
|
||||
import static google.registry.model.registry.label.ReservationType.UNRESERVED;
|
||||
|
||||
import com.google.common.base.Joiner;
|
||||
import com.googlecode.objectify.Key;
|
||||
import google.registry.config.RegistryConfig.Config;
|
||||
|
@ -45,9 +43,7 @@ public final class ExportUtils {
|
|||
ReservedList reservedList = ReservedList.load(key).get();
|
||||
if (reservedList.getShouldPublish()) {
|
||||
for (ReservedListEntry entry : reservedList.getReservedListEntries().values()) {
|
||||
if (entry.getValue() != UNRESERVED) {
|
||||
reservedTerms.add(entry.getLabel());
|
||||
}
|
||||
reservedTerms.add(entry.getLabel());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue