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

Remove RoidSuffixes entirely

Browse source 
We no longer care about ROID suffix uniqueness in a post-Registry-2.0-migration
world, and the Registry cache is sufficient for efficiently grabbing the ROID
suffix for TLDs.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=144483726
This commit is contained in:
mcilwain 2017-01-13 14:15:10 -08:00 • committed by Ben McIlwain
parent 07010150b0
commit 8b61dcc6d0
6 changed files with 2 additions and 137 deletions
Download patch file Download diff file Expand all files Collapse all files

4
java/google/registry/model/EppResourceUtils.java
View file

@ -16,7 +16,6 @@ package google.registry.model;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.Iterables.transform;
import static google.registry.model.RoidSuffixes.getRoidSuffixForTld;
import static google.registry.model.index.ForeignKeyIndex.loadAndGetKey;
import static google.registry.model.ofy.ObjectifyService.ofy;
import static google.registry.util.DateTimeUtils.isAtOrAfter;
@ -39,6 +38,7 @@ import google.registry.model.host.HostResource;
import google.registry.model.index.ForeignKeyIndex;
import google.registry.model.ofy.CommitLogManifest;
import google.registry.model.ofy.CommitLogMutation;
import google.registry.model.registry.Registry;
import google.registry.model.transfer.TransferData;
import google.registry.model.transfer.TransferStatus;
import google.registry.util.FormattingLogger;
@ -56,7 +56,7 @@ public final class EppResourceUtils {
/** Returns the full domain repoId in the format HEX-TLD for the specified long id and tld. */
public static String createDomainRepoId(long repoId, String tld) {
return createRepoId(repoId, getRoidSuffixForTld(tld));
return createRepoId(repoId, Registry.get(tld).getRoidSuffix());
}
/** Returns the full repoId in the format HEX-TLD for the specified long id and ROID suffix. */

62
java/google/registry/model/RoidSuffixes.java
View file

@ -1,62 +0,0 @@
// Copyright 2016 The Nomulus Authors. All Rights Reserved.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
package google.registry.model;
import static com.google.common.base.Preconditions.checkState;
import static google.registry.model.CacheUtils.memoizeWithShortExpiration;
import static google.registry.model.common.EntityGroupRoot.getCrossTldKey;
import static google.registry.model.ofy.ObjectifyService.ofy;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableMap;
import com.googlecode.objectify.Work;
import google.registry.model.registry.Registry;
/** Utility class for dealing with EPP ROID suffixes. */
public final class RoidSuffixes {
/** A cached map of TLD strings to ROID suffixes. */
private static final Supplier<ImmutableMap<String, String>> ROID_SUFFIX_MAP_CACHE =
memoizeWithShortExpiration(new Supplier<ImmutableMap<String, String>>() {
@Override
public ImmutableMap<String, String> get() {
return ofy().doTransactionless(new Work<ImmutableMap<String, String>>() {
@Override
public ImmutableMap<String, String> run() {
ImmutableMap.Builder<String, String> builder = new ImmutableMap.Builder<>();
for (Registry registry :
ofy().load().type(Registry.class).ancestor(getCrossTldKey()).list()) {
builder.put(registry.getTldStr(), registry.getRoidSuffix());
}
return builder.build();
}});
}});
/**
* Returns the roid suffix corresponding to the given tld using the per-tld roidSuffix field.
*
* @throws IllegalStateException if there is no such tld, or the tld does not have a roid suffix
* configured on it
*/
public static String getRoidSuffixForTld(String tld) {
String roidSuffix = ROID_SUFFIX_MAP_CACHE.get().get(tld);
checkState(roidSuffix != null, "Could not find ROID suffix for TLD %s", tld);
return roidSuffix;
}
public static boolean isRoidSuffixUsed(String roidSuffix) {
return ROID_SUFFIX_MAP_CACHE.get().containsValue(roidSuffix);
}
}