From 0909a1d6d41a0862277b85113096ba1dc0f72931 Mon Sep 17 00:00:00 2001
From: Michael Muller <mmuller@google.com>
Date: Thu, 9 Sep 2021 12:24:02 -0400
Subject: [PATCH] Remove VKeyTranslatorFactory.createVKey(String) (#1312)

* Remove VKeyTranslatorFactory.createVKey(String)

This method serves the same function as VKey.fromWebsafeKey(), and isn't used
anywhere.  Move the test for it into VKeyTest and use it to instead test
fromWebsafeKey() (which didn't previously have a test).
---
 .../model/translators/VKeyTranslatorFactory.java |  5 -----
 .../translators/VKeyTranslatorFactoryTest.java   | 12 ------------
 .../google/registry/persistence/VKeyTest.java    | 16 ++++++++++++++++
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/core/src/main/java/google/registry/model/translators/VKeyTranslatorFactory.java b/core/src/main/java/google/registry/model/translators/VKeyTranslatorFactory.java
index 99615f879..113dc7da0 100644
--- a/core/src/main/java/google/registry/model/translators/VKeyTranslatorFactory.java
+++ b/core/src/main/java/google/registry/model/translators/VKeyTranslatorFactory.java
@@ -92,11 +92,6 @@ public class VKeyTranslatorFactory extends AbstractSimpleTranslatorFactory<VKey,
     }
   }
 
-  /** Create a VKey from a URL-safe string representation. */
-  public static VKey<?> createVKey(String urlSafe) {
-    return createVKey(com.googlecode.objectify.Key.create(urlSafe));
-  }
-
   @VisibleForTesting
   public static void addTestEntityClass(Class<?> clazz) {
     CLASS_REGISTRY.put(com.googlecode.objectify.Key.getKind(clazz), clazz);
diff --git a/core/src/test/java/google/registry/model/translators/VKeyTranslatorFactoryTest.java b/core/src/test/java/google/registry/model/translators/VKeyTranslatorFactoryTest.java
index 3cf7733fe..557bf2ff1 100644
--- a/core/src/test/java/google/registry/model/translators/VKeyTranslatorFactoryTest.java
+++ b/core/src/test/java/google/registry/model/translators/VKeyTranslatorFactoryTest.java
@@ -88,18 +88,6 @@ public class VKeyTranslatorFactoryTest {
     assertThat(vkey.getSqlKey()).isEqualTo(200L);
   }
 
-  @Test
-  void testUrlSafeKey() {
-    // Creating an objectify key instead of a datastore key as this should get a correctly formatted
-    // key path.
-    DomainBase domain = newDomainBase("example.com", "ROID-1", persistActiveContact("contact-1"));
-    Key<DomainBase> key = Key.create(domain);
-    VKey<DomainBase> vkey = (VKey<DomainBase>) VKeyTranslatorFactory.createVKey(key.getString());
-    assertThat(vkey.getKind()).isEqualTo(DomainBase.class);
-    assertThat(vkey.getOfyKey()).isEqualTo(key);
-    assertThat(vkey.getSqlKey()).isEqualTo("ROID-1");
-  }
-
   @Test
   void testExtraEntityClass() {
     TestObject testObject = TestObject.create("id", "field");
diff --git a/core/src/test/java/google/registry/persistence/VKeyTest.java b/core/src/test/java/google/registry/persistence/VKeyTest.java
index ad8d2d00c..7e506f400 100644
--- a/core/src/test/java/google/registry/persistence/VKeyTest.java
+++ b/core/src/test/java/google/registry/persistence/VKeyTest.java
@@ -15,11 +15,14 @@ package google.registry.persistence;
 
 import static com.google.common.truth.Truth.assertThat;
 import static com.google.common.truth.Truth8.assertThat;
+import static google.registry.testing.DatabaseHelper.newDomainBase;
+import static google.registry.testing.DatabaseHelper.persistActiveContact;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
 import com.googlecode.objectify.Key;
 import com.googlecode.objectify.annotation.Entity;
 import google.registry.model.billing.BillingEvent.OneTime;
+import google.registry.model.domain.DomainBase;
 import google.registry.model.registrar.RegistrarContact;
 import google.registry.testing.AppEngineExtension;
 import google.registry.testing.TestObject;
@@ -114,6 +117,19 @@ class VKeyTest {
         .contains("Missing value for last key of type class google.registry.testing.TestObject");
   }
 
+  @Test
+  void testFromWebsafeKey() {
+    // Creating an objectify key instead of a datastore key as this should get a correctly formatted
+    // key path.  We have to one of our actual model object classes for this, TestObject can not be
+    // reconstructed by the VKeyTranslatorFactory.
+    DomainBase domain = newDomainBase("example.com", "ROID-1", persistActiveContact("contact-1"));
+    Key<DomainBase> key = Key.create(domain);
+    VKey<DomainBase> vkey = VKey.fromWebsafeKey(key.getString());
+    assertThat(vkey.getKind()).isEqualTo(DomainBase.class);
+    assertThat(vkey.getOfyKey()).isEqualTo(key);
+    assertThat(vkey.getSqlKey()).isEqualTo("ROID-1");
+  }
+
   @Entity
   static class OtherObject {}
 }