mirror of
https://github.com/google/nomulus.git
synced 2025-05-13 07:57:13 +02:00
Remove RoidSuffixes entirely
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
Ben McIlwain
parent
07010150b0
commit
8b61dcc6d0
6 changed files with 2 additions and 137 deletions
|
|
@ -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. */
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
@ -15,7 +15,6 @@
|
|||
package google.registry.tools;
|
||||
|
||||
import static com.google.common.base.Preconditions.checkArgument;
|
||||
import static google.registry.model.RoidSuffixes.isRoidSuffixUsed;
|
||||
import static google.registry.util.CollectionUtils.findDuplicates;
|
||||
import static google.registry.util.DomainNameUtils.canonicalizeDomainName;
|
||||
|
||||
|
|
@ -263,13 +262,6 @@ abstract class CreateOrUpdateTldCommand extends MutatingCommand {
|
|||
!CharMatcher.javaDigit().matches(tld.charAt(0)),
|
||||
"TLDs cannot begin with a number.");
|
||||
Registry oldRegistry = getOldRegistry(tld);
|
||||
if (roidSuffix != null) {
|
||||
checkArgument(
|
||||
!isRoidSuffixUsed(roidSuffix)
|
||||
|| (oldRegistry != null && roidSuffix.equals(oldRegistry.getRoidSuffix())),
|
||||
"The roid suffix %s is already in use",
|
||||
roidSuffix);
|
||||
}
|
||||
// TODO(b/26901539): Add a flag to set the pricing engine once we have more than one option.
|
||||
Registry.Builder builder =
|
||||
oldRegistry == null
|
||||
|
|
|
|||
|
|
@ -1,50 +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.truth.Truth.assertThat;
|
||||
import static google.registry.model.RoidSuffixes.getRoidSuffixForTld;
|
||||
import static google.registry.testing.DatastoreHelper.newRegistry;
|
||||
import static google.registry.testing.DatastoreHelper.persistResource;
|
||||
|
||||
import google.registry.testing.AppEngineRule;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.junit.runners.JUnit4;
|
||||
|
||||
/** Unit tests for {@link RoidSuffixes}. */
|
||||
@RunWith(JUnit4.class)
|
||||
public class RoidSuffixesTest {
|
||||
|
||||
@Rule
|
||||
public final AppEngineRule appEngine = AppEngineRule.builder()
|
||||
.withDatastore()
|
||||
.build();
|
||||
|
||||
@Test
|
||||
public void test_newlyCreatedRegistry_isAddedToRoidSuffixesList() {
|
||||
persistResource(newRegistry("tld", "MEOW"));
|
||||
assertThat(getRoidSuffixForTld("tld")).isEqualTo("MEOW");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void test_allowDupeRoidSuffixes() {
|
||||
persistResource(newRegistry("tld", "MEOW"));
|
||||
persistResource(newRegistry("example", "MEOW"));
|
||||
assertThat(getRoidSuffixForTld("tld")).isEqualTo("MEOW");
|
||||
assertThat(getRoidSuffixForTld("example")).isEqualTo("MEOW");
|
||||
}
|
||||
}
|
||||
|
|
@ -416,13 +416,6 @@ public class CreateTldCommandTest extends CommandTestCase<CreateTldCommand> {
|
|||
runCommandForced("--premium_list=phonies", "--roid_suffix=Q9JYB4C", "xn--q9jyb4c");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_roidSuffixAlreadyInUse() throws Exception {
|
||||
createTld("foo", "BLAH");
|
||||
thrown.expect(IllegalArgumentException.class, "The roid suffix BLAH is already in use");
|
||||
runCommandForced("--roid_suffix=BLAH", "randomtld");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_addLrpPeriod_backwardsInterval() throws Exception {
|
||||
thrown.expect(
|
||||
|
|
|
|||
|
|
@ -698,14 +698,6 @@ public class UpdateTldCommandTest extends CommandTestCase<UpdateTldCommand> {
|
|||
"xn--q9jyb4c");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testFailure_roidSuffixAlreadyInUse() throws Exception {
|
||||
createTld("foo", "BLAH");
|
||||
createTld("bar", "BAR");
|
||||
thrown.expect(IllegalArgumentException.class, "The roid suffix BLAH is already in use");
|
||||
runCommandForced("--roid_suffix=BLAH", "bar");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testSuccess_canSetRoidSuffixToWhatItAlreadyIs() throws Exception {
|
||||
createTld("foo", "BLAH");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue