diff --git a/core/src/main/java/google/registry/model/tmch/ClaimsListDao.java b/core/src/main/java/google/registry/schema/tmch/ClaimsListDao.java similarity index 96% rename from core/src/main/java/google/registry/model/tmch/ClaimsListDao.java rename to core/src/main/java/google/registry/schema/tmch/ClaimsListDao.java index efafd2fcb..ae9b520e4 100644 --- a/core/src/main/java/google/registry/model/tmch/ClaimsListDao.java +++ b/core/src/main/java/google/registry/schema/tmch/ClaimsListDao.java @@ -12,12 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.tmch; +package google.registry.schema.tmch; import static google.registry.model.transaction.TransactionManagerFactory.jpaTm; import com.google.common.flogger.FluentLogger; -import google.registry.schema.tmch.ClaimsList; import javax.persistence.EntityManager; /** Data access object for {@link ClaimsList}. */ diff --git a/core/src/main/java/google/registry/tmch/TmchDnlAction.java b/core/src/main/java/google/registry/tmch/TmchDnlAction.java index f04149eae..15586e37d 100644 --- a/core/src/main/java/google/registry/tmch/TmchDnlAction.java +++ b/core/src/main/java/google/registry/tmch/TmchDnlAction.java @@ -18,11 +18,11 @@ import static google.registry.request.Action.Method.POST; import com.google.common.flogger.FluentLogger; import google.registry.keyring.api.KeyModule.Key; -import google.registry.model.tmch.ClaimsListDao; import google.registry.model.tmch.ClaimsListShard; import google.registry.request.Action; import google.registry.request.auth.Auth; import google.registry.schema.tmch.ClaimsList; +import google.registry.schema.tmch.ClaimsListDao; import java.io.IOException; import java.security.SignatureException; import java.util.List; diff --git a/core/src/main/java/google/registry/tools/UploadClaimsListCommand.java b/core/src/main/java/google/registry/tools/UploadClaimsListCommand.java index e8aa4e971..94e0dc972 100644 --- a/core/src/main/java/google/registry/tools/UploadClaimsListCommand.java +++ b/core/src/main/java/google/registry/tools/UploadClaimsListCommand.java @@ -21,9 +21,9 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.Parameters; import com.google.common.base.Joiner; import com.google.common.io.Files; -import google.registry.model.tmch.ClaimsListDao; import google.registry.model.tmch.ClaimsListShard; import google.registry.schema.tmch.ClaimsList; +import google.registry.schema.tmch.ClaimsListDao; import google.registry.tmch.ClaimsListParser; import java.io.File; import java.io.IOException; diff --git a/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java b/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java index aab095c09..382f7b0af 100644 --- a/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java +++ b/core/src/test/java/google/registry/schema/integration/SqlIntegrationTestSuite.java @@ -15,7 +15,6 @@ package google.registry.schema.integration; import google.registry.model.registry.RegistryLockDaoTest; -import google.registry.model.tmch.ClaimsListDaoTest; import google.registry.model.transaction.JpaTransactionManagerImplTest; import google.registry.model.transaction.JpaTransactionManagerRuleTest; import google.registry.persistence.BloomFilterConverterTest; @@ -27,6 +26,7 @@ import google.registry.persistence.UpdateAutoTimestampConverterTest; import google.registry.persistence.ZonedDateTimeConverterTest; import google.registry.schema.cursor.CursorDaoTest; import google.registry.schema.tld.PremiumListDaoTest; +import google.registry.schema.tmch.ClaimsListDaoTest; import google.registry.ui.server.registrar.RegistryLockGetActionTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/core/src/test/java/google/registry/model/tmch/ClaimsListDaoTest.java b/core/src/test/java/google/registry/schema/tmch/ClaimsListDaoTest.java similarity index 97% rename from core/src/test/java/google/registry/model/tmch/ClaimsListDaoTest.java rename to core/src/test/java/google/registry/schema/tmch/ClaimsListDaoTest.java index 17beda3df..c538001e6 100644 --- a/core/src/test/java/google/registry/model/tmch/ClaimsListDaoTest.java +++ b/core/src/test/java/google/registry/schema/tmch/ClaimsListDaoTest.java @@ -12,14 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -package google.registry.model.tmch; +package google.registry.schema.tmch; import static com.google.common.truth.Truth.assertThat; import static google.registry.testing.JUnitBackports.assertThrows; import com.google.common.collect.ImmutableMap; import google.registry.model.transaction.JpaTransactionManagerRule; -import google.registry.schema.tmch.ClaimsList; import google.registry.testing.FakeClock; import javax.persistence.NoResultException; import org.junit.Rule;