mirrors/nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus synced 2026-09-08 17:17:02 +00:00
Code Issues Releases Wiki Activity

Remove Ofy support from Registry (#1688)

Browse Source 
Also made some code quality changes based on IntelliJ suggestions on
modified files.
This commit is contained in:
Lai Jiang
2022-07-01 09:04:46 -04:00
committed by GitHub
parent 6d40fe41e6
commit b2ec088749
12 changed files with 57 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/test/java/google/registry/beam/invoicing/InvoicingPipelineTest.java
+1 -1
View File
@@ -371,7 +371,7 @@ class InvoicingPipelineTest {
+ "SELECT b, r FROM BillingEvent b\n"
+ "JOIN Registrar r ON b.clientId = r.clientIdentifier\n"
+ "JOIN Domain d ON b.domainRepoId = d.repoId\n"
+ "JOIN Tld t ON t.tldStrId = d.tld\n"
+ "JOIN Tld t ON t.tldStr = d.tld\n"
+ "LEFT JOIN BillingCancellation c ON b.id = c.refOneTime.billingId\n"
+ "LEFT JOIN BillingCancellation cr ON b.cancellationMatchingBillingEvent ="
+ " cr.refRecurring.billingId\n"
core/src/test/java/google/registry/model/common/ClassPathManagerTest.java
-3
View File
@@ -39,7 +39,6 @@ import google.registry.model.replay.ReplayGap;
import google.registry.model.reporting.HistoryEntry;
import google.registry.model.server.Lock;
import google.registry.model.server.ServerSecret;
import google.registry.model.tld.Registry;
import google.registry.testing.TestObject;
import org.junit.jupiter.api.Test;
@@ -72,7 +71,6 @@ public class ClassPathManagerTest {
assertThat(ClassPathManager.getClass("GaeUserIdConverter")).isEqualTo(GaeUserIdConverter.class);
assertThat(ClassPathManager.getClass("EppResourceIndexBucket"))
.isEqualTo(EppResourceIndexBucket.class);
assertThat(ClassPathManager.getClass("Registry")).isEqualTo(Registry.class);
assertThat(ClassPathManager.getClass("EntityGroupRoot")).isEqualTo(EntityGroupRoot.class);
assertThat(ClassPathManager.getClass("Lock")).isEqualTo(Lock.class);
assertThat(ClassPathManager.getClass("DomainBase")).isEqualTo(DomainBase.class);
@@ -132,7 +130,6 @@ public class ClassPathManagerTest {
.isEqualTo("GaeUserIdConverter");
assertThat(ClassPathManager.getClassName(EppResourceIndexBucket.class))
.isEqualTo("EppResourceIndexBucket");
assertThat(ClassPathManager.getClassName(Registry.class)).isEqualTo("Registry");
assertThat(ClassPathManager.getClassName(EntityGroupRoot.class)).isEqualTo("EntityGroupRoot");
assertThat(ClassPathManager.getClassName(Lock.class)).isEqualTo("Lock");
assertThat(ClassPathManager.getClassName(DomainBase.class)).isEqualTo("DomainBase");
core/src/test/java/google/registry/model/tld/RegistryTest.java
+6 -8
View File
@@ -28,7 +28,7 @@ import static google.registry.testing.DatabaseHelper.persistPremiumList;
import static google.registry.testing.DatabaseHelper.persistReservedList;
import static google.registry.util.DateTimeUtils.END_OF_TIME;
import static google.registry.util.DateTimeUtils.START_OF_TIME;
import static java.math.BigDecimal.ROUND_UNNECESSARY;
import static java.math.RoundingMode.UNNECESSARY;
import static org.joda.money.CurrencyUnit.EUR;
import static org.joda.money.CurrencyUnit.USD;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -77,8 +77,7 @@ public final class RegistryTest extends EntityTestCase {
Registry registry =
Registry.get("tld").asBuilder().setReservedLists(rl15).setPremiumList(pl).build();
tm().transact(() -> tm().put(registry));
Registry persisted =
tm().transact(() -> tm().loadByKey(Registry.createVKey(registry.tldStrId)));
Registry persisted = tm().transact(() -> tm().loadByKey(Registry.createVKey(registry.tldStr)));
assertThat(persisted).isEqualTo(registry);
}
@@ -94,8 +93,7 @@ public final class RegistryTest extends EntityTestCase {
ReservedList rl15 = persistReservedList("tld-reserved15", "potato,FULLY_BLOCKED");
Registry registry = Registry.get("tld").asBuilder().setReservedLists(rl15).build();
tm().transact(() -> tm().put(registry));
Registry persisted =
tm().transact(() -> tm().loadByKey(Registry.createVKey(registry.tldStrId)));
Registry persisted = tm().transact(() -> tm().loadByKey(Registry.createVKey(registry.tldStr)));
assertThat(SerializeUtils.serializeDeserialize(persisted)).isEqualTo(persisted);
}
@@ -582,7 +580,7 @@ public final class RegistryTest extends EntityTestCase {
@TestOfyAndSql
void testEapFee_undefined() {
assertThat(Registry.get("tld").getEapFeeFor(fakeClock.nowUtc()).getCost())
.isEqualTo(BigDecimal.ZERO.setScale(2, ROUND_UNNECESSARY));
.isEqualTo(BigDecimal.ZERO.setScale(2, UNNECESSARY));
}
@TestOfyAndSql
@@ -602,7 +600,7 @@ public final class RegistryTest extends EntityTestCase {
assertThat(registry.getEapFeeFor(fakeClock.nowUtc()).getCost())
.isEqualTo(new BigDecimal("100.00"));
assertThat(registry.getEapFeeFor(fakeClock.nowUtc().minusDays(2)).getCost())
.isEqualTo(BigDecimal.ZERO.setScale(2, ROUND_UNNECESSARY));
.isEqualTo(BigDecimal.ZERO.setScale(2, UNNECESSARY));
assertThat(registry.getEapFeeFor(fakeClock.nowUtc().plusDays(2)).getCost())
.isEqualTo(new BigDecimal("50.00"));
}
@@ -626,7 +624,7 @@ public final class RegistryTest extends EntityTestCase {
assertThrows(
IllegalArgumentException.class,
() -> Registry.get("tld").asBuilder().setRoidSuffix("123456789"));
assertThat(e).hasMessageThat().isEqualTo("ROID suffix must be in format ^[A-Z0-9_]{1,8}$");
assertThat(e).hasMessageThat().isEqualTo("ROID suffix must be in format ^[A-Z\\d_]{1,8}$");
}
@TestOfyAndSql
core/src/test/java/google/registry/tools/SetupOteCommandTest.java
+1 -3
View File
@@ -330,9 +330,7 @@ class SetupOteCommandTest extends CommandTestCase<SetupOteCommand> {
"--registrar=blobio",
"--email=contact@email.com",
"--certfile=" + getCertFilename()));
assertThat(thrown)
.hasMessageThat()
.contains("VKey<Registry>(sql:blobio-sunrise,ofy:blobio-sunrise)");
assertThat(thrown).hasMessageThat().contains("VKey<Registry>(sql:blobio-sunrise)");
}
@Test
core/src/test/resources/google/registry/export/backup_kinds.txt
-1
View File
@@ -16,4 +16,3 @@ PollMessage
RdeRevision
Recurring
Registrar
Registry
core/src/test/resources/google/registry/export/crosstld_kinds.txt
-1
View File
@@ -1,3 +1,2 @@
Registrar
Registry
ServerSecret
core/src/test/resources/google/registry/export/reporting_kinds.txt
-1
View File
@@ -13,4 +13,3 @@ OneTime
PollMessage
Recurring
Registrar
Registry
core/src/test/resources/google/registry/model/schema.txt
-57
View File
@@ -652,63 +652,6 @@ class google.registry.model.server.ServerSecret {
long leastSignificant;
long mostSignificant;
}
class google.registry.model.tld.Registry {
@Id java.lang.String tldStrId;
@Parent com.googlecode.objectify.Key<google.registry.model.common.EntityGroupRoot> parent;
boolean dnsPaused;
boolean escrowEnabled;
boolean invoicingEnabled;
google.registry.model.CreateAutoTimestamp creationTime;
google.registry.model.common.TimedTransitionProperty<google.registry.model.tld.Registry$TldState, google.registry.model.tld.Registry$TldStateTransition> tldStateTransitions;
google.registry.model.common.TimedTransitionProperty<org.joda.money.Money, google.registry.model.tld.Registry$BillingCostTransition> eapFeeSchedule;
google.registry.model.common.TimedTransitionProperty<org.joda.money.Money, google.registry.model.tld.Registry$BillingCostTransition> renewBillingCostTransitions;
google.registry.model.tld.Registry$TldType tldType;
int numDnsPublishLocks;
java.lang.String driveFolderId;
java.lang.String lordnUsername;
java.lang.String premiumListName;
java.lang.String pricingEngineClassName;
java.lang.String roidSuffix;
java.lang.String tldStr;
java.lang.String tldUnicode;
java.util.Set<java.lang.String> allowedFullyQualifiedHostNames;
java.util.Set<java.lang.String> allowedRegistrantContactIds;
java.util.Set<java.lang.String> dnsWriters;
java.util.Set<java.lang.String> reservedListNames;
org.joda.money.CurrencyUnit currency;
org.joda.money.Money createBillingCost;
org.joda.money.Money registryLockOrUnlockBillingCost;
org.joda.money.Money restoreBillingCost;
org.joda.money.Money serverStatusChangeBillingCost;
org.joda.time.DateTime claimsPeriodEnd;
org.joda.time.Duration addGracePeriodLength;
org.joda.time.Duration anchorTenantAddGracePeriodLength;
org.joda.time.Duration autoRenewGracePeriodLength;
org.joda.time.Duration automaticTransferLength;
org.joda.time.Duration pendingDeleteLength;
org.joda.time.Duration redemptionGracePeriodLength;
org.joda.time.Duration renewGracePeriodLength;
org.joda.time.Duration transferGracePeriodLength;
}
class google.registry.model.tld.Registry$BillingCostTransition {
org.joda.money.Money billingCost;
org.joda.time.DateTime transitionTime;
}
enum google.registry.model.tld.Registry$TldState {
GENERAL_AVAILABILITY;
PDT;
PREDELEGATION;
QUIET_PERIOD;
START_DATE_SUNRISE;
}
class google.registry.model.tld.Registry$TldStateTransition {
google.registry.model.tld.Registry$TldState tldState;
org.joda.time.DateTime transitionTime;
}
enum google.registry.model.tld.Registry$TldType {
REAL;
TEST;
}
class google.registry.model.transfer.ContactTransferData {
google.registry.model.eppcommon.Trid transferRequestTrid;
google.registry.model.transfer.TransferStatus transferStatus;